Fix routes inverted delete/add in cluster mode

[l2tpns.git] / bgp.c

diff --git a/bgp.c b/bgp.c
index 7ac4c12..7c1e6c0 100644 (file)
--- a/bgp.c
+++ b/bgp.c
@@ -10,8 +10,6 @@
  *   nor RFC2385 (which requires a kernel patch on 2.4 kernels).
  */
 
  *   nor RFC2385 (which requires a kernel patch on 2.4 kernels).
  */
 

-char const *cvs_id_bgp = "$Id: bgp.c,v 1.12 2005/09/02 23:39:36 bodea Exp $";
-

 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>


@@ -29,12 +27,12 @@ char const *cvs_id_bgp = "$Id: bgp.c,v 1.12 2005/09/02 23:39:36 bodea Exp $";
 
 static void bgp_clear(struct bgp_peer *peer);
 static void bgp_set_retry(struct bgp_peer *peer);
 
 static void bgp_clear(struct bgp_peer *peer);
 static void bgp_set_retry(struct bgp_peer *peer);

-static void bgp_cidr(in_addr_t ip, in_addr_t mask, struct bgp_ip_prefix *pfx);

 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
     struct bgp_route_list *new);
 static struct bgp_route6_list *bgp_insert_route6(struct bgp_route6_list *head,
     struct bgp_route6_list *new);
 
 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
     struct bgp_route_list *new);
 static struct bgp_route6_list *bgp_insert_route6(struct bgp_route6_list *head,
     struct bgp_route6_list *new);
 

+static void bgp_process_timers(struct bgp_peer *peer);

 static void bgp_free_routes(struct bgp_route_list *routes);
 static void bgp_free_routes6(struct bgp_route6_list *routes);
 static char const *bgp_msg_type_str(uint8_t type);
 static void bgp_free_routes(struct bgp_route_list *routes);
 static void bgp_free_routes6(struct bgp_route6_list *routes);
 static char const *bgp_msg_type_str(uint8_t type);


@@ -101,7 +99,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 +128,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 +231,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));
 


@@ -385,26 +391,6 @@ static void bgp_set_retry(struct bgp_peer *peer)
        bgp_halt(peer); /* give up */
 }
 
        bgp_halt(peer); /* give up */
 }
 

-/* convert ip/mask to CIDR notation */
-static void bgp_cidr(in_addr_t ip, in_addr_t mask, struct bgp_ip_prefix *pfx)
-{
-    int i;
-    uint32_t b;
-
-    /* convert to prefix notation */
-    pfx->len = 32;
-    pfx->prefix = ip;
-
-    if (!mask) /* bogus */
-       mask = 0xffffffff;
-
-    for (i = 0; i < 32 && ((b = ntohl(1 << i)), !(mask & b)); i++)
-    {
-       pfx->len--;
-       pfx->prefix &= ~b;
-    }
-}
-

 /* insert route into list; sorted */
 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
     struct bgp_route_list *new)
 /* insert route into list; sorted */
 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
     struct bgp_route_list *new)


@@ -466,13 +452,14 @@ static struct bgp_route6_list *bgp_insert_route6(struct bgp_route6_list *head,
  * that if that route is later deleted we don't have to be concerned
  * about adding back the more specific one).
  */
  * that if that route is later deleted we don't have to be concerned
  * about adding back the more specific one).
  */

-int bgp_add_route(in_addr_t ip, in_addr_t mask)
+int bgp_add_route(in_addr_t ip, int prefixlen)

 {
     struct bgp_route_list *r = bgp_routes;
     struct bgp_route_list add;
     int i;
 
 {
     struct bgp_route_list *r = bgp_routes;
     struct bgp_route_list add;
     int i;
 

-    bgp_cidr(ip, mask, &add.dest);
+    add.dest.prefix = ip;
+    add.dest.len = prefixlen;

     add.next = 0;
 
     /* check for duplicate */
     add.next = 0;
 
     /* check for duplicate */


@@ -565,14 +552,15 @@ int bgp_add_route6(struct in6_addr ip, int prefixlen)
 }
 
 /* remove route from list for peers */
 }
 
 /* remove route from list for peers */

-int bgp_del_route(in_addr_t ip, in_addr_t mask)
+int bgp_del_route(in_addr_t ip, int prefixlen)

 {
     struct bgp_route_list *r = bgp_routes;
     struct bgp_route_list *e = 0;
     struct bgp_route_list del;
     int i;
 
 {
     struct bgp_route_list *r = bgp_routes;
     struct bgp_route_list *e = 0;
     struct bgp_route_list del;
     int i;
 

-    bgp_cidr(ip, mask, &del.dest);
+    del.dest.prefix = ip;
+    del.dest.len = prefixlen;

     del.next = 0;
 
     /* find entry in routes list and remove */
     del.next = 0;
 
     /* find entry in routes list and remove */


@@ -818,35 +806,59 @@ int bgp_process(uint32_t events[])
        }
 
        /* process timers */
        }
 
        /* process timers */

-       if (peer->state == Established)
-       {
-           if (time_now > peer->expire_time)
-           {
-               LOG(1, 0, 0, "No message from BGP peer %s in %ds\n",
-                   peer->name, peer->hold);
+       bgp_process_timers(peer);
+    }

 
 

-               bgp_send_notification(peer, BGP_ERR_HOLD_TIMER_EXP, 0);
-               continue;
-           }
+    return 1;
+}

 
 

-           if (time_now > peer->keepalive_time && !peer->outbuf->packet.header.len)
-               bgp_send_keepalive(peer);
-       }
-       else if (peer->state == Idle)
-       {
-           if (time_now > peer->retry_time)
-               bgp_connect(peer);
-       }
-       else if (time_now > peer->state_time + BGP_STATE_TIME)
+/* process bgp timers only */
+void bgp_process_peers_timers()
+{
+    int i;
+
+    if (!bgp_configured)
+       return;
+
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+    {
+       struct bgp_peer *peer = &bgp_peers[i];
+
+       if (peer->state == Disabled)
+           continue;
+
+       bgp_process_timers(peer);
+    }
+}
+
+static void bgp_process_timers(struct bgp_peer *peer)
+{
+    if (peer->state == Established)
+    {
+       if (time_now > peer->expire_time)

        {
        {

-           LOG(1, 0, 0, "%s timer expired for BGP peer %s\n",
-               bgp_state_str(peer->state), peer->name);
+           LOG(1, 0, 0, "No message from BGP peer %s in %ds\n",
+               peer->name, peer->hold);

 
 

-           bgp_restart(peer);
+           bgp_send_notification(peer, BGP_ERR_HOLD_TIMER_EXP, 0);
+           return;

        }
        }

+
+       if (time_now > peer->keepalive_time && !peer->outbuf->packet.header.len)
+           bgp_send_keepalive(peer);
+    }
+    else if (peer->state == Idle)
+    {
+       if (time_now > peer->retry_time)
+           bgp_connect(peer);

     }
     }

+    else if (time_now > peer->state_time + BGP_STATE_TIME)
+    {
+       LOG(1, 0, 0, "%s timer expired for BGP peer %s\n",
+           bgp_state_str(peer->state), peer->name);

 
 

-    return 1;
+       bgp_restart(peer);
+    }

 }
 
 static void bgp_free_routes(struct bgp_route_list *routes)
 }
 
 static void bgp_free_routes(struct bgp_route_list *routes)


@@ -905,6 +917,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 +949,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 +1320,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;
            }
 


@@ -1303,7 +1329,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;
            {
                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;
            }
 
                return 0;
            }
 


@@ -1361,7 +1387,11 @@ static int bgp_send_open(struct bgp_peer *peer)
     data.version = BGP_VERSION;
     data.as = htons(our_as);
     data.hold_time = htons(peer->hold);
     data.version = BGP_VERSION;
     data.as = htons(our_as);
     data.hold_time = htons(peer->hold);

-    data.identifier = my_address;
+    /* use the source IP we use as identifier, if available */
+    if (peer->source_addr != INADDR_ANY)
+       data.identifier = peer->source_addr;
+    else
+       data.identifier = my_address;

 
     /* if we know peer doesn't support MP (mp_handling == DoesntHandleIPv6Routes)
        then don't add this parameter */
 
     /* if we know peer doesn't support MP (mp_handling == DoesntHandleIPv6Routes)
        then don't add this parameter */


@@ -1589,7 +1619,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;
     /* 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,
 
     /* copy MP unreachable NLRI heading */
     memcpy(data, peer->mp_unreach_nlri_partial,


@@ -1597,7 +1627,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;
     /* 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 */
 
 
     peer->update_routes6 = 0; /* tentatively clear */
 


@@ -1620,7 +1650,7 @@ static int bgp_send_update6(struct bgp_peer *peer)
            memcpy(data, &tmp->dest, s);
            data += s;
            unreach_len += s;
            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),
 
            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 +1706,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;
     {
        /* 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)
     }
 
     if (add)


@@ -1701,19 +1731,22 @@ 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;
        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;
 
        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);
     }
 
 
        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 */
     /* go back and insert attr_len */

-    attr_len = htons(len - 4);
+    attr_len = htons(attr_len);

     memcpy((char *)&peer->outbuf->packet.data + 2, &attr_len, sizeof(attr_len));
 
     peer->outbuf->packet.header.len = htons(len);
     memcpy((char *)&peer->outbuf->packet.data + 2, &attr_len, sizeof(attr_len));
 
     peer->outbuf->packet.header.len = htons(len);