diff options
Diffstat (limited to 'bgpd/bgp_network.c')
| -rw-r--r-- | bgpd/bgp_network.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index 5dbd4872..fb8a7dd3 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -314,11 +314,14 @@ bgp_connect (struct peer *peer) sockopt_reuseaddr (peer->fd); sockopt_reuseport (peer->fd); +<<<<<<< HEAD:bgpd/bgp_network.c +======= #ifdef IPTOS_PREC_INTERNETCONTROL if (sockunion_family (&peer->su) == AF_INET) setsockopt_ipv4_tos (peer->fd, IPTOS_PREC_INTERNETCONTROL); #endif +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:bgpd/bgp_network.c if (peer->password) bgp_md5_set_connect (peer->fd, &peer->su, peer->password); |