X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/3bd675ad2c2b0c1cb3dfe52deb179f24e05c41b4..e6fe57eec8fc00543e7ee5f4e137331a6c65217c:/bgp.c

diff --git a/bgp.c b/bgp.c
index 795ffc5..7ac4c12 100644
--- a/bgp.c
+++ b/bgp.c
@@ -49,8 +49,6 @@ static int bgp_send_update(struct bgp_peer *peer);
 static int bgp_send_update6(struct bgp_peer *peer);
 static int bgp_send_notification(struct bgp_peer *peer, uint8_t code,
     uint8_t subcode);
-static int bgp_send_notification_full(struct bgp_peer *peer, uint8_t code,
-    uint8_t subcode, char *notification_data, uint16_t data_len);
 
 static uint16_t our_as;
 static struct bgp_route_list *bgp_routes = 0;
@@ -1238,8 +1236,6 @@ static int bgp_handle_input(struct bgp_peer *peer)
 			LOG(4, 0, 0, "Unsupported Capability code %d from BGP peer %s\n",
 			    capability->code, peer->name);
 
-			bgp_send_notification_full(peer, BGP_ERR_OPEN, BGP_ERR_OPN_UNSUP_CAP,
-				(char *)capability, 2 + capability->len);
 			/* we don't terminate, still; we just jump to the next one */
 			continue;
 		    }
@@ -1251,8 +1247,6 @@ static int bgp_handle_input(struct bgp_peer *peer)
 			LOG(4, 0, 0, "Unsupported multiprotocol AFI %d and SAFI %d from BGP peer %s\n",
 			    mp_cap->afi, mp_cap->safi, peer->name);
 
-			bgp_send_notification_full(peer, BGP_ERR_OPEN, BGP_ERR_OPN_UNSUP_CAP,
-				(char *)capability, 2 + capability->len);
 			/* we don't terminate, still; we just jump to the next one */
 			continue;
 		    }
@@ -1561,9 +1555,9 @@ static int bgp_send_update(struct bgp_peer *peer)
 /* send/buffer UPDATE message for IPv6 routes */
 static int bgp_send_update6(struct bgp_peer *peer)
 {
-    uint16_t unf_len = 0;
     uint16_t attr_len;
-    char *unreach_len;
+    uint16_t unreach_len = 0;
+    char *unreach_len_pos;
     uint8_t reach_len;
     uint16_t len = sizeof(peer->outbuf->packet.header);
     struct bgp_route6_list *have = peer->routes6;
@@ -1586,11 +1580,11 @@ static int bgp_send_update6(struct bgp_peer *peer)
 
     peer->outbuf->packet.header.type = BGP_MSG_UPDATE;
 
-    /* insert non-MP unf_len */
-    memcpy(data, &unf_len, sizeof(unf_len));
-    /* skip over attr_len too; will be filled when known */
-    data += sizeof(unf_len) + sizeof(attr_len);
-    len += sizeof(unf_len) + sizeof(attr_len);
+    /* insert non-MP unfeasible routes length */
+    memcpy(data, &unreach_len, sizeof(unreach_len));
+    /* skip over it and attr_len too; it will be filled when known */
+    data += sizeof(unreach_len) + sizeof(attr_len);
+    len += sizeof(unreach_len) + sizeof(attr_len);
 
     /* copy usual attributes */
     memcpy(data, peer->path_attrs, peer->path_attr_len_without_nexthop);
@@ -1601,7 +1595,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
     memcpy(data, peer->mp_unreach_nlri_partial,
 	    BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE);
     /* remember where to update this attr len */
-    unreach_len = data + 2;
+    unreach_len_pos = data + 2;
     data += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
     len += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
 
@@ -1625,7 +1619,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
 	    s = BGP_IP_PREFIX_SIZE(tmp->dest);
 	    memcpy(data, &tmp->dest, s);
 	    data += s;
-	    unf_len += s;
+	    unreach_len += s;
 	    len += s;
 
 	    LOG(5, 0, 0, "Withdrawing route %s/%d from BGP peer %s\n",
@@ -1668,13 +1662,22 @@ static int bgp_send_update6(struct bgp_peer *peer)
 	peer->update_routes6 = 1; /* more to do */
 
     /* anything changed? */
-    if (!(unf_len || add))
+    if (!(unreach_len || add))
 	return 1;
 
-    /* go back and insert MP unf_len */
-    unf_len += sizeof(struct bgp_attr_mp_unreach_nlri_partial);
-    unf_len = htons(unf_len);
-    memcpy(&unreach_len, &unf_len, sizeof(unf_len));
+    if (unreach_len)
+    {
+	/* go back and insert MP unreach_len */
+	unreach_len += sizeof(struct bgp_attr_mp_unreach_nlri_partial);
+	unreach_len = htons(unreach_len);
+	memcpy(unreach_len_pos, &unreach_len, sizeof(unreach_len));
+    }
+    else
+    {
+	/* we can remove this attribute, then */
+	data -= BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
+	len -= BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
+    }
 
     if (add)
     {
@@ -1696,9 +1699,9 @@ static int bgp_send_update6(struct bgp_peer *peer)
 		BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE);
 	/* with proper len */
 	reach_len = BGP_IP_PREFIX_SIZE(add->dest);
-	data[2] = reach_len;
-	data += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
-	len += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
+	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;
 
 	memcpy(data, &add->dest, reach_len);
 	data += reach_len;
@@ -1711,7 +1714,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
 
     /* go back and insert attr_len */
     attr_len = htons(len - 4);
-    memcpy(&peer->outbuf->packet.data + 2, &attr_len, sizeof(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;
@@ -1722,12 +1725,6 @@ static int bgp_send_update6(struct bgp_peer *peer)
 /* send/buffer NOTIFICATION message */
 static int bgp_send_notification(struct bgp_peer *peer, uint8_t code,
     uint8_t subcode)
-{
-    return bgp_send_notification_full(peer, code, subcode, NULL, 0);
-}
-
-static int bgp_send_notification_full(struct bgp_peer *peer, uint8_t code,
-    uint8_t subcode, char *notification_data, uint16_t data_len)
 {
     struct bgp_data_notification data;
     uint16_t len = 0;
@@ -1738,9 +1735,6 @@ static int bgp_send_notification_full(struct bgp_peer *peer, uint8_t code,
     data.error_subcode = subcode;
     len += sizeof(data.error_code);
 
-    memcpy(data.data, notification_data, data_len);
-    len += data_len;
-
     memset(peer->outbuf->packet.header.marker, 0xff,
 	sizeof(peer->outbuf->packet.header.marker));