Merge branch 'rfc4760' into fdn-mods

[l2tpns.git] / bgp.c

diff --git a/bgp.c b/bgp.c
index 4a4bea0..600c950 100644 (file)
--- a/bgp.c
+++ b/bgp.c
@@ -101,7 +101,7 @@ int bgp_setup(int as)
 
 /* start connection with a peer */
 int bgp_start(struct bgp_peer *peer, char *name, int as, int keepalive,
 
 /* start connection with a peer */
 int bgp_start(struct bgp_peer *peer, char *name, int as, int keepalive,

-    int hold, int enable)
+    int hold, struct in_addr update_source, int enable)

 {
     struct hostent *h;
     int ibgp;
 {
     struct hostent *h;
     int ibgp;


@@ -130,6 +130,7 @@ int bgp_start(struct bgp_peer *peer, char *name, int as, int keepalive,
     }
 
     memcpy(&peer->addr, h->h_addr, sizeof(peer->addr));
     }
 
     memcpy(&peer->addr, h->h_addr, sizeof(peer->addr));

+    peer->source_addr = update_source.s_addr;

     peer->as = as > 0 ? as : our_as;
     ibgp = peer->as == our_as;
 
     peer->as = as > 0 ? as : our_as;
     ibgp = peer->as == our_as;
 


@@ -232,7 +233,14 @@ int bgp_start(struct bgp_peer *peer, char *name, int as, int keepalive,
     /* NEXT_HOP */
     a.flags = BGP_PATH_ATTR_FLAG_TRANS;
     a.code = BGP_PATH_ATTR_CODE_NEXT_HOP;
     /* NEXT_HOP */
     a.flags = BGP_PATH_ATTR_FLAG_TRANS;
     a.code = BGP_PATH_ATTR_CODE_NEXT_HOP;

-    ip = my_address; /* we're it */
+    if (config->nexthop_address)
+    {
+       ip = config->nexthop_address;
+    }
+    else
+    {
+       ip = my_address; /* we're it */
+    }

     a.data.s.len = sizeof(ip);
     memcpy(a.data.s.value, &ip, sizeof(ip));
 
     a.data.s.len = sizeof(ip);
     memcpy(a.data.s.value, &ip, sizeof(ip));
 


@@ -905,6 +913,7 @@ static int bgp_connect(struct bgp_peer *peer)
 {
     static int bgp_port = 0;
     struct sockaddr_in addr;
 {
     static int bgp_port = 0;
     struct sockaddr_in addr;

+    struct sockaddr_in source_addr;

     struct epoll_event ev;
 
     if (!bgp_port)
     struct epoll_event ev;
 
     if (!bgp_port)


@@ -936,6 +945,19 @@ static int bgp_connect(struct bgp_peer *peer)
     /* set to non-blocking */
     fcntl(peer->sock, F_SETFL, fcntl(peer->sock, F_GETFL, 0) | O_NONBLOCK);
 
     /* set to non-blocking */
     fcntl(peer->sock, F_SETFL, fcntl(peer->sock, F_GETFL, 0) | O_NONBLOCK);
 

+    /* set source address */
+    memset(&source_addr, 0, sizeof(source_addr));
+    source_addr.sin_family = AF_INET;
+    source_addr.sin_addr.s_addr = peer->source_addr; /* defaults to INADDR_ANY */
+    if (bind(peer->sock, (struct sockaddr *) &source_addr, sizeof(source_addr)) < 0)
+    {
+       LOG(1, 0, 0, "Can't set source address to %s: %s\n",
+           inet_ntoa(source_addr.sin_addr), strerror(errno));
+
+       bgp_set_retry(peer);
+       return 0;
+    }
+

     /* try connect */
     memset(&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;
     /* try connect */
     memset(&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;


@@ -1294,7 +1316,7 @@ static int bgp_handle_input(struct bgp_peer *peer)
            if (notification->error_code == BGP_ERR_CEASE)
            {
                LOG(4, 0, 0, "BGP peer %s sent CEASE\n", peer->name);
            if (notification->error_code == BGP_ERR_CEASE)
            {
                LOG(4, 0, 0, "BGP peer %s sent CEASE\n", peer->name);

-               bgp_restart(peer);
+               bgp_set_retry(peer);

                return 0;
            }
 
                return 0;
            }