X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/974d5f4408a77c2a8dae8aa112a6e85687d2421b..1c898f7017d2f3bfc07dfdadd077d70ccf6066c1:/bgp.c

diff --git a/bgp.c b/bgp.c
index e2939d2..600c950 100644
--- 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,
-    int hold, int enable)
+    int hold, struct in_addr update_source, int enable)
 {
     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));
+    peer->source_addr = update_source.s_addr;
     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;
-    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));
 
@@ -905,6 +913,7 @@ static int bgp_connect(struct bgp_peer *peer)
 {
     static int bgp_port = 0;
     struct sockaddr_in addr;
+    struct sockaddr_in source_addr;
     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 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;
@@ -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);
-		bgp_restart(peer);
+		bgp_set_retry(peer);
 		return 0;
 	    }
 
@@ -1303,7 +1325,7 @@ static int bgp_handle_input(struct bgp_peer *peer)
 	    {
 		LOG(4, 0, 0, "BGP peer %s doesn't support BGP Capabilities\n", peer->name);
 		peer->mp_handling = DoesntHandleIPv6Routes;
-		bgp_restart(peer);
+		bgp_set_retry(peer);
 		return 0;
 	    }
 
@@ -1589,7 +1611,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
     /* copy usual attributes */
     memcpy(data, peer->path_attrs, peer->path_attr_len_without_nexthop);
     data += peer->path_attr_len_without_nexthop;
-    len += peer->path_attr_len_without_nexthop;
+    attr_len = peer->path_attr_len_without_nexthop;
 
     /* copy MP unreachable NLRI heading */
     memcpy(data, peer->mp_unreach_nlri_partial,
@@ -1597,7 +1619,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
     /* remember where to update this attr len */
     unreach_len_pos = data + 2;
     data += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
-    len += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
+    attr_len += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
 
     peer->update_routes6 = 0; /* tentatively clear */
 
@@ -1620,7 +1642,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
 	    memcpy(data, &tmp->dest, s);
 	    data += s;
 	    unreach_len += s;
-	    len += s;
+	    attr_len += s;
 
 	    LOG(5, 0, 0, "Withdrawing route %s/%d from BGP peer %s\n",
 		inet_ntop(AF_INET6, &tmp->dest.prefix, ipv6addr, INET6_ADDRSTRLEN),
@@ -1676,7 +1698,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
     {
 	/* we can remove this attribute, then */
 	data -= BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
-	len -= BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
+	attr_len -= BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
     }
 
     if (add)
@@ -1701,20 +1723,23 @@ static int bgp_send_update6(struct bgp_peer *peer)
 	reach_len = BGP_IP_PREFIX_SIZE(add->dest);
 	data[2] = sizeof(struct bgp_attr_mp_reach_nlri_partial) + reach_len;
 	data += BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE;
-	len += BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE;
+	attr_len += BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE;
 
 	memcpy(data, &add->dest, reach_len);
 	data += reach_len;
-	len += reach_len;
+	attr_len += reach_len;
 
 	LOG(5, 0, 0, "Advertising route %s/%d to BGP peer %s\n",
 	    inet_ntop(AF_INET6, &add->dest.prefix, ipv6addr, INET6_ADDRSTRLEN),
 	    add->dest.len, peer->name);
     }
 
+    /* update len with attributes we added */
+    len += attr_len;
+
     /* go back and insert attr_len */
-    attr_len = htons(len - 4);
-    memcpy(&peer->outbuf->packet.data + 2, &attr_len, sizeof(attr_len));
+    attr_len = htons(attr_len);
+    memcpy((char *)&peer->outbuf->packet.data + 2, &attr_len, sizeof(attr_len));
 
     peer->outbuf->packet.header.len = htons(len);
     peer->outbuf->done = 0;