Update changelog.
[l2tpns.git] / bgp.c
diff --git a/bgp.c b/bgp.c
index 4404484..36894be 100644 (file)
--- a/bgp.c
+++ b/bgp.c
@@ -10,8 +10,6 @@
  *   nor RFC2385 (which requires a kernel patch on 2.4 kernels).
  */
 
-char const *cvs_id_bgp = "$Id: bgp.c,v 1.3 2004/08/13 00:02:50 fred_nerk Exp $";
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -22,6 +20,7 @@ char const *cvs_id_bgp = "$Id: bgp.c,v 1.3 2004/08/13 00:02:50 fred_nerk Exp $";
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <linux/rtnetlink.h>
 
 #include "l2tpns.h"
 #include "bgp.h"
@@ -29,13 +28,15 @@ char const *cvs_id_bgp = "$Id: bgp.c,v 1.3 2004/08/13 00:02:50 fred_nerk Exp $";
 
 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);
+    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 char const *bgp_state_str(enum bgp_state state);
-static char const *bgp_msg_type_str(u8 type);
+static void bgp_free_routes6(struct bgp_route6_list *routes);
+static char const *bgp_msg_type_str(uint8_t type);
 static int bgp_connect(struct bgp_peer *peer);
 static int bgp_handle_connect(struct bgp_peer *peer);
 static int bgp_write(struct bgp_peer *peer);
@@ -44,310 +45,405 @@ static int bgp_handle_input(struct bgp_peer *peer);
 static int bgp_send_open(struct bgp_peer *peer);
 static int bgp_send_keepalive(struct bgp_peer *peer);
 static int bgp_send_update(struct bgp_peer *peer);
-static int bgp_send_notification(struct bgp_peer *peer, u8 code, u8 subcode);
+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 uint16_t our_as;
+static struct bgp_route_list *bgp_routes = 0;
+static struct bgp_route6_list *bgp_routes6 = 0;
 
-static u16 our_as;
+int bgp_configured = 0;
+struct bgp_peer *bgp_peers = 0;
 
 /* prepare peer structure, globals */
 int bgp_setup(int as)
 {
-       int i;
-       struct bgp_peer *peer;
+    int i;
+    struct bgp_peer *peer;
 
-       for (i = 0; i < BGP_NUM_PEERS; i++)
-       {
-               peer = &bgp_peers[i];
-               memset(peer, 0, sizeof(*peer));
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+    {
+       peer = &bgp_peers[i];
+       memset(peer, 0, sizeof(*peer));
 
-               peer->addr = INADDR_NONE;
-               peer->sock = -1;
-               peer->state = peer->next_state = Disabled;
+       peer->addr = INADDR_NONE;
+       peer->sock = -1;
+       peer->state = peer->next_state = Disabled;
 
-               if (!((peer->outbuf = malloc(sizeof(*peer->outbuf))) && (peer->inbuf = malloc(sizeof(*peer->inbuf)))))
-               {
-                       log(0, 0, 0, 0, "Can't allocate buffers for bgp peer (%s)\n",
-                               strerror(errno));
+       if (!((peer->outbuf = malloc(sizeof(*peer->outbuf)))
+           && (peer->inbuf = malloc(sizeof(*peer->inbuf)))))
+       {
+           LOG(0, 0, 0, "Can't allocate buffers for bgp peer (%s)\n",
+               strerror(errno));
 
-                       return 0;
-               }
+           return 0;
        }
 
-       if (as < 1)
-                       as = 0;
+       peer->edata.type = FD_TYPE_BGP;
+       peer->edata.index = i;
+       peer->events = 0;
+    }
 
-       if ((our_as = as))
-                       return 0;
+    if (as < 1)
+       as = 0;
 
-       bgp_routes = 0;
-       bgp_configured = 0; /* set by bgp_start */
+    if ((our_as = as))
+       return 0;
 
-       return 1;
+    bgp_routes = 0;
+    bgp_routes6 = 0;
+    bgp_configured = 0; /* set by bgp_start */
+
+    return 1;
 }
 
 /* start connection with a peer */
-int bgp_start(struct bgp_peer *peer, char *name, int as, int enable)
+int bgp_start(struct bgp_peer *peer, char *name, int as, int keepalive,
+    int hold, struct in_addr update_source, int enable)
 {
-       struct hostent *h;
-       int ibgp;
-       int i;
-       struct bgp_path_attr a;
-       char path_attrs[64];
-       char *p = path_attrs;
-       in_addr_t ip;
-       u32 metric = htonl(BGP_METRIC);
-       u32 no_export = htonl(BGP_COMMUNITY_NO_EXPORT);
-
-       if (!our_as)
-               return 0;
-
-       if (peer->state != Disabled)
-               bgp_halt(peer);
-
-       snprintf(peer->name, sizeof(peer->name), "%s", name);
-
-       if (!(h = gethostbyname(name)) || h->h_addrtype != AF_INET)
-       {
-               log(0, 0, 0, 0, "Can't get address for BGP peer %s (%s)\n", name, h ? "no address" : hstrerror(h_errno));
-
-               return 0;
-       }
-
-       memcpy(&peer->addr, h->h_addr, sizeof(peer->addr));
-       peer->as = as > 0 ? as : our_as;
-       ibgp = peer->as == our_as;
-
-       /* clear buffers, go to Idle state */
-       peer->next_state = Idle;
-       bgp_clear(peer);
-
-       /* set initial routing state */
-       peer->routing = enable;
-
-       /* all our routes use the same attributes, so prepare it in advance */
-       if (peer->path_attrs)
-                       free(peer->path_attrs);
-
-       peer->path_attr_len = 0;
-
-       /* ORIGIN */
-       a.flags = BGP_PATH_ATTR_FLAG_TRANS;
-       a.code = BGP_PATH_ATTR_CODE_ORIGIN;
-       a.data.s.len = 1;
-       a.data.s.value[0] = BGP_PATH_ATTR_CODE_ORIGIN_IGP;
-
-#define ADD_ATTRIBUTE()                                do { \
-       i = BGP_PATH_ATTR_SIZE(a);              \
-       memcpy(p, &a, i);                               \
-       p += i;                                                 \
-       peer->path_attr_len += i;               } while (0)
-
-       ADD_ATTRIBUTE();
-
-       /* AS_PATH */
+    struct hostent *h;
+    int ibgp;
+    int i;
+    struct bgp_path_attr a;
+    char path_attrs[64];
+    char *p = path_attrs;
+    in_addr_t ip;
+    uint32_t metric = htonl(BGP_METRIC);
+    uint32_t no_export = htonl(BGP_COMMUNITY_NO_EXPORT);
+
+    if (!our_as)
+       return 0;
+
+    if (peer->state != Disabled)
+       bgp_halt(peer);
+
+    snprintf(peer->name, sizeof(peer->name), "%s", name);
+
+    if (!(h = gethostbyname(name)) || h->h_addrtype != AF_INET)
+    {
+       LOG(0, 0, 0, "Can't get address for BGP peer %s (%s)\n",
+           name, h ? "no address" : hstrerror(h_errno));
+
+       return 0;
+    }
+
+    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;
+
+    /* set initial timer values */
+    peer->init_keepalive = keepalive == -1 ? BGP_KEEPALIVE_TIME : keepalive;
+    peer->init_hold = hold == -1 ? BGP_HOLD_TIME : hold;
+
+    if (peer->init_hold < 3)
+       peer->init_hold = 3;
+
+    if (peer->init_keepalive * 3 > peer->init_hold)
+       peer->init_keepalive = peer->init_hold / 3;
+
+    /* clear buffers, go to Idle state */
+    peer->next_state = Idle;
+    bgp_clear(peer);
+
+    /* set initial routing state */
+    peer->routing = enable;
+
+    /* all our routes use the same attributes, so prepare it in advance */
+    if (peer->path_attrs)
+       free(peer->path_attrs);
+
+    peer->path_attr_len = 0;
+
+    /* ORIGIN */
+    a.flags = BGP_PATH_ATTR_FLAG_TRANS;
+    a.code = BGP_PATH_ATTR_CODE_ORIGIN;
+    a.data.s.len = 1;
+    a.data.s.value[0] = BGP_PATH_ATTR_CODE_ORIGIN_IGP;
+
+#define ADD_ATTRIBUTE()                do { \
+    i = BGP_PATH_ATTR_SIZE(a); \
+    memcpy(p, &a, i);          \
+    p += i;                    \
+    peer->path_attr_len += i;  } while (0)
+
+    ADD_ATTRIBUTE();
+
+    /* AS_PATH */
+    a.flags = BGP_PATH_ATTR_FLAG_TRANS;
+    a.code = BGP_PATH_ATTR_CODE_AS_PATH;
+    if (ibgp)
+    {
+       /* empty path */
+       a.data.s.len = 0;
+    }
+    else
+    {
+       /* just our AS */
+       struct {
+           uint8_t type;
+           uint8_t len;
+           uint16_t value;
+       } as_path = {
+           BGP_PATH_ATTR_CODE_AS_PATH_AS_SEQUENCE,
+           1,
+           htons(our_as),
+       };
+
+       a.data.s.len = sizeof(as_path);
+       memcpy(&a.data.s.value, &as_path, sizeof(as_path));
+    }
+
+    ADD_ATTRIBUTE();
+
+    /* MULTI_EXIT_DISC */
+    a.flags = BGP_PATH_ATTR_FLAG_OPTIONAL;
+    a.code = BGP_PATH_ATTR_CODE_MULTI_EXIT_DISC;
+    a.data.s.len = sizeof(metric);
+    memcpy(a.data.s.value, &metric, sizeof(metric));
+
+    ADD_ATTRIBUTE();
+
+    if (ibgp)
+    {
+       uint32_t local_pref = htonl(BGP_LOCAL_PREF);
+
+       /* LOCAL_PREF */
        a.flags = BGP_PATH_ATTR_FLAG_TRANS;
-       a.code = BGP_PATH_ATTR_CODE_AS_PATH;
-       if (ibgp)
-       {
-               /* empty path */
-               a.data.s.len = 0;
-       }
-       else
-       {
-               /* just our AS */
-               struct {
-                       u8 type;
-                       u8 len;
-                       u16 value;
-               } as_path = {
-                       BGP_PATH_ATTR_CODE_AS_PATH_AS_SEQUENCE,
-                       1,
-                       htons(our_as),
-               };
-
-               a.data.s.len = sizeof(as_path);
-               memcpy(&a.data.s.value, &as_path, sizeof(as_path));
-       }
+       a.code = BGP_PATH_ATTR_CODE_LOCAL_PREF;
+       a.data.s.len = sizeof(local_pref);
+       memcpy(a.data.s.value, &local_pref, sizeof(local_pref));
 
        ADD_ATTRIBUTE();
-
-       /* NEXT_HOP */
-       a.flags = BGP_PATH_ATTR_FLAG_TRANS;
-       a.code = BGP_PATH_ATTR_CODE_NEXT_HOP;
+    }
+
+    /* COMMUNITIES */
+    a.flags = BGP_PATH_ATTR_FLAG_OPTIONAL | BGP_PATH_ATTR_FLAG_TRANS;
+    a.code = BGP_PATH_ATTR_CODE_COMMUNITIES;
+    a.data.s.len = sizeof(no_export);
+    memcpy(a.data.s.value, &no_export, sizeof(no_export));
+
+    ADD_ATTRIBUTE();
+
+    /* remember the len before adding NEXT_HOP */
+    peer->path_attr_len_without_nexthop = peer->path_attr_len;
+
+    /* NEXT_HOP */
+    a.flags = BGP_PATH_ATTR_FLAG_TRANS;
+    a.code = BGP_PATH_ATTR_CODE_NEXT_HOP;
+    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));
 
-       ADD_ATTRIBUTE();
+    ADD_ATTRIBUTE();
 
-       /* MULTI_EXIT_DISC */
-       a.flags = BGP_PATH_ATTR_FLAG_OPTIONAL;
-       a.code = BGP_PATH_ATTR_CODE_MULTI_EXIT_DISC;
-       a.data.s.len = sizeof(metric);
-       memcpy(a.data.s.value, &metric, sizeof(metric));
+    if (!(peer->path_attrs = malloc(peer->path_attr_len)))
+    {
+       LOG(0, 0, 0, "Can't allocate path_attrs for %s (%s)\n",
+           name, strerror(errno));
 
-       ADD_ATTRIBUTE();
+       return 0;
+    }
 
-       if (ibgp)
-       {
-               u32 local_pref = htonl(BGP_LOCAL_PREF);
+    memcpy(peer->path_attrs, path_attrs, peer->path_attr_len);
 
-               /* LOCAL_PREF */
-               a.flags = BGP_PATH_ATTR_FLAG_TRANS;
-               a.code = BGP_PATH_ATTR_CODE_LOCAL_PREF;
-               a.data.s.len = sizeof(local_pref);
-               memcpy(a.data.s.value, &local_pref, sizeof(local_pref));
+    /* multiprotocol attributes initialization */
+    if (config->ipv6_prefix.s6_addr[0])
+    {
+       struct bgp_attr_mp_reach_nlri_partial mp_reach_nlri_partial;
+       struct bgp_attr_mp_unreach_nlri_partial mp_unreach_nlri_partial;
 
-               ADD_ATTRIBUTE();
+       a.flags = BGP_PATH_ATTR_FLAG_OPTIONAL;
+       a.code = BGP_PATH_ATTR_CODE_MP_REACH_NLRI;
+       a.data.s.len = 0; /* will be set on UPDATE */
+
+       mp_reach_nlri_partial.afi = htons(BGP_MP_AFI_IPv6);
+       mp_reach_nlri_partial.safi = BGP_MP_SAFI_UNICAST;
+       mp_reach_nlri_partial.reserved = 0;
+       mp_reach_nlri_partial.next_hop_len = 16;
+
+       /* use the defined nexthop6, or our address in ipv6_prefix */
+       if (config->nexthop6_address.s6_addr[0])
+           memcpy(&mp_reach_nlri_partial.next_hop,
+                   &config->nexthop6_address.s6_addr, 16);
+       else
+       {
+           /* our address is ipv6prefix::1 */
+           memcpy(&mp_reach_nlri_partial.next_hop,
+                   &config->ipv6_prefix.s6_addr, 16);
+           mp_reach_nlri_partial.next_hop[15] = 1;
        }
 
-       /* COMMUNITIES */
-       a.flags = BGP_PATH_ATTR_FLAG_OPTIONAL | BGP_PATH_ATTR_FLAG_TRANS;
-       a.code = BGP_PATH_ATTR_CODE_COMMUNITIES;
-       a.data.s.len = sizeof(no_export);
-       memcpy(a.data.s.value, &no_export, sizeof(no_export));
+       memcpy(&a.data.s.value, &mp_reach_nlri_partial,
+               sizeof(struct bgp_attr_mp_reach_nlri_partial));
+       memcpy(&peer->mp_reach_nlri_partial, &a,
+               BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE);
 
-       ADD_ATTRIBUTE();
+       a.flags = BGP_PATH_ATTR_FLAG_OPTIONAL | BGP_PATH_ATTR_FLAG_EXTLEN;
+       a.code = BGP_PATH_ATTR_CODE_MP_UNREACH_NLRI;
+       a.data.e.len = 0; /* will be set on UPDATE */
 
-       if (!(peer->path_attrs = malloc(peer->path_attr_len)))
-       {
-               log(0, 0, 0, 0, "Can't allocate path_attrs for %s (%s)\n",
-                       name, strerror(errno));
+       mp_unreach_nlri_partial.afi = htons(BGP_MP_AFI_IPv6);
+       mp_unreach_nlri_partial.safi = BGP_MP_SAFI_UNICAST;
 
-               return 0;
-       }
+       memcpy(&a.data.e.value, &mp_unreach_nlri_partial,
+               sizeof(struct bgp_attr_mp_unreach_nlri_partial));
+       memcpy(&peer->mp_unreach_nlri_partial, &a,
+               BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE);
+    }
 
-       memcpy(peer->path_attrs, path_attrs, peer->path_attr_len);
+    peer->mp_handling = HandlingUnknown;
 
-       log(4, 0, 0, 0, "Initiating BGP connection to %s (routing %s)\n",
-               name, enable ? "enabled" : "suspended");
+    LOG(4, 0, 0, "Initiating BGP connection to %s (routing %s)\n",
+       name, enable ? "enabled" : "suspended");
 
-       /* we have at least one peer configured */
-       bgp_configured = 1;
+    /* we have at least one peer configured */
+    bgp_configured = 1;
 
-       /* connect */
-       return bgp_connect(peer);
+    /* connect */
+    return bgp_connect(peer);
 }
 
 /* clear counters, timers, routes and buffers; close socket; move to
    next_state, which may be Disabled or Idle */
 static void bgp_clear(struct bgp_peer *peer)
 {
-       if (peer->sock != -1)
-       {
-                       close(peer->sock);
-               peer->sock = -1;
-       }
-
-       peer->keepalive_time = 0;
-       peer->hold = 0;
-       peer->expire_time = 0;
-
-       bgp_free_routes(peer->routes);
-       peer->routes = 0;
-
-       peer->outbuf->packet.header.len = 0;
-       peer->outbuf->done = 0;
-       peer->inbuf->packet.header.len = 0;
-       peer->inbuf->done = 0;
-
-       peer->cli_flag = 0;
-
-       if (peer->state != peer->next_state)
-       {
-               peer->state = peer->next_state;
-               peer->state_time = time_now;
+    if (peer->sock != -1)
+    {
+       close(peer->sock);
+       peer->sock = -1;
+    }
+
+    peer->keepalive_time = 0;
+    peer->expire_time = 0;
+
+    peer->keepalive = peer->init_keepalive;
+    peer->hold = peer->init_hold;
+
+    bgp_free_routes(peer->routes);
+    peer->routes = 0;
+    bgp_free_routes6(peer->routes6);
+    peer->routes6 = 0;
+
+    peer->outbuf->packet.header.len = 0;
+    peer->outbuf->done = 0;
+    peer->inbuf->packet.header.len = 0;
+    peer->inbuf->done = 0;
+
+    peer->cli_flag = 0;
+    peer->events = 0;
+
+    if (peer->state != peer->next_state)
+    {
+       peer->state = peer->next_state;
+       peer->state_time = time_now;
 
-               log(4, 0, 0, 0, "BGP peer %s: state %s\n", peer->name,
-                       bgp_state_str(peer->next_state));
-       }
+       LOG(4, 0, 0, "BGP peer %s: state %s\n", peer->name,
+           bgp_state_str(peer->next_state));
+    }
 }
 
 /* initiate a clean shutdown */
 void bgp_stop(struct bgp_peer *peer)
 {
-       log(4, 0, 0, 0, "Terminating BGP connection to %s\n", peer->name);
-       bgp_send_notification(peer, BGP_ERR_CEASE, 0);
+    LOG(4, 0, 0, "Terminating BGP connection to %s\n", peer->name);
+    bgp_send_notification(peer, BGP_ERR_CEASE, 0);
 }
 
 /* drop connection (if any) and set state to Disabled */
 void bgp_halt(struct bgp_peer *peer)
 {
-       log(4, 0, 0, 0, "Aborting BGP connection to %s\n", peer->name);
-       peer->next_state = Disabled;
-       bgp_clear(peer);
+    LOG(4, 0, 0, "Aborting BGP connection to %s\n", peer->name);
+    peer->next_state = Disabled;
+    bgp_clear(peer);
 }
 
 /* drop connection (if any) and set to Idle for connection retry */
 int bgp_restart(struct bgp_peer *peer)
 {
-       peer->next_state = Idle;
-       bgp_clear(peer);
+    peer->next_state = Idle;
+    bgp_clear(peer);
 
-       /* restart now */
-       peer->retry_time = time_now;
-       peer->retry_count = 0;
+    /* restart now */
+    peer->retry_time = time_now;
+    peer->retry_count = 0;
 
-       /* connect */
-       return bgp_connect(peer);
+    /* connect */
+    return bgp_connect(peer);
 }
 
 static void bgp_set_retry(struct bgp_peer *peer)
 {
-       if (peer->retry_count++ < BGP_MAX_RETRY)
-       {
-               peer->retry_time = time_now + (BGP_RETRY_BACKOFF * peer->retry_count);
-               peer->next_state = Idle;
-               bgp_clear(peer);
-       }
-       else
-                       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;
-       u32 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;
-       }
+    if (peer->retry_count++ < BGP_MAX_RETRY)
+    {
+       peer->retry_time = time_now + (BGP_RETRY_BACKOFF * peer->retry_count);
+       peer->next_state = Idle;
+       bgp_clear(peer);
+    }
+    else
+       bgp_halt(peer); /* give up */
 }
 
 /* insert route into list; sorted */
 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
-       struct bgp_route_list *new)
+    struct bgp_route_list *new)
 {
-       struct bgp_route_list *p = head;
-       struct bgp_route_list *e = 0;
-
-       while (p && memcmp(&p->dest, &new->dest, sizeof(p->dest)) < 0)
-       {
-               e = p;
-               p = p->next;
-       }
-
-       if (e)
-       {
-               new->next = e->next;
-               e->next = new;
-       }
-       else
-       {
-               new->next = head;
-               head = new;
-       }
+    struct bgp_route_list *p = head;
+    struct bgp_route_list *e = 0;
+
+    while (p && memcmp(&p->dest, &new->dest, sizeof(p->dest)) < 0)
+    {
+       e = p;
+       p = p->next;
+    }
+
+    if (e)
+    {
+       new->next = e->next;
+       e->next = new;
+    }
+    else
+    {
+       new->next = head;
+       head = new;
+    }
+
+    return head;
+}
 
-       return head;
+/* insert route6 into list; sorted */
+static struct bgp_route6_list *bgp_insert_route6(struct bgp_route6_list *head,
+    struct bgp_route6_list *new)
+{
+    struct bgp_route6_list *p = head;
+    struct bgp_route6_list *e = 0;
+
+    while (p && memcmp(&p->dest, &new->dest, sizeof(p->dest)) < 0)
+    {
+       e = p;
+       p = p->next;
+    }
+
+    if (e)
+    {
+       new->next = e->next;
+       e->next = new;
+    }
+    else
+    {
+       new->next = head;
+       head = new;
+    }
+
+    return head;
 }
 
 /* add route to list for peers */
@@ -357,973 +453,1337 @@ static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
  * 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.next = 0;
+    add.dest.prefix = ip;
+    add.dest.len = prefixlen;
+    add.next = 0;
 
-       /* check for duplicate */
-       while (r)
-       {
-               i = memcmp(&r->dest, &add.dest, sizeof(r->dest));
-               if (!i)
-                       return 1; /* already covered */
+    /* check for duplicate */
+    while (r)
+    {
+       i = memcmp(&r->dest, &add.dest, sizeof(r->dest));
+       if (!i)
+           return 1; /* already covered */
 
-               if (i > 0)
-                       break;
+       if (i > 0)
+           break;
 
-               r = r->next;
-       }
+       r = r->next;
+    }
 
-       /* insert into route list; sorted */
-       if (!(r = malloc(sizeof(*r))))
-       {
-               log(0, 0, 0, 0, "Can't allocate route for %s/%d (%s)\n",
-                       inet_toa(add.dest.prefix), add.dest.len, strerror(errno));
+    /* insert into route list; sorted */
+    if (!(r = malloc(sizeof(*r))))
+    {
+       LOG(0, 0, 0, "Can't allocate route for %s/%d (%s)\n",
+           fmtaddr(add.dest.prefix, 0), add.dest.len, strerror(errno));
 
-               return 0;
-       }
+       return 0;
+    }
 
-       memcpy(r, &add, sizeof(*r));
-       bgp_routes = bgp_insert_route(bgp_routes, r);
+    memcpy(r, &add, sizeof(*r));
+    bgp_routes = bgp_insert_route(bgp_routes, r);
 
-       /* flag established peers for update */
-       for (i = 0; i < BGP_NUM_PEERS; i++)
-               if (bgp_peers[i].state == Established)
-                       bgp_peers[i].update_routes = 1;
+    /* flag established peers for update */
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+       if (bgp_peers[i].state == Established)
+           bgp_peers[i].update_routes = 1;
 
-       log(4, 0, 0, 0, "Registered BGP route %s/%d\n", inet_toa(add.dest.prefix),
-               add.dest.len);
+    LOG(4, 0, 0, "Registered BGP route %s/%d\n",
+       fmtaddr(add.dest.prefix, 0), add.dest.len);
 
-       return 1;
+    return 1;
+}
+
+/* add route to list for peers */
+/*
+ * Note: same provisions as above
+ */
+int bgp_add_route6(struct in6_addr ip, int prefixlen)
+{
+    struct bgp_route6_list *r = bgp_routes6;
+    struct bgp_route6_list add;
+    int i;
+    char ipv6addr[INET6_ADDRSTRLEN];
+
+    memcpy(&add.dest.prefix, &ip.s6_addr, 16);
+    add.dest.len = prefixlen;
+    add.next = 0;
+
+    /* check for duplicate */
+    while (r)
+    {
+       i = memcmp(&r->dest, &add.dest, sizeof(r->dest));
+       if (!i)
+           return 1; /* already covered */
+
+       if (i > 0)
+           break;
+
+       r = r->next;
+    }
+
+    /* insert into route list; sorted */
+    if (!(r = malloc(sizeof(*r))))
+    {
+       LOG(0, 0, 0, "Can't allocate route for %s/%d (%s)\n",
+           inet_ntop(AF_INET6, &ip, ipv6addr, INET6_ADDRSTRLEN), add.dest.len,
+           strerror(errno));
+
+       return 0;
+    }
+
+    memcpy(r, &add, sizeof(*r));
+    bgp_routes6 = bgp_insert_route6(bgp_routes6, r);
+
+    /* flag established peers for update */
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+       if (bgp_peers[i].state == Established
+               && bgp_peers[i].mp_handling == HandleIPv6Routes)
+           bgp_peers[i].update_routes6 = 1;
+
+    LOG(4, 0, 0, "Registered BGP route %s/%d\n",
+       inet_ntop(AF_INET6, &ip, ipv6addr, INET6_ADDRSTRLEN), add.dest.len);
+
+    return 1;
 }
 
 /* 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;
+
+    del.dest.prefix = ip;
+    del.dest.len = prefixlen;
+    del.next = 0;
+
+    /* find entry in routes list and remove */
+    while (r)
+    {
+       i = memcmp(&r->dest, &del.dest, sizeof(r->dest));
+       if (!i)
+       {
+           if (e)
+               e->next = r->next;
+           else
+               bgp_routes = r->next;
 
-       bgp_cidr(ip, mask, &del.dest);
-       del.next = 0;
+           free(r);
+           break;
+       }
 
-       /* find entry in routes list and remove */
-       while (r)
-       {
-               i = memcmp(&r->dest, &del.dest, sizeof(r->dest));
-               if (!i)
-               {
-                       if (e)
-                               e->next = r->next;
-                       else
-                               bgp_routes = r->next;
+       e = r;
 
-                       free(r);
-                       break;
-               }
+       if (i > 0)
+           r = 0; /* stop */
+       else
+           r = r->next;
+    }
 
-               e = r;
+    /* not found */
+    if (!r)
+       return 1;
 
-               if (i > 0)
-                       r = 0; /* stop */
-               else
-                       r = r->next;
-       }
+    /* flag established peers for update */
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+       if (bgp_peers[i].state == Established)
+           bgp_peers[i].update_routes = 1;
 
-       /* not found */
-       if (!r)
-               return 1;
+    LOG(4, 0, 0, "Removed BGP route %s/%d\n",
+       fmtaddr(del.dest.prefix, 0), del.dest.len);
 
-       /* flag established peers for update */
-       for (i = 0; i < BGP_NUM_PEERS; i++)
-               if (bgp_peers[i].state == Established)
-                       bgp_peers[i].update_routes = 1;
+    return 1;
+}
+
+/* remove route from list for peers */
+int bgp_del_route6(struct in6_addr ip, int prefixlen)
+{
+    struct bgp_route6_list *r = bgp_routes6;
+    struct bgp_route6_list *e = 0;
+    struct bgp_route6_list del;
+    int i;
+    char ipv6addr[INET6_ADDRSTRLEN];
+
+    memcpy(&del.dest.prefix, &ip.s6_addr, 16);
+    del.dest.len = prefixlen;
+    del.next = 0;
+
+    /* find entry in routes list and remove */
+    while (r)
+    {
+       i = memcmp(&r->dest, &del.dest, sizeof(r->dest));
+       if (!i)
+       {
+           if (e)
+               e->next = r->next;
+           else
+               bgp_routes6 = r->next;
+
+           free(r);
+           break;
+       }
 
-       log(4, 0, 0, 0, "Removed BGP route %s/%d\n", inet_toa(del.dest.prefix),
-               del.dest.len);
+       e = r;
 
+       if (i > 0)
+           r = 0; /* stop */
+       else
+           r = r->next;
+    }
+
+    /* not found */
+    if (!r)
        return 1;
+
+    /* flag established peers for update */
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+       if (bgp_peers[i].state == Established
+               && bgp_peers[i].mp_handling == HandleIPv6Routes)
+           bgp_peers[i].update_routes6 = 1;
+
+    LOG(4, 0, 0, "Removed BGP route %s/%d\n",
+       inet_ntop(AF_INET6, &ip, ipv6addr, INET6_ADDRSTRLEN), del.dest.len);
+
+    return 1;
 }
 
 /* enable or disable routing */
 void bgp_enable_routing(int enable)
 {
-       int i;
+    int i;
 
-       for (i = 0; i < BGP_NUM_PEERS; i++)
-       {
-               bgp_peers[i].routing = enable;
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+    {
+       bgp_peers[i].routing = enable;
 
-               /* flag established peers for update */
-               if (bgp_peers[i].state == Established)
-                       bgp_peers[i].update_routes = 1;
-       }
+       /* flag established peers for update */
+       if (bgp_peers[i].state == Established)
+           bgp_peers[i].update_routes = 1;
+    }
 
-       log(4, 0, 0, 0, "%s BGP routing\n", enable ? "Enabled" : "Suspended");
+    LOG(4, 0, 0, "%s BGP routing\n", enable ? "Enabled" : "Suspended");
 }
 
-/* return a bitmask indicating if the socket should be added to the
-   read set (1) and or write set (2) for select */
-int bgp_select_state(struct bgp_peer *peer)
+#ifdef HAVE_EPOLL
+# include <sys/epoll.h>
+#else
+# include "fake_epoll.h"
+#endif
+
+/* return a bitmask of the events required to poll this peer's fd */
+int bgp_set_poll()
 {
-       int flags = 0;
+    int i;
 
-       if (!bgp_configured)
-                       return 0;
+    if (!bgp_configured)
+       return 0;
+
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+    {
+       struct bgp_peer *peer = &bgp_peers[i];
+       int events = 0;
 
        if (peer->state == Disabled || peer->state == Idle)
-                       return 0;
+           continue;
 
        if (peer->inbuf->done < BGP_MAX_PACKET_SIZE)
-               flags |= 1;
+           events |= EPOLLIN;
+
+       if (peer->state == Connect ||           /* connection in progress */
+           peer->update_routes ||              /* routing updates */
+           peer->outbuf->packet.header.len)    /* pending output */
+           events |= EPOLLOUT;
+
+       if (peer->events != events)
+       {
+           struct epoll_event ev;
 
-       if (peer->state == Connect ||                           /* connection in progress */
-               peer->update_routes ||                                          /* routing updates */
-               peer->outbuf->packet.header.len)                /* pending output */
-                       flags |= 2;
+           ev.events = peer->events = events;
+           ev.data.ptr = &peer->edata;
+           epoll_ctl(epollfd, EPOLL_CTL_MOD, peer->sock, &ev);
+       }
+    }
 
-       return flags;
+    return 1;
 }
 
-/* process bgp peer */
-int bgp_process(struct bgp_peer *peer, int readable, int writable)
+/* process bgp events/timers */
+int bgp_process(uint32_t events[])
 {
-       if (!bgp_configured)
-                       return 0;
+    int i;
+
+    if (!bgp_configured)
+       return 0;
+
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+    {
+       struct bgp_peer *peer = &bgp_peers[i];
 
        if (*peer->name && peer->cli_flag == BGP_CLI_RESTART)
-               return bgp_restart(peer);
+       {
+           bgp_restart(peer);
+           continue;
+       }
 
        if (peer->state == Disabled)
-                       return 1;
+           continue;
 
        if (peer->cli_flag)
        {
-               switch (peer->cli_flag)
+           switch (peer->cli_flag)
+           {
+           case BGP_CLI_SUSPEND:
+               if (peer->routing)
                {
-                       case BGP_CLI_SUSPEND:
-                               if (peer->routing)
-                               {
-                                       peer->routing = 0;
-                                       if (peer->state == Established)
-                                               peer->update_routes = 1;
-                               }
-
-                               break;
-
-                       case BGP_CLI_ENABLE:
-                               if (!peer->routing)
-                               {
-                                       peer->routing = 1;
-                                       if (peer->state == Established)
-                                               peer->update_routes = 1;
-                               }
-
-                               break;
+                   peer->routing = 0;
+                   if (peer->state == Established)
+                       peer->update_routes = 1;
+               }
+
+               break;
+
+           case BGP_CLI_ENABLE:
+               if (!peer->routing)
+               {
+                   peer->routing = 1;
+                   if (peer->state == Established)
+                       peer->update_routes = 1;
                }
 
-               peer->cli_flag = 0;
+               break;
+           }
+
+           peer->cli_flag = 0;
        }
 
        /* handle empty/fill of buffers */
-       if (writable)
+       if (events[i] & EPOLLOUT)
        {
-               int r = 1;
-               if (peer->state == Connect)
-                       r = bgp_handle_connect(peer);
-               else if (peer->outbuf->packet.header.len)
-                       r = bgp_write(peer);
-
-               if (!r)
-                       return 0;
+           int r = 1;
+           if (peer->state == Connect)
+               r = bgp_handle_connect(peer);
+           else if (peer->outbuf->packet.header.len)
+               r = bgp_write(peer);
+
+           if (!r)
+               continue;
        }
 
-       if (readable)
+       if (events[i] & (EPOLLIN|EPOLLHUP))
        {
-               if (!bgp_read(peer))
-                       return 0;
+           if (!bgp_read(peer))
+               continue;
        }
 
        /* process input buffer contents */
        while (peer->inbuf->done >= sizeof(peer->inbuf->packet.header)
-               && !peer->outbuf->packet.header.len) /* may need to queue a response */
+           && !peer->outbuf->packet.header.len) /* may need to queue a response */
        {
-               if (bgp_handle_input(peer) < 0)
-                       return 0;
+           if (bgp_handle_input(peer) < 0)
+               continue;
        }
 
        /* process pending updates */
        if (peer->update_routes
-               && !peer->outbuf->packet.header.len) /* ditto */
+           && !peer->outbuf->packet.header.len) /* ditto */
        {
-               if (!bgp_send_update(peer))
-                       return 0;
+           if (!bgp_send_update(peer))
+               continue;
        }
 
-       /* process timers */
-       if (peer->state == Established)
+       /* process pending IPv6 updates */
+       if (peer->update_routes6
+           && !peer->outbuf->packet.header.len) /* ditto */
        {
-               if (time_now > peer->expire_time)
-               {
-                       log(1, 0, 0, 0, "No message from BGP peer %s in %ds\n",
-                               peer->name, peer->hold);
+           if (!bgp_send_update6(peer))
+               continue;
+       }
 
-                       bgp_send_notification(peer, BGP_ERR_HOLD_TIMER_EXP, 0);
-                       return 0;
-               }
+       /* process timers */
+       bgp_process_timers(peer);
+    }
 
-               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)
-                       return bgp_connect(peer);
-       }
-       else if (time_now > peer->state_time + BGP_KEEPALIVE_TIME)
+    return 1;
+}
+
+/* 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, 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);
 
-               return bgp_restart(peer);
+           bgp_send_notification(peer, BGP_ERR_HOLD_TIMER_EXP, 0);
+           return;
        }
 
-       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)
+    {
+       LOG(1, 0, 0, "%s timer expired for BGP peer %s\n",
+           bgp_state_str(peer->state), peer->name);
+
+       bgp_restart(peer);
+    }
 }
 
 static void bgp_free_routes(struct bgp_route_list *routes)
 {
-       struct bgp_route_list *tmp;
+    struct bgp_route_list *tmp;
 
-       while ((tmp = routes))
-       {
-               routes = tmp->next;
-               free(tmp);
-       }
+    while ((tmp = routes))
+    {
+       routes = tmp->next;
+       free(tmp);
+    }
 }
 
-static char const *bgp_state_str(enum bgp_state state)
+static void bgp_free_routes6(struct bgp_route6_list *routes)
 {
-       switch (state)
-       {
-       case Disabled:          return "Disabled";
-       case Idle:                              return "Idle";
-       case Connect:           return "Connect";
-       case Active:            return "Active";
-       case OpenSent:          return "OpenSent";
-       case OpenConfirm:               return "OpenConfirm";
-       case Established:               return "Established";
-       }
+    struct bgp_route6_list *tmp;
 
-       return "?";
+    while ((tmp = routes))
+    {
+       routes = tmp->next;
+       free(tmp);
+    }
 }
 
-static char const *bgp_msg_type_str(u8 type)
+char const *bgp_state_str(enum bgp_state state)
 {
-       switch (type)
-       {
-       case BGP_MSG_OPEN:                              return "OPEN";
-       case BGP_MSG_UPDATE:            return "UPDATE";
-       case BGP_MSG_NOTIFICATION:              return "NOTIFICATION";
-       case BGP_MSG_KEEPALIVE:         return "KEEPALIVE";
-       }
+    switch (state)
+    {
+    case Disabled:     return "Disabled";
+    case Idle:         return "Idle";
+    case Connect:      return "Connect";
+    case Active:       return "Active";
+    case OpenSent:     return "OpenSent";
+    case OpenConfirm:  return "OpenConfirm";
+    case Established:  return "Established";
+    }
+
+    return "?";
+}
 
-       return "?";
+static char const *bgp_msg_type_str(uint8_t type)
+{
+    switch (type)
+    {
+    case BGP_MSG_OPEN:         return "OPEN";
+    case BGP_MSG_UPDATE:       return "UPDATE";
+    case BGP_MSG_NOTIFICATION: return "NOTIFICATION";
+    case BGP_MSG_KEEPALIVE:    return "KEEPALIVE";
+    }
+
+    return "?";
 }
 
 /* attempt to connect to peer */
 static int bgp_connect(struct bgp_peer *peer)
 {
-       static int bgp_port = 0;
-       struct sockaddr_in addr;
-
-       if (!bgp_port)
+    static int bgp_port = 0;
+    struct sockaddr_in addr;
+    struct sockaddr_in source_addr;
+    struct epoll_event ev;
+
+    if (!bgp_port)
+    {
+       struct servent *serv;
+       if (!(serv = getservbyname("bgp", "tcp")))
        {
-               struct servent *serv;
-               if (!(serv = getservbyname("bgp", "tcp")))
-               {
-                       log(0, 0, 0, 0, "Can't get bgp service (%s)\n", strerror(errno));
-                       return 0;
-               }
-
-               bgp_port = serv->s_port;
+           LOG(0, 0, 0, "Can't get bgp service (%s)\n", strerror(errno));
+           return 0;
        }
 
-       if ((peer->sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+       bgp_port = serv->s_port;
+    }
+
+    if ((peer->sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+    {
+       LOG(0, 0, 0, "Can't create a socket for BGP peer %s (%s)\n",
+           peer->name, strerror(errno));
+
+       peer->state = peer->next_state = Disabled;
+       return 0;
+    }
+
+    /* add to poll set */
+    ev.events = peer->events = EPOLLOUT;
+    ev.data.ptr = &peer->edata;
+    epoll_ctl(epollfd, EPOLL_CTL_ADD, peer->sock, &ev);
+
+    /* 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;
+    addr.sin_port = bgp_port;
+    addr.sin_addr.s_addr = peer->addr;
+
+    while (connect(peer->sock, (struct sockaddr *) &addr, sizeof(addr)) == -1)
+    {
+       if (errno == EINTR) /* SIGALARM handler */
+           continue;
+
+       if (errno != EINPROGRESS)
        {
-               log(0, 0, 0, 0, "Can't create a socket for BGP peer %s (%s)\n",
-                       peer->name, strerror(errno));
+           LOG(1, 0, 0, "Can't connect to BGP peer %s (%s)\n",
+               inet_ntoa(addr.sin_addr), strerror(errno));
 
-               peer->state = peer->next_state = Disabled;
-               return 0;
+           bgp_set_retry(peer);
+           return 0;
        }
 
-       /* set to non-blocking */
-       fcntl(peer->sock, F_SETFL, fcntl(peer->sock, F_GETFL, 0) | O_NONBLOCK);
-
-       /* try connect */
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_port = bgp_port;
-       addr.sin_addr.s_addr = peer->addr;
-
-       while (connect(peer->sock, (struct sockaddr *) &addr, sizeof(addr)) == -1)
-       {
-               if (errno == EINTR) /* SIGALARM handler */
-                       continue;
-
-               if (errno != EINPROGRESS)
-               {
-                       log(1, 0, 0, 0, "Can't connect to BGP peer %s (%s)\n",
-                               inet_ntoa(addr.sin_addr), strerror(errno));
-
-                       bgp_set_retry(peer);
-                       return 0;
-               }
-
-               peer->state = Connect;
-               peer->state_time = time_now;
+       peer->state = Connect;
+       peer->state_time = time_now;
 
-               log(4, 0, 0, 0, "BGP peer %s: state Connect\n", peer->name);
-               return 1;
-       }
+       LOG(4, 0, 0, "BGP peer %s: state Connect\n", peer->name);
+       return 1;
+    }
 
-       peer->state = Active;
-       peer->state_time = time_now;
-       peer->retry_time = peer->retry_count = 0;
+    peer->state = Active;
+    peer->state_time = time_now;
+    peer->retry_time = peer->retry_count = 0;
 
-       log(4, 0, 0, 0, "BGP peer %s: state Active\n", inet_ntoa(addr.sin_addr));
+    LOG(4, 0, 0, "BGP peer %s: state Active\n", inet_ntoa(addr.sin_addr));
 
-       return bgp_send_open(peer);
+    return bgp_send_open(peer);
 }
 
 /* complete partial connection (state = Connect) */
 static int bgp_handle_connect(struct bgp_peer *peer)
 {
-       int err = 0;
-       int len = sizeof(int);
-       getsockopt(peer->sock, SOL_SOCKET, SO_ERROR, &err, &len);
-       if (err)
-       {
-               log(1, 0, 0, 0, "Can't connect to BGP peer %s (%s)\n", peer->name,
-                       strerror(err));
+    int err = 0;
+    socklen_t len = sizeof(int);
+    getsockopt(peer->sock, SOL_SOCKET, SO_ERROR, &err, &len);
+    if (err)
+    {
+       LOG(1, 0, 0, "Can't connect to BGP peer %s (%s)\n", peer->name,
+           strerror(err));
 
-               bgp_set_retry(peer);
-               return 0;
-       }
+       bgp_set_retry(peer);
+       return 0;
+    }
 
-       peer->state = Active;
-       peer->state_time = time_now;
+    peer->state = Active;
+    peer->state_time = time_now;
 
-       log(4, 0, 0, 0, "BGP peer %s: state Active\n", peer->name);
+    LOG(4, 0, 0, "BGP peer %s: state Active\n", peer->name);
 
-       return bgp_send_open(peer);
+    return bgp_send_open(peer);
 }
 
 /* initiate a write */
 static int bgp_write(struct bgp_peer *peer)
 {
-       int len = htons(peer->outbuf->packet.header.len);
-       int r;
+    int len = htons(peer->outbuf->packet.header.len);
+    int r;
 
-       while ((r = write(peer->sock, &peer->outbuf->packet + peer->outbuf->done,
-               len - peer->outbuf->done)) == -1)
-       {
-               if (errno == EINTR)
-                       continue;
+    while ((r = write(peer->sock, &peer->outbuf->packet + peer->outbuf->done,
+       len - peer->outbuf->done)) == -1)
+    {
+       if (errno == EINTR)
+           continue;
 
-               if (errno == EAGAIN)
-                       return 1;
+       if (errno == EAGAIN)
+           return 1;
 
-               if (errno == EPIPE)
-                       log(1, 0, 0, 0, "Connection to BGP peer %s closed\n", peer->name);
-               else
-                       log(1, 0, 0, 0, "Can't write to BGP peer %s (%s)\n", peer->name,
-                               strerror(errno));
+       if (errno == EPIPE)
+           LOG(1, 0, 0, "Connection to BGP peer %s closed\n", peer->name);
+       else
+           LOG(1, 0, 0, "Can't write to BGP peer %s (%s)\n", peer->name,
+               strerror(errno));
 
-               bgp_set_retry(peer);
-               return 0;
-       }
+       bgp_set_retry(peer);
+       return 0;
+    }
 
-       if (r < len)
-       {
-               peer->outbuf->done += r;
-               return 1;
-       }
+    if (r < len)
+    {
+       peer->outbuf->done += r;
+       return 1;
+    }
 
-       log(4, 0, 0, 0, "Sent %s to BGP peer %s\n",
-               bgp_msg_type_str(peer->outbuf->packet.header.type), peer->name);
+    LOG(4, 0, 0, "Sent %s to BGP peer %s\n",
+       bgp_msg_type_str(peer->outbuf->packet.header.type), peer->name);
 
-       peer->outbuf->packet.header.len = 0;
-       peer->outbuf->done = 0;
+    peer->outbuf->packet.header.len = 0;
+    peer->outbuf->done = 0;
 
-       if (peer->state == Established)
-               peer->keepalive_time = time_now + BGP_KEEPALIVE_TIME;
+    if (peer->state == Established)
+       peer->keepalive_time = time_now + peer->keepalive;
 
-       if (peer->state != peer->next_state)
+    if (peer->state != peer->next_state)
+    {
+       if (peer->next_state == Disabled || peer->next_state == Idle)
        {
-               if (peer->next_state == Disabled || peer->next_state == Idle)
-               {
-                       bgp_clear(peer);
-                       return 0;
-               }
+           bgp_clear(peer);
+           return 0;
+       }
 
-               peer->state = peer->next_state;
-               peer->state_time = time_now;
+       peer->state = peer->next_state;
+       peer->state_time = time_now;
 
-               log(4, 0, 0, 0, "BGP peer %s: state %s\n", peer->name,
-                       bgp_state_str(peer->state));
-       }
+       LOG(4, 0, 0, "BGP peer %s: state %s\n", peer->name,
+           bgp_state_str(peer->state));
+    }
 
-       return 1;
+    return 1;
 }
 
 /* initiate a read */
 static int bgp_read(struct bgp_peer *peer)
 {
-       int r;
+    int r;
 
-       while ((r = read(peer->sock, &peer->inbuf->packet + peer->inbuf->done,
-               BGP_MAX_PACKET_SIZE - peer->inbuf->done)) < 1)
+    while ((r = read(peer->sock, &peer->inbuf->packet + peer->inbuf->done,
+       BGP_MAX_PACKET_SIZE - peer->inbuf->done)) < 1)
+    {
+       if (!r)
        {
-               if (!r)
-               {
-                       log(1, 0, 0, 0, "Connection to BGP peer %s closed\n", peer->name);
-               }
-               else
-               {
-                       if (errno == EINTR)
-                               continue;
-
-                       if (errno == EAGAIN)
-                               return 1;
+           LOG(1, 0, 0, "Connection to BGP peer %s closed\n", peer->name);
+       }
+       else
+       {
+           if (errno == EINTR)
+               continue;
 
-                       log(1, 0, 0, 0, "Can't read from BGP peer %s (%s)\n", peer->name,
-                               strerror(errno));
-               }
+           if (errno == EAGAIN)
+               return 1;
 
-               bgp_set_retry(peer);
-               return 0;
+           LOG(1, 0, 0, "Can't read from BGP peer %s (%s)\n", peer->name,
+               strerror(errno));
        }
 
-       peer->inbuf->done += r;
-       return 1;
+       bgp_set_retry(peer);
+       return 0;
+    }
+
+    peer->inbuf->done += r;
+    return 1;
 }
 
 /* process buffered packets */
 static int bgp_handle_input(struct bgp_peer *peer)
 {
-       struct bgp_packet *p = &peer->inbuf->packet;
-       int len = ntohs(p->header.len);
+    struct bgp_packet *p = &peer->inbuf->packet;
+    int len = ntohs(p->header.len);
+
+    if (len > BGP_MAX_PACKET_SIZE)
+    {
+       LOG(1, 0, 0, "Bad header length from BGP %s\n", peer->name);
+       bgp_send_notification(peer, BGP_ERR_HEADER, BGP_ERR_HDR_BAD_LEN);
+       return 0;
+    }
+
+    if (peer->inbuf->done < len)
+       return 0;
 
-       if (len > BGP_MAX_PACKET_SIZE)
+    LOG(4, 0, 0, "Received %s from BGP peer %s\n",
+       bgp_msg_type_str(p->header.type), peer->name);
+
+    switch (p->header.type)
+    {
+    case BGP_MSG_OPEN:
        {
-               log(1, 0, 0, 0, "Bad header length from BGP %s\n", peer->name);
-               bgp_send_notification(peer, BGP_ERR_HEADER, BGP_ERR_HDR_BAD_LEN);
+           struct bgp_data_open data;
+           int hold;
+           int i;
+           off_t param_offset, capability_offset;
+           struct bgp_opt_param *param;
+           uint8_t capabilities_len;
+           char *capabilities = NULL;
+           struct bgp_capability *capability;
+           struct bgp_mp_cap_param *mp_cap;
+
+           for (i = 0; i < sizeof(p->header.marker); i++)
+           {
+               if ((unsigned char) p->header.marker[i] != 0xff)
+               {
+                   LOG(1, 0, 0, "Invalid marker from BGP peer %s\n",
+                       peer->name);
+
+                   bgp_send_notification(peer, BGP_ERR_HEADER,
+                       BGP_ERR_HDR_NOT_SYNC);
+
+                   return 0;
+               }
+           }
+
+           if (peer->state != OpenSent)
+           {
+               LOG(1, 0, 0, "OPEN from BGP peer %s in %s state\n",
+                   peer->name, bgp_state_str(peer->state));
+
+               bgp_send_notification(peer, BGP_ERR_FSM, 0);
                return 0;
-       }
+           }
+
+           memcpy(&data, p->data, len - sizeof(p->header));
 
-       if (peer->inbuf->done < len)
+           if (data.version != BGP_VERSION)
+           {
+               LOG(1, 0, 0, "Bad version (%d) sent by BGP peer %s\n",
+                   (int) data.version, peer->name);
+
+               bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_VERSION);
                return 0;
+           }
 
-       log(4, 0, 0, 0, "Received %s from BGP peer %s\n",
-               bgp_msg_type_str(p->header.type), peer->name);
+           if (ntohs(data.as) != peer->as)
+           {
+               LOG(1, 0, 0, "Bad AS sent by BGP peer %s (got %d, "
+                   "expected %d)\n", peer->name, (int) htons(data.as),
+                   (int) peer->as);
 
-       switch (p->header.type)
-       {
-       case BGP_MSG_OPEN:
+               bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_BAD_AS);
+               return 0;
+           }
+
+           if ((hold = ntohs(data.hold_time)) < 3)
+           {
+               LOG(1, 0, 0, "Bad hold time (%d) from BGP peer %s\n",
+                   hold, peer->name);
+
+               bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_HOLD_TIME);
+               return 0;
+           }
+
+           /* pick lowest hold time */
+           if (hold < peer->hold)
+               peer->hold = hold;
+
+           /* adjust our keepalive based on negotiated hold value */
+           if (peer->keepalive * 3 > peer->hold)
+               peer->keepalive = peer->hold / 3;
+
+           /* check for optional parameters */
+           /* 2 is for the size of type + len (both uint8_t) */
+           for (param_offset = 0;
+                   param_offset < data.opt_len;
+                   param_offset += 2 + param->len)
+           {
+               param = (struct bgp_opt_param *)((char *)&data.opt_params + param_offset);
+
+               /* sensible check */
+               if (data.opt_len - param_offset < 2
+                       || param->len > data.opt_len - param_offset - 2)
                {
-                       struct bgp_data_open data;
-                       int i;
-
-                       for (i = 0; i < sizeof(p->header.marker); i++)
-                       {
-                               if ((unsigned char) p->header.marker[i] != 0xff)
-                               {
-                                       log(1, 0, 0, 0, "Invalid marker from BGP peer %s\n",
-                                               peer->name);
-
-                                       bgp_send_notification(peer, BGP_ERR_HEADER,
-                                               BGP_ERR_HDR_NOT_SYNC);
-
-                                       return 0;
-                               }
-                       }
-
-                       if (peer->state != OpenSent)
-                       {
-                               log(1, 0, 0, 0, "OPEN from BGP peer %s in %s state\n",
-                                       peer->name, bgp_state_str(peer->state));
-
-                               bgp_send_notification(peer, BGP_ERR_FSM, 0);
-                               return 0;
-                       }
-
-                       memcpy(&data, p->data, len - sizeof(p->header));
-
-                       if (data.version != BGP_VERSION)
-                       {
-                               log(1, 0, 0, 0, "Bad version (%d) sent by BGP peer %s\n",
-                                       (int) data.version, peer->name);
-
-                               bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_VERSION);
-                               return 0;
-                       }
-
-                       if (ntohs(data.as) != peer->as)
-                       {
-                               log(1, 0, 0, 0, "Bad AS sent by BGP peer %s (got %d, "
-                                       "expected %d)\n", peer->name, (int) htons(data.as),
-                                       (int) peer->as);
-
-                               bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_BAD_AS);
-                               return 0;
-                       }
-
-                       if ((peer->hold = ntohs(data.hold_time)) < 10)
-                       {
-                               log(1, 0, 0, 0, "Bad hold time (%d) from BGP peer %s\n",
-                                       peer->hold, peer->name);
-
-                               bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_HOLD_TIME);
-                               return 0;
-                       }
-
-                       /* next transition requires an exchange of keepalives */
-                       bgp_send_keepalive(peer);
-
-                       /* FIXME: may need to check for optional params */
-               }
+                   LOG(1, 0, 0, "Malformed Optional Parameter list from BGP peer %s\n",
+                       peer->name);
 
-               break;
+                   bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_UNSPEC);
+                   return 0;
+               }
 
-       case BGP_MSG_KEEPALIVE:
-               if (peer->state == OpenConfirm)
+               /* we know only one parameter type */
+               if (param->type != BGP_PARAM_TYPE_CAPABILITY)
                {
-                       peer->state = peer->next_state = Established;
-                       peer->state_time = time_now;
-                       peer->keepalive_time = time_now + BGP_KEEPALIVE_TIME;
-                       peer->update_routes = 1;
-                       peer->retry_count = 0;
-                       peer->retry_time = 0;
+                   LOG(1, 0, 0, "Unsupported Optional Parameter type %d from BGP peer %s\n",
+                       param->type, peer->name);
 
-                       log(4, 0, 0, 0, "BGP peer %s: state Established\n", peer->name);
+                   bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_OPN_UNSUP_PARAM);
+                   return 0;
                }
 
-               break;
+               capabilities_len = param->len;
+               capabilities = (char *)&param->value;
 
-       case BGP_MSG_NOTIFICATION:
-               if (len > sizeof(p->header))
+               /* look for BGP multiprotocol capability */
+               for (capability_offset = 0;
+                       capability_offset < capabilities_len;
+                       capability_offset += 2 + capability->len)
                {
-                       struct bgp_data_notification *notification =
-                               (struct bgp_data_notification *) p->data;
-
-                       if (notification->error_code == BGP_ERR_CEASE)
-                       {
-                               log(4, 0, 0, 0, "BGP peer %s sent CEASE\n", peer->name);
-                               bgp_halt(peer);
-                               return 0;
-                       }
-
-                       /* FIXME: should handle more notifications */
-                       log(4, 0, 0, 0, "BGP peer %s sent unhandled NOTIFICATION %d\n",
-                               peer->name, (int) notification->error_code);
-               }
+                   capability = (struct bgp_capability *)(capabilities + capability_offset);
 
-               break;
+                   /* sensible check */
+                   if (capabilities_len - capability_offset < 2
+                           || capability->len > capabilities_len - capability_offset - 2)
+                   {
+                       LOG(1, 0, 0, "Malformed Capabilities list from BGP peer %s\n",
+                           peer->name);
+
+                       bgp_send_notification(peer, BGP_ERR_OPEN, BGP_ERR_UNSPEC);
+                       return 0;
+                   }
+
+                   /* we only know one capability code */
+                   if (capability->code != BGP_CAP_CODE_MP
+                           && capability->len != sizeof(struct bgp_mp_cap_param))
+                   {
+                       LOG(4, 0, 0, "Unsupported Capability code %d from BGP peer %s\n",
+                           capability->code, peer->name);
+
+                       /* we don't terminate, still; we just jump to the next one */
+                       continue;
+                   }
+
+                   mp_cap = (struct bgp_mp_cap_param *)&capability->value;
+                   /* the only <AFI, SAFI> tuple we support */
+                   if (ntohs(mp_cap->afi) != BGP_MP_AFI_IPv6 && mp_cap->safi != BGP_MP_SAFI_UNICAST)
+                   {
+                       LOG(4, 0, 0, "Unsupported multiprotocol AFI %d and SAFI %d from BGP peer %s\n",
+                           mp_cap->afi, mp_cap->safi, peer->name);
+
+                       /* we don't terminate, still; we just jump to the next one */
+                       continue;
+                   }
+
+                   /* yes it can! */
+                   peer->mp_handling = HandleIPv6Routes;
+               }
+           }
+
+           if (peer->mp_handling != HandleIPv6Routes)
+           {
+               peer->mp_handling = DoesntHandleIPv6Routes;
+               if (config->ipv6_prefix.s6_addr[0])
+                   LOG(1, 0, 0, "Warning: BGP peer %s doesn't handle IPv6 prefixes updates\n",
+                           peer->name);
+           }
+
+           /* next transition requires an exchange of keepalives */
+           bgp_send_keepalive(peer);
        }
 
-       /* reset timer */
-       peer->expire_time = time_now + peer->hold;
+       break;
 
-       /* see if there's another message in the same packet/buffer */
-       if (peer->inbuf->done > len)
+    case BGP_MSG_KEEPALIVE:
+       if (peer->state == OpenConfirm)
        {
-               peer->inbuf->done -= len;
-               memmove(p, (char *) p + len, peer->inbuf->done);
+           peer->state = peer->next_state = Established;
+           peer->state_time = time_now;
+           peer->keepalive_time = time_now + peer->keepalive;
+           peer->update_routes = 1;
+           peer->retry_count = 0;
+           peer->retry_time = 0;
+
+           LOG(4, 0, 0, "BGP peer %s: state Established\n", peer->name);
        }
-       else
+
+       break;
+
+    case BGP_MSG_NOTIFICATION:
+       if (len > sizeof(p->header))
        {
-               peer->inbuf->packet.header.len = 0;
-               peer->inbuf->done = 0;
+           struct bgp_data_notification *notification =
+               (struct bgp_data_notification *) p->data;
+
+           if (notification->error_code == BGP_ERR_CEASE)
+           {
+               LOG(4, 0, 0, "BGP peer %s sent CEASE\n", peer->name);
+               bgp_set_retry(peer);
+               return 0;
+           }
+
+           if (notification->error_code == BGP_ERR_OPEN
+                   && notification->error_subcode == BGP_ERR_OPN_UNSUP_PARAM)
+           {
+               LOG(4, 0, 0, "BGP peer %s doesn't support BGP Capabilities\n", peer->name);
+               peer->mp_handling = DoesntHandleIPv6Routes;
+               bgp_set_retry(peer);
+               return 0;
+           }
+
+           if (notification->error_code == BGP_ERR_OPEN
+                   && notification->error_subcode == BGP_ERR_OPN_UNSUP_CAP)
+           {
+               /* the only capability we advertise is this one, so upon receiving
+                  an "unsupported capability" message, we disable IPv6 routes for
+                  this peer */
+               LOG(4, 0, 0, "BGP peer %s doesn't support IPv6 routes advertisement\n", peer->name);
+               peer->mp_handling = DoesntHandleIPv6Routes;
+               break;
+           }
+
+           /* FIXME: should handle more notifications */
+           LOG(4, 0, 0, "BGP peer %s sent unhandled NOTIFICATION %d\n",
+               peer->name, (int) notification->error_code);
        }
 
-       return peer->inbuf->done;
+       break;
+    }
+
+    /* reset timer */
+    peer->expire_time = time_now + peer->hold;
+
+    /* see if there's another message in the same packet/buffer */
+    if (peer->inbuf->done > len)
+    {
+       peer->inbuf->done -= len;
+       memmove(p, (char *) p + len, peer->inbuf->done);
+    }
+    else
+    {
+       peer->inbuf->packet.header.len = 0;
+       peer->inbuf->done = 0;
+    }
+
+    return peer->inbuf->done;
 }
 
 /* send/buffer OPEN message */
 static int bgp_send_open(struct bgp_peer *peer)
 {
-       struct bgp_data_open data;
-       u16 len = sizeof(peer->outbuf->packet.header);
-
-       memset(peer->outbuf->packet.header.marker, 0xff,
-               sizeof(peer->outbuf->packet.header.marker));
-
-       peer->outbuf->packet.header.type = BGP_MSG_OPEN;
-
-       data.version = BGP_VERSION;
-       data.as = htons(our_as);
-       data.hold_time = htons(BGP_HOLD_TIME);
+    struct bgp_data_open data;
+    struct bgp_mp_cap_param mp_ipv6 = { htons(BGP_MP_AFI_IPv6), 0, BGP_MP_SAFI_UNICAST };
+    struct bgp_capability cap_mp_ipv6;
+    struct bgp_opt_param param_cap_mp_ipv6;
+    uint16_t len = sizeof(peer->outbuf->packet.header);
+
+    memset(peer->outbuf->packet.header.marker, 0xff,
+       sizeof(peer->outbuf->packet.header.marker));
+
+    peer->outbuf->packet.header.type = BGP_MSG_OPEN;
+
+    data.version = BGP_VERSION;
+    data.as = htons(our_as);
+    data.hold_time = htons(peer->hold);
+    /* 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 (config->ipv6_prefix.s6_addr[0]
+           && (peer->mp_handling == HandlingUnknown
+               || peer->mp_handling == HandleIPv6Routes))
+    {
+       /* construct the param and capability */
+       cap_mp_ipv6.code = BGP_CAP_CODE_MP;
+       cap_mp_ipv6.len = sizeof(mp_ipv6);
+       memcpy(&cap_mp_ipv6.value, &mp_ipv6, cap_mp_ipv6.len);
+
+       param_cap_mp_ipv6.type = BGP_PARAM_TYPE_CAPABILITY;
+       param_cap_mp_ipv6.len = 2 + sizeof(mp_ipv6);
+       memcpy(&param_cap_mp_ipv6.value, &cap_mp_ipv6, param_cap_mp_ipv6.len);
+
+       data.opt_len = 2 + param_cap_mp_ipv6.len;
+       memcpy(&data.opt_params, &param_cap_mp_ipv6, data.opt_len);
+    }
+    else
        data.opt_len = 0;
 
-       memcpy(peer->outbuf->packet.data, &data, BGP_DATA_OPEN_SIZE);
-       len += BGP_DATA_OPEN_SIZE;
+    memcpy(peer->outbuf->packet.data, &data, BGP_DATA_OPEN_SIZE + data.opt_len);
+    len += BGP_DATA_OPEN_SIZE + data.opt_len;
 
-       peer->outbuf->packet.header.len = htons(len);
-       peer->outbuf->done = 0;
-       peer->next_state = OpenSent;
+    peer->outbuf->packet.header.len = htons(len);
+    peer->outbuf->done = 0;
+    peer->next_state = OpenSent;
 
-       return bgp_write(peer);
+    return bgp_write(peer);
 }
 
 /* send/buffer KEEPALIVE message */
 static int bgp_send_keepalive(struct bgp_peer *peer)
 {
-       memset(peer->outbuf->packet.header.marker, 0xff,
-               sizeof(peer->outbuf->packet.header.marker));
+    memset(peer->outbuf->packet.header.marker, 0xff,
+       sizeof(peer->outbuf->packet.header.marker));
 
-       peer->outbuf->packet.header.type = BGP_MSG_KEEPALIVE;
-       peer->outbuf->packet.header.len =
-               htons(sizeof(peer->outbuf->packet.header));
+    peer->outbuf->packet.header.type = BGP_MSG_KEEPALIVE;
+    peer->outbuf->packet.header.len =
+       htons(sizeof(peer->outbuf->packet.header));
 
-       peer->outbuf->done = 0;
-       peer->next_state = (peer->state == OpenSent) ? OpenConfirm : peer->state;
+    peer->outbuf->done = 0;
+    peer->next_state = (peer->state == OpenSent) ? OpenConfirm : peer->state;
 
-       return bgp_write(peer);
+    return bgp_write(peer);
 }
 
 /* send/buffer UPDATE message */
 static int bgp_send_update(struct bgp_peer *peer)
 {
-       u16 unf_len = 0;
-       u16 attr_len;
-       u16 len = sizeof(peer->outbuf->packet.header);
-       struct bgp_route_list *have = peer->routes;
-       struct bgp_route_list *want = peer->routing ? bgp_routes : 0;
-       struct bgp_route_list *e = 0;
-       struct bgp_route_list *add = 0;
-       int s;
-
-       char *data = (char *) &peer->outbuf->packet.data;
-
-       /* need leave room for attr_len, bgp_path_attrs and one prefix */
-       char *max = (char *) &peer->outbuf->packet.data
-               + sizeof(peer->outbuf->packet.data)
-               - sizeof(attr_len) - peer->path_attr_len - sizeof(struct bgp_ip_prefix);
-
-       /* skip over unf_len */
-       data += sizeof(unf_len);
-       len += sizeof(unf_len);
-
-       memset(peer->outbuf->packet.header.marker, 0xff,
-               sizeof(peer->outbuf->packet.header.marker));
-
-       peer->outbuf->packet.header.type = BGP_MSG_UPDATE;
-
-       peer->update_routes = 0; /* tentatively clear */
+    uint16_t unf_len = 0;
+    uint16_t attr_len;
+    uint16_t len = sizeof(peer->outbuf->packet.header);
+    struct bgp_route_list *have = peer->routes;
+    struct bgp_route_list *want = peer->routing ? bgp_routes : 0;
+    struct bgp_route_list *e = 0;
+    struct bgp_route_list *add = 0;
+    int s;
+
+    char *data = (char *) &peer->outbuf->packet.data;
+
+    /* need leave room for attr_len, bgp_path_attrs and one prefix */
+    char *max = (char *) &peer->outbuf->packet.data
+       + sizeof(peer->outbuf->packet.data)
+       - sizeof(attr_len) - peer->path_attr_len - sizeof(struct bgp_ip_prefix);
+
+    /* skip over unf_len */
+    data += sizeof(unf_len);
+    len += sizeof(unf_len);
+
+    memset(peer->outbuf->packet.header.marker, 0xff,
+       sizeof(peer->outbuf->packet.header.marker));
+
+    peer->outbuf->packet.header.type = BGP_MSG_UPDATE;
+
+    peer->update_routes = 0; /* tentatively clear */
+
+    /* find differences */
+    while ((have || want) && data < (max - sizeof(struct bgp_ip_prefix)))
+    {
+       if (have)
+           s = want
+               ? memcmp(&have->dest, &want->dest, sizeof(have->dest))
+               : -1;
+       else
+           s = 1;
 
-       /* find differences */
-       while ((have || want) && data < (max - sizeof(struct bgp_ip_prefix)))
+       if (s < 0) /* found one to delete */
        {
-               if (have)
-                       s = want
-                               ? memcmp(&have->dest, &want->dest, sizeof(have->dest))
-                                       : -1;
-               else
-                       s = 1;
-
-               if (s < 0) /* found one to delete */
-               {
-                       struct bgp_route_list *tmp = have;
-                       have = have->next;
+           struct bgp_route_list *tmp = have;
+           have = have->next;
 
-                       s = BGP_IP_PREFIX_SIZE(tmp->dest);
-                       memcpy(data, &tmp->dest, s);
-                       data += s;
-                       unf_len += s;
-                       len += s;
+           s = BGP_IP_PREFIX_SIZE(tmp->dest);
+           memcpy(data, &tmp->dest, s);
+           data += s;
+           unf_len += s;
+           len += s;
 
-                       log(5, 0, 0, 0, "Withdrawing route %s/%d from BGP peer %s\n",
-                               inet_toa(tmp->dest.prefix), tmp->dest.len, peer->name);
+           LOG(5, 0, 0, "Withdrawing route %s/%d from BGP peer %s\n",
+               fmtaddr(tmp->dest.prefix, 0), tmp->dest.len, peer->name);
 
-                       free(tmp);
+           free(tmp);
 
-                       if (e)
-                               e->next = have;
-                       else
-                                       peer->routes = have;
-               }
-               else
-               {
-                       if (!s) /* same */
-                       {
-                               e = have; /* stash the last found to relink above */
-                               have = have->next;
-                               want = want->next;
-                       }
-                       else if (s > 0) /* addition reqd. */
-                       {
-                               if (add)
-                               {
-                                       peer->update_routes = 1; /* only one add per packet */
-                                       if (!have)
-                                                       break;
-                               }
-                               else
-                                       add = want;
-
-                               if (want)
-                                       want = want->next;
-                       }
-               }
+           if (e)
+               e->next = have;
+           else
+               peer->routes = have;
        }
-
-       if (have || want)
-               peer->update_routes = 1; /* more to do */
-
-       /* anything changed? */
-       if (!(unf_len || add))
-               return 1;
-
-       /* go back and insert unf_len */
-       unf_len = htons(unf_len);
-       memcpy(&peer->outbuf->packet.data, &unf_len, sizeof(unf_len));
-
-       if (add)
+       else
        {
-               if (!(e = malloc(sizeof(*e))))
+           if (!s) /* same */
+           {
+               e = have; /* stash the last found to relink above */
+               have = have->next;
+               want = want->next;
+           }
+           else if (s > 0) /* addition reqd. */
+           {
+               if (add)
                {
-                       log(0, 0, 0, 0, "Can't allocate route for %s/%d (%s)\n",
-                               inet_toa(add->dest.prefix), add->dest.len, strerror(errno));
-
-                       return 0;
+                   peer->update_routes = 1; /* only one add per packet */
+                   if (!have)
+                       break;
                }
+               else
+                   add = want;
 
-               memcpy(e, add, sizeof(*e));
-               e->next = 0;
-               peer->routes = bgp_insert_route(peer->routes, e);
-
-               attr_len = htons(peer->path_attr_len);
-               memcpy(data, &attr_len, sizeof(attr_len));
-               data += sizeof(attr_len);
-               len += sizeof(attr_len);
-
-               memcpy(data, peer->path_attrs, peer->path_attr_len);
-               data += peer->path_attr_len;
-               len += peer->path_attr_len;
-
-               s = BGP_IP_PREFIX_SIZE(add->dest);
-               memcpy(data, &add->dest, s);
-               data += s;
-               len += s;
-
-               log(5, 0, 0, 0, "Advertising route %s/%d to BGP peer %s\n",
-                       inet_toa(add->dest.prefix), add->dest.len, peer->name);
+               if (want)
+                   want = want->next;
+           }
        }
-       else
-       {
-               attr_len = 0;
-               memcpy(data, &attr_len, sizeof(attr_len));
-               data += sizeof(attr_len);
-               len += sizeof(attr_len);
-       }
-
-       peer->outbuf->packet.header.len = htons(len);
-       peer->outbuf->done = 0;
-
-       return bgp_write(peer);
-}
+    }
 
-/* send/buffer NOTIFICATION message */
-static int bgp_send_notification(struct bgp_peer *peer, u8 code, u8 subcode)
-{
-       struct bgp_data_notification data;
-       u16 len = 0;
-
-       data.error_code = code;
-       len += sizeof(data.error_code);
+    if (have || want)
+       peer->update_routes = 1; /* more to do */
 
-       data.error_subcode = subcode;
-       len += sizeof(data.error_code);
-
-       memset(peer->outbuf->packet.header.marker, 0xff,
-               sizeof(peer->outbuf->packet.header.marker));
-
-       peer->outbuf->packet.header.type = BGP_MSG_NOTIFICATION;
-       peer->outbuf->packet.header.len =
-               htons(sizeof(peer->outbuf->packet.header) + len);
+    /* anything changed? */
+    if (!(unf_len || add))
+       return 1;
 
-       memcpy(peer->outbuf->packet.data, &data, len);
+    /* go back and insert unf_len */
+    unf_len = htons(unf_len);
+    memcpy(&peer->outbuf->packet.data, &unf_len, sizeof(unf_len));
 
-       peer->outbuf->done = 0;
-       peer->next_state = code == BGP_ERR_CEASE ? Disabled : Idle;
+    if (add)
+    {
+       if (!(e = malloc(sizeof(*e))))
+       {
+           LOG(0, 0, 0, "Can't allocate route for %s/%d (%s)\n",
+               fmtaddr(add->dest.prefix, 0), add->dest.len, strerror(errno));
 
-       /* we're dying; ignore any pending input */
-       peer->inbuf->packet.header.len = 0;
-       peer->inbuf->done = 0;
+           return 0;
+       }
 
-       return bgp_write(peer);
+       memcpy(e, add, sizeof(*e));
+       e->next = 0;
+       peer->routes = bgp_insert_route(peer->routes, e);
+
+       attr_len = htons(peer->path_attr_len);
+       memcpy(data, &attr_len, sizeof(attr_len));
+       data += sizeof(attr_len);
+       len += sizeof(attr_len);
+
+       memcpy(data, peer->path_attrs, peer->path_attr_len);
+       data += peer->path_attr_len;
+       len += peer->path_attr_len;
+
+       s = BGP_IP_PREFIX_SIZE(add->dest);
+       memcpy(data, &add->dest, s);
+       data += s;
+       len += s;
+
+       LOG(5, 0, 0, "Advertising route %s/%d to BGP peer %s\n",
+           fmtaddr(add->dest.prefix, 0), add->dest.len, peer->name);
+    }
+    else
+    {
+       attr_len = 0;
+       memcpy(data, &attr_len, sizeof(attr_len));
+       data += sizeof(attr_len);
+       len += sizeof(attr_len);
+    }
+
+    peer->outbuf->packet.header.len = htons(len);
+    peer->outbuf->done = 0;
+
+    return bgp_write(peer);
 }
 
-/* CLI stuff */
-
-#include <libcli.h>
-
-int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc)
+/* send/buffer UPDATE message for IPv6 routes */
+static int bgp_send_update6(struct bgp_peer *peer)
 {
-       int i;
-       int hdr = 0;
-       char *addr;
+    uint16_t attr_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;
+    struct bgp_route6_list *want = peer->routing ? bgp_routes6 : 0;
+    struct bgp_route6_list *e = 0;
+    struct bgp_route6_list *add = 0;
+    int s;
+    char ipv6addr[INET6_ADDRSTRLEN];
+
+    char *data = (char *) &peer->outbuf->packet.data;
+
+    /* need leave room for attr_len, bgp_path_attrs and one prefix */
+    char *max = (char *) &peer->outbuf->packet.data
+       + sizeof(peer->outbuf->packet.data)
+       - sizeof(attr_len) - peer->path_attr_len_without_nexthop
+       - BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE - sizeof(struct bgp_ip6_prefix);
+
+    memset(peer->outbuf->packet.header.marker, 0xff,
+       sizeof(peer->outbuf->packet.header.marker));
+
+    peer->outbuf->packet.header.type = BGP_MSG_UPDATE;
+
+    /* 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);
+    data += 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,
+           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;
+    attr_len += BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
+
+    peer->update_routes6 = 0; /* tentatively clear */
+
+    /* find differences */
+    while ((have || want) && data < (max - sizeof(struct bgp_ip6_prefix)))
+    {
+       if (have)
+           s = want
+               ? memcmp(&have->dest, &want->dest, sizeof(have->dest))
+               : -1;
+       else
+           s = 1;
 
-       if (!bgp_configured)
-                       return CLI_OK;
+       if (s < 0) /* found one to delete */
+       {
+           struct bgp_route6_list *tmp = have;
+           have = have->next;
 
-       if (CLI_HELP_REQUESTED)
-               return cli_arg_help(cli, 1,
-                       "A.B.C.D", "BGP peer address",
-                       "NAME", "BGP peer name",
-                       NULL);
+           s = BGP_IP_PREFIX_SIZE(tmp->dest);
+           memcpy(data, &tmp->dest, s);
+           data += s;
+           unreach_len += s;
+           attr_len += s;
 
-       cli_print(cli, "BGPv%d router identifier %s, local AS number %d, "
-               "hold time %ds", BGP_VERSION, inet_toa(my_address), (int) our_as,
-               BGP_HOLD_TIME);
+           LOG(5, 0, 0, "Withdrawing route %s/%d from BGP peer %s\n",
+               inet_ntop(AF_INET6, &tmp->dest.prefix, ipv6addr, INET6_ADDRSTRLEN),
+               tmp->dest.len, peer->name);
 
-       time(&time_now);
+           free(tmp);
 
-       for (i = 0; i < BGP_NUM_PEERS; i++)
+           if (e)
+               e->next = have;
+           else
+               peer->routes6 = have;
+       }
+       else
        {
-               if (!*bgp_peers[i].name)
-                       continue;
-
-               addr = inet_toa(bgp_peers[i].addr);
-               if (argc && strcmp(addr, argv[0]) &&
-                 strncmp(bgp_peers[i].name, argv[0], strlen(argv[0])))
-                       continue;
-
-               if (!hdr++)
+           if (!s) /* same */
+           {
+               e = have; /* stash the last found to relink above */
+               have = have->next;
+               want = want->next;
+           }
+           else if (s > 0) /* addition reqd. */
+           {
+               if (add)
                {
-                       cli_print(cli, "");
-                       cli_print(cli, "Peer                              AS             Address "
-                               "State     Retries Retry in Route Pend");
-                       cli_print(cli, "------------------ ----- --------------- "
-                               "----------- ------- -------- ----- ----");
+                   peer->update_routes6 = 1; /* only one add per packet */
+                   if (!have)
+                       break;
                }
+               else
+                   add = want;
 
-               cli_print(cli, "%-18.18s %5d %15s %-11s %7d %7ds %5s %4s",
-                       bgp_peers[i].name,
-                       bgp_peers[i].as,
-                       addr,
-                       bgp_state_str(bgp_peers[i].state),
-                       bgp_peers[i].retry_count,
-                       bgp_peers[i].retry_time ? bgp_peers[i].retry_time - time_now : 0,
-                       bgp_peers[i].routing ? "yes" : "no",
-                       bgp_peers[i].update_routes ? "yes" : "no");
+               if (want)
+                   want = want->next;
+           }
        }
+    }
 
-       return CLI_OK;
-}
+    if (have || want)
+       peer->update_routes6 = 1; /* more to do */
 
-int cmd_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc)
-{
-       int i;
-       char *addr;
-
-       if (!bgp_configured)
-                       return CLI_OK;
-
-       if (CLI_HELP_REQUESTED)
-               return cli_arg_help(cli, 1,
-                       "A.B.C.D", "BGP peer address",
-                       "NAME", "BGP peer name",
-                       NULL);
+    /* anything changed? */
+    if (!(unreach_len || add))
+       return 1;
 
-       for (i = 0; i < BGP_NUM_PEERS; i++)
+    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;
+       attr_len -= BGP_PATH_ATTR_MP_UNREACH_NLRI_PARTIAL_SIZE;
+    }
+
+    if (add)
+    {
+       if (!(e = malloc(sizeof(*e))))
        {
-               if (bgp_peers[i].state != Established)
-                       continue;
-
-               if (!bgp_peers[i].routing)
-                       continue;
+           LOG(0, 0, 0, "Can't allocate route for %s/%d (%s)\n",
+               inet_ntop(AF_INET6, &add->dest.prefix, ipv6addr, INET6_ADDRSTRLEN),
+               add->dest.len, strerror(errno));
 
-               addr = inet_toa(bgp_peers[i].addr);
-               if (argc && strcmp(addr, argv[0]) && strcmp(bgp_peers[i].name, argv[0]))
-                       continue;
-
-               bgp_peers[i].cli_flag = BGP_CLI_SUSPEND;
-               cli_print(cli, "Suspending peer %s", bgp_peers[i].name);
+           return 0;
        }
 
-       return CLI_OK;
-}
+       memcpy(e, add, sizeof(*e));
+       e->next = 0;
+       peer->routes6 = bgp_insert_route6(peer->routes6, e);
 
-int cmd_no_suspend_bgp(struct cli_def *cli, char *command, char **argv, int argc)
-{
-       int i;
-       char *addr;
+       /* copy MP reachable NLRI heading */
+       memcpy(data, peer->mp_reach_nlri_partial,
+               BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE);
+       /* with proper len */
+       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;
+       attr_len += BGP_PATH_ATTR_MP_REACH_NLRI_PARTIAL_SIZE;
 
-       if (!bgp_configured)
-                       return CLI_OK;
+       memcpy(data, &add->dest, reach_len);
+       data += reach_len;
+       attr_len += reach_len;
 
-       if (CLI_HELP_REQUESTED)
-               return cli_arg_help(cli, 1,
-                       "A.B.C.D", "BGP peer address",
-                       "NAME", "BGP peer name",
-                       NULL);
+       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);
+    }
 
-       for (i = 0; i < BGP_NUM_PEERS; i++)
-       {
-               if (bgp_peers[i].state != Established)
-                       continue;
+    /* update len with attributes we added */
+    len += attr_len;
 
-               if (bgp_peers[i].routing)
-                       continue;
-
-               addr = inet_toa(bgp_peers[i].addr);
-               if (argc && strcmp(addr, argv[0]) &&
-                 strncmp(bgp_peers[i].name, argv[0], strlen(argv[0])))
-                       continue;
+    /* go back and insert attr_len */
+    attr_len = htons(attr_len);
+    memcpy((char *)&peer->outbuf->packet.data + 2, &attr_len, sizeof(attr_len));
 
-               bgp_peers[i].cli_flag = BGP_CLI_ENABLE;
-               cli_print(cli, "Un-suspending peer %s", bgp_peers[i].name);
-       }
+    peer->outbuf->packet.header.len = htons(len);
+    peer->outbuf->done = 0;
 
-       return CLI_OK;
+    return bgp_write(peer);
 }
 
-int cmd_restart_bgp(struct cli_def *cli, char *command, char **argv, int argc)
+/* send/buffer NOTIFICATION message */
+static int bgp_send_notification(struct bgp_peer *peer, uint8_t code,
+    uint8_t subcode)
 {
-       int i;
-       char *addr;
+    struct bgp_data_notification data;
+    uint16_t len = 0;
 
-       if (!bgp_configured)
-                       return CLI_OK;
+    data.error_code = code;
+    len += sizeof(data.error_code);
 
-       if (CLI_HELP_REQUESTED)
-               return cli_arg_help(cli, 1,
-                       "A.B.C.D", "BGP peer address",
-                       "NAME", "BGP peer name",
-                       NULL);
+    data.error_subcode = subcode;
+    len += sizeof(data.error_code);
 
-       for (i = 0; i < BGP_NUM_PEERS; i++)
-       {
-               if (!*bgp_peers[i].name)
-                       continue;
+    memset(peer->outbuf->packet.header.marker, 0xff,
+       sizeof(peer->outbuf->packet.header.marker));
 
-               addr = inet_toa(bgp_peers[i].addr);
-               if (argc && strcmp(addr, argv[0]) && strncmp(bgp_peers[i].name, argv[0], strlen(argv[0])))
-                       continue;
+    peer->outbuf->packet.header.type = BGP_MSG_NOTIFICATION;
+    peer->outbuf->packet.header.len =
+       htons(sizeof(peer->outbuf->packet.header) + len);
 
-               bgp_peers[i].cli_flag = BGP_CLI_RESTART;
-               cli_print(cli, "Restarting peer %s", bgp_peers[i].name);
-       }
+    memcpy(peer->outbuf->packet.data, &data, len);
+
+    peer->outbuf->done = 0;
+    peer->next_state = code == BGP_ERR_CEASE ? Disabled : Idle;
+
+    /* we're dying; ignore any pending input */
+    peer->inbuf->packet.header.len = 0;
+    peer->inbuf->done = 0;
 
-       return CLI_OK;
+    return bgp_write(peer);
 }