#include "network.h"
#include "log.h"
#include "memory.h"
+#include "hash.h"
+#include "jhash.h"
+#include "nexthop.h"
+#include "queue.h"
#include "bgpd/bgpd.h"
#include "bgpd/bgp_table.h"
#include "bgpd/bgp_route.h"
#include "bgpd/bgp_attr.h"
#include "bgpd/bgp_nexthop.h"
+#include "bgpd/bgp_nht.h"
#include "bgpd/bgp_debug.h"
#include "bgpd/bgp_damp.h"
+#include "bgpd/bgp_fsm.h"
#include "zebra/rib.h"
#include "zebra/zserv.h" /* For ZEBRA_SERV_PATH. */
-struct bgp_nexthop_cache *zlookup_query (struct in_addr);
-#ifdef HAVE_IPV6
-struct bgp_nexthop_cache *zlookup_query_ipv6 (struct in6_addr *);
-#endif /* HAVE_IPV6 */
-\f
-/* Only one BGP scan thread are activated at the same time. */
-struct thread *bgp_scan_thread = NULL;
-
-/* BGP import thread */
-struct thread *bgp_import_thread = NULL;
-
-/* BGP scan interval. */
-int bgp_scan_interval;
-/* BGP import interval. */
-int bgp_import_interval;
/* Route table for next-hop lookup cache. */
-struct bgp_table *bgp_nexthop_cache_ipv4;
-struct bgp_table *cache1;
-struct bgp_table *cache2;
-
-/* Route table for next-hop lookup cache. */
-struct bgp_table *bgp_nexthop_cache_ipv6;
-struct bgp_table *cache6_1;
-struct bgp_table *cache6_2;
+struct bgp_table *bgp_nexthop_cache_table[AFI_MAX];
/* Route table for connected route. */
-struct bgp_table *bgp_connected_ipv4;
+static struct bgp_table *bgp_connected_table[AFI_MAX];
-/* Route table for connected route. */
-struct bgp_table *bgp_connected_ipv6;
+/* Route table for import-check */
+struct bgp_table *bgp_import_check_table[AFI_MAX];
-/* BGP nexthop lookup query client. */
-static struct zclient *zlookup = NULL;
-
-/* BGP process function. */
-int bgp_process (struct bgp *, struct bgp_node *, afi_t, safi_t);
-\f
-/* Add nexthop to the end of the list. */
-void
-bnc_nexthop_add (struct bgp_nexthop_cache *bnc, struct nexthop *nexthop)
+char *
+bnc_str (struct bgp_nexthop_cache *bnc, char *buf, int size)
{
- struct nexthop *last;
-
- for (last = bnc->nexthop; last && last->next; last = last->next)
- ;
- if (last)
- last->next = nexthop;
- else
- bnc->nexthop = nexthop;
- nexthop->prev = last;
+ prefix2str(&(bnc->node->p), buf, size);
+ return buf;
}
void
}
struct bgp_nexthop_cache *
-bnc_new ()
+bnc_new (void)
{
- struct bgp_nexthop_cache *new;
+ struct bgp_nexthop_cache *bnc;
- new = XMALLOC (MTYPE_BGP_NEXTHOP_CACHE, sizeof (struct bgp_nexthop_cache));
- memset (new, 0, sizeof (struct bgp_nexthop_cache));
- return new;
+ bnc = XCALLOC (MTYPE_BGP_NEXTHOP_CACHE, sizeof (struct bgp_nexthop_cache));
+ LIST_INIT(&(bnc->paths));
+ return bnc;
}
void
bnc_nexthop_free (bnc);
XFREE (MTYPE_BGP_NEXTHOP_CACHE, bnc);
}
-\f
-int
-bgp_nexthop_same (struct nexthop *next1, struct nexthop *next2)
-{
- if (next1->type != next2->type)
- return 0;
-
- switch (next1->type)
- {
- case ZEBRA_NEXTHOP_IPV4:
- if (! IPV4_ADDR_SAME (&next1->gate.ipv4, &next2->gate.ipv4))
- return 0;
- break;
- case ZEBRA_NEXTHOP_IFINDEX:
- case ZEBRA_NEXTHOP_IFNAME:
- if (next1->ifindex != next2->ifindex)
- return 0;
- break;
-#ifdef HAVE_IPV6
- case ZEBRA_NEXTHOP_IPV6:
- if (! IPV6_ADDR_SAME (&next1->gate.ipv6, &next2->gate.ipv6))
- return 0;
- break;
- case ZEBRA_NEXTHOP_IPV6_IFINDEX:
- case ZEBRA_NEXTHOP_IPV6_IFNAME:
- if (! IPV6_ADDR_SAME (&next1->gate.ipv6, &next2->gate.ipv6))
- return 0;
- if (next1->ifindex != next2->ifindex)
- return 0;
- break;
-#endif /* HAVE_IPV6 */
- }
- return 1;
-}
-
-int
-bgp_nexthop_cache_changed (struct bgp_nexthop_cache *bnc1,
- struct bgp_nexthop_cache *bnc2)
-{
- int i;
- struct nexthop *next1, *next2;
-
- if (bnc1->nexthop_num != bnc2->nexthop_num)
- return 1;
-
- next1 = bnc1->nexthop;
- next2 = bnc2->nexthop;
-
- for (i = 0; i < bnc1->nexthop_num; i++)
- {
- if (! bgp_nexthop_same (next1, next2))
- return 1;
-
- next1 = next1->next;
- next2 = next2->next;
- }
- return 0;
-}
-
-/* If nexthop exists on connected network return 1. */
-int
-bgp_nexthop_check_ebgp (afi_t afi, struct attr *attr)
-{
- struct bgp_node *rn;
-
- /* If zebra is not enabled return */
- if (zlookup->sock < 0)
- return 1;
-
- /* Lookup the address is onlink or not. */
- if (afi == AFI_IP)
- {
- rn = bgp_node_match_ipv4 (bgp_connected_ipv4, &attr->nexthop);
- if (rn)
- {
- bgp_unlock_node (rn);
- return 1;
- }
- }
-#ifdef HAVE_IPV6
- else if (afi == AFI_IP6)
- {
- if (attr->mp_nexthop_len == 32)
- return 1;
- else if (attr->mp_nexthop_len == 16)
- {
- if (IN6_IS_ADDR_LINKLOCAL (&attr->mp_nexthop_global))
- return 1;
-
- rn = bgp_node_match_ipv6 (bgp_connected_ipv6,
- &attr->mp_nexthop_global);
- if (rn)
- {
- bgp_unlock_node (rn);
- return 1;
- }
- }
- }
-#endif /* HAVE_IPV6 */
- return 0;
-}
-
-#ifdef HAVE_IPV6
-/* Check specified next-hop is reachable or not. */
-int
-bgp_nexthop_lookup_ipv6 (struct peer *peer, struct bgp_info *ri, int *changed,
- int *metricchanged)
-{
- struct bgp_node *rn;
- struct prefix p;
- struct bgp_nexthop_cache *bnc;
- struct attr *attr;
-
- /* If lookup is not enabled, return valid. */
- if (zlookup->sock < 0)
- {
- ri->igpmetric = 0;
- return 1;
- }
-
- /* Only check IPv6 global address only nexthop. */
- attr = ri->attr;
-
- if (attr->mp_nexthop_len != 16
- || IN6_IS_ADDR_LINKLOCAL (&attr->mp_nexthop_global))
- return 1;
-
- memset (&p, 0, sizeof (struct prefix));
- p.family = AF_INET6;
- p.prefixlen = IPV6_MAX_BITLEN;
- p.u.prefix6 = attr->mp_nexthop_global;
-
- /* IBGP or ebgp-multihop */
- rn = bgp_node_get (bgp_nexthop_cache_ipv6, &p);
-
- if (rn->info)
- {
- bnc = rn->info;
- bgp_unlock_node (rn);
- }
- else
- {
- bnc = zlookup_query_ipv6 (&attr->mp_nexthop_global);
- if (bnc)
- {
- struct bgp_table *old;
- struct bgp_node *oldrn;
- struct bgp_nexthop_cache *oldbnc;
-
- if (changed)
- {
- if (bgp_nexthop_cache_ipv6 == cache6_1)
- old = cache6_2;
- else
- old = cache6_1;
-
- oldrn = bgp_node_lookup (old, &p);
- if (oldrn)
- {
- oldbnc = oldrn->info;
-
- bnc->changed = bgp_nexthop_cache_changed (bnc, oldbnc);
-
- if (bnc->metric != oldbnc->metric)
- bnc->metricchanged = 1;
- }
- }
- }
- else
- {
- bnc = bnc_new ();
- bnc->valid = 0;
- }
- rn->info = bnc;
- }
-
- if (changed)
- *changed = bnc->changed;
-
- if (metricchanged)
- *metricchanged = bnc->metricchanged;
-
- if (bnc->valid)
- ri->igpmetric = bnc->metric;
- else
- ri->igpmetric = 0;
-
- return bnc->valid;
-}
-#endif /* HAVE_IPV6 */
-
-/* Check specified next-hop is reachable or not. */
-int
-bgp_nexthop_lookup (afi_t afi, struct peer *peer, struct bgp_info *ri,
- int *changed, int *metricchanged)
-{
- struct bgp_node *rn;
- struct prefix p;
- struct bgp_nexthop_cache *bnc;
- struct in_addr addr;
-
- /* If lookup is not enabled, return valid. */
- if (zlookup->sock < 0)
- {
- ri->igpmetric = 0;
- return 1;
- }
-
-#ifdef HAVE_IPV6
- if (afi == AFI_IP6)
- return bgp_nexthop_lookup_ipv6 (peer, ri, changed, metricchanged);
-#endif /* HAVE_IPV6 */
-
- addr = ri->attr->nexthop;
-
- memset (&p, 0, sizeof (struct prefix));
- p.family = AF_INET;
- p.prefixlen = IPV4_MAX_BITLEN;
- p.u.prefix4 = addr;
-
- /* IBGP or ebgp-multihop */
- rn = bgp_node_get (bgp_nexthop_cache_ipv4, &p);
-
- if (rn->info)
- {
- bnc = rn->info;
- bgp_unlock_node (rn);
- }
- else
- {
- bnc = zlookup_query (addr);
- if (bnc)
- {
- struct bgp_table *old;
- struct bgp_node *oldrn;
- struct bgp_nexthop_cache *oldbnc;
-
- if (changed)
- {
- if (bgp_nexthop_cache_ipv4 == cache1)
- old = cache2;
- else
- old = cache1;
-
- oldrn = bgp_node_lookup (old, &p);
- if (oldrn)
- {
- oldbnc = oldrn->info;
-
- bnc->changed = bgp_nexthop_cache_changed (bnc, oldbnc);
-
- if (bnc->metric != oldbnc->metric)
- bnc->metricchanged = 1;
- }
- }
- }
- else
- {
- bnc = bnc_new ();
- bnc->valid = 0;
- }
- rn->info = bnc;
- }
-
- if (changed)
- *changed = bnc->changed;
-
- if (metricchanged)
- *metricchanged = bnc->metricchanged;
-
- if (bnc->valid)
- ri->igpmetric = bnc->metric;
- else
- ri->igpmetric = 0;
-
- return bnc->valid;
-}
/* Reset and free all BGP nexthop cache. */
-void
+static void
bgp_nexthop_cache_reset (struct bgp_table *table)
{
struct bgp_node *rn;
}
}
-void
-bgp_scan_ipv4 ()
+/* BGP own address structure */
+struct bgp_addr
{
- struct bgp_node *rn;
- struct bgp *bgp;
- struct bgp_info *bi;
- struct bgp_info *next;
- struct peer *peer;
- struct listnode *nn;
- int valid;
- int current;
- int changed;
- int metricchanged;
-
- /* Change cache. */
- if (bgp_nexthop_cache_ipv4 == cache1)
- bgp_nexthop_cache_ipv4 = cache2;
- else
- bgp_nexthop_cache_ipv4 = cache1;
-
- /* Get default bgp. */
- bgp = bgp_get_default ();
- if (bgp == NULL)
- return;
-
- /* Maximum prefix check */
- LIST_LOOP (bgp->peer, peer, nn)
- {
- if (peer->status != Established)
- continue;
-
- if (peer->afc[AFI_IP][SAFI_UNICAST])
- bgp_maximum_prefix_overflow (peer, AFI_IP, SAFI_UNICAST);
- if (peer->afc[AFI_IP][SAFI_MULTICAST])
- bgp_maximum_prefix_overflow (peer, AFI_IP, SAFI_MULTICAST);
- if (peer->afc[AFI_IP][SAFI_MPLS_VPN])
- bgp_maximum_prefix_overflow (peer, AFI_IP, SAFI_MPLS_VPN);
- }
+ struct in_addr addr;
+ int refcnt;
+};
- for (rn = bgp_table_top (bgp->rib[AFI_IP][SAFI_UNICAST]); rn;
- rn = bgp_route_next (rn))
- {
- for (bi = rn->info; bi; bi = next)
- {
- next = bi->next;
+static struct hash *bgp_address_hash;
- if (bi->type == ZEBRA_ROUTE_BGP && bi->sub_type == BGP_ROUTE_NORMAL)
- {
- changed = 0;
- metricchanged = 0;
+static void *
+bgp_address_hash_alloc (void *p)
+{
+ const struct in_addr *val = (const struct in_addr *)p;
+ struct bgp_addr *addr;
- if (peer_sort (bi->peer) == BGP_PEER_EBGP && bi->peer->ttl == 1)
- valid = bgp_nexthop_check_ebgp (AFI_IP, bi->attr);
- else
- valid = bgp_nexthop_lookup (AFI_IP, bi->peer, bi,
- &changed, &metricchanged);
+ addr = XMALLOC (MTYPE_BGP_ADDR, sizeof (struct bgp_addr));
+ addr->refcnt = 0;
+ addr->addr.s_addr = val->s_addr;
- current = CHECK_FLAG (bi->flags, BGP_INFO_VALID) ? 1 : 0;
+ return addr;
+}
- if (changed)
- SET_FLAG (bi->flags, BGP_INFO_IGP_CHANGED);
- else
- UNSET_FLAG (bi->flags, BGP_INFO_IGP_CHANGED);
+static unsigned int
+bgp_address_hash_key_make (void *p)
+{
+ const struct bgp_addr *addr = p;
- if (valid != current)
- {
- if (CHECK_FLAG (bi->flags, BGP_INFO_VALID))
- {
- bgp_aggregate_decrement (bgp, &rn->p, bi,
- AFI_IP, SAFI_UNICAST);
- UNSET_FLAG (bi->flags, BGP_INFO_VALID);
- }
- else
- {
- SET_FLAG (bi->flags, BGP_INFO_VALID);
- bgp_aggregate_increment (bgp, &rn->p, bi,
- AFI_IP, SAFI_UNICAST);
- }
- }
+ return jhash_1word(addr->addr.s_addr, 0);
+}
- if (CHECK_FLAG (bgp->af_flags[AFI_IP][SAFI_UNICAST],
- BGP_CONFIG_DAMPENING)
- && bi->damp_info )
- if (bgp_damp_scan (bi, AFI_IP, SAFI_UNICAST))
- bgp_aggregate_increment (bgp, &rn->p, bi,
- AFI_IP, SAFI_UNICAST);
- }
- }
- bgp_process (bgp, rn, AFI_IP, SAFI_UNICAST);
- }
+static int
+bgp_address_hash_cmp (const void *p1, const void *p2)
+{
+ const struct bgp_addr *addr1 = p1;
+ const struct bgp_addr *addr2 = p2;
- /* Flash old cache. */
- if (bgp_nexthop_cache_ipv4 == cache1)
- bgp_nexthop_cache_reset (cache2);
- else
- bgp_nexthop_cache_reset (cache1);
+ return addr1->addr.s_addr == addr2->addr.s_addr;
}
-#ifdef HAVE_IPV6
void
-bgp_scan_ipv6 ()
+bgp_address_init (void)
{
- struct bgp_node *rn;
- struct bgp *bgp;
- struct bgp_info *bi;
- struct bgp_info *next;
- struct peer *peer;
- struct listnode *nn;
- int valid;
- int current;
- int changed;
- int metricchanged;
-
- /* Change cache. */
- if (bgp_nexthop_cache_ipv6 == cache6_1)
- bgp_nexthop_cache_ipv6 = cache6_2;
- else
- bgp_nexthop_cache_ipv6 = cache6_1;
-
- /* Get default bgp. */
- bgp = bgp_get_default ();
- if (bgp == NULL)
- return;
+ bgp_address_hash = hash_create (bgp_address_hash_key_make,
+ bgp_address_hash_cmp);
+}
- /* Maximum prefix check */
- LIST_LOOP (bgp->peer, peer, nn)
- {
- if (peer->status != Established)
- continue;
+static void
+bgp_address_add (struct prefix *p)
+{
+ struct bgp_addr tmp;
+ struct bgp_addr *addr;
- if (peer->afc[AFI_IP6][SAFI_UNICAST])
- bgp_maximum_prefix_overflow (peer, AFI_IP6, SAFI_UNICAST);
- if (peer->afc[AFI_IP6][SAFI_MULTICAST])
- bgp_maximum_prefix_overflow (peer, AFI_IP6, SAFI_MULTICAST);
- }
+ tmp.addr = p->u.prefix4;
- for (rn = bgp_table_top (bgp->rib[AFI_IP6][SAFI_UNICAST]); rn;
- rn = bgp_route_next (rn))
- {
- for (bi = rn->info; bi; bi = next)
- {
- next = bi->next;
+ addr = hash_get (bgp_address_hash, &tmp, bgp_address_hash_alloc);
+ if (!addr)
+ return;
- if (bi->type == ZEBRA_ROUTE_BGP && bi->sub_type == BGP_ROUTE_NORMAL)
- {
- changed = 0;
- metricchanged = 0;
+ addr->refcnt++;
+}
- if (peer_sort (bi->peer) == BGP_PEER_EBGP && bi->peer->ttl == 1)
- valid = 1;
- else
- valid = bgp_nexthop_lookup_ipv6 (bi->peer, bi,
- &changed, &metricchanged);
+static void
+bgp_address_del (struct prefix *p)
+{
+ struct bgp_addr tmp;
+ struct bgp_addr *addr;
- current = CHECK_FLAG (bi->flags, BGP_INFO_VALID) ? 1 : 0;
+ tmp.addr = p->u.prefix4;
- if (changed)
- SET_FLAG (bi->flags, BGP_INFO_IGP_CHANGED);
- else
- UNSET_FLAG (bi->flags, BGP_INFO_IGP_CHANGED);
+ addr = hash_lookup (bgp_address_hash, &tmp);
+ /* may have been deleted earlier by bgp_interface_down() */
+ if (addr == NULL)
+ return;
- if (valid != current)
- {
- if (CHECK_FLAG (bi->flags, BGP_INFO_VALID))
- {
- bgp_aggregate_decrement (bgp, &rn->p, bi,
- AFI_IP6, SAFI_UNICAST);
- UNSET_FLAG (bi->flags, BGP_INFO_VALID);
- }
- else
- {
- SET_FLAG (bi->flags, BGP_INFO_VALID);
- bgp_aggregate_increment (bgp, &rn->p, bi,
- AFI_IP6, SAFI_UNICAST);
- }
- }
+ addr->refcnt--;
- if (CHECK_FLAG (bgp->af_flags[AFI_IP6][SAFI_UNICAST],
- BGP_CONFIG_DAMPENING)
- && bi->damp_info )
- if (bgp_damp_scan (bi, AFI_IP6, SAFI_UNICAST))
- bgp_aggregate_increment (bgp, &rn->p, bi,
- AFI_IP6, SAFI_UNICAST);
- }
- }
- bgp_process (bgp, rn, AFI_IP6, SAFI_UNICAST);
+ if (addr->refcnt == 0)
+ {
+ hash_release (bgp_address_hash, addr);
+ XFREE (MTYPE_BGP_ADDR, addr);
}
-
- /* Flash old cache. */
- if (bgp_nexthop_cache_ipv6 == cache6_1)
- bgp_nexthop_cache_reset (cache6_2);
- else
- bgp_nexthop_cache_reset (cache6_1);
}
-#endif /* HAVE_IPV6 */
-
-/* BGP scan thread. This thread check nexthop reachability. */
-int
-bgp_scan (struct thread *t)
-{
- bgp_scan_thread =
- thread_add_timer (master, bgp_scan, NULL, bgp_scan_interval);
- if (BGP_DEBUG (normal, NORMAL))
- zlog_info ("Performing BGP general scanning");
- bgp_scan_ipv4 ();
-
-#ifdef HAVE_IPV6
- bgp_scan_ipv6 ();
-#endif /* HAVE_IPV6 */
-
- return 0;
-}
-\f
-struct bgp_connected
+struct bgp_connected_ref
{
unsigned int refcnt;
};
{
struct prefix p;
struct prefix *addr;
- struct prefix *dest;
- struct interface *ifp;
struct bgp_node *rn;
- struct bgp_connected *bc;
-
- ifp = ifc->ifp;
-
- if (! ifp)
- return;
-
- if (if_is_loopback (ifp))
- return;
+ struct bgp_connected_ref *bc;
+ struct listnode *node, *nnode, *mnode;
+ struct bgp *bgp;
+ struct peer *peer;
addr = ifc->address;
- dest = ifc->destination;
+ p = *(CONNECTED_PREFIX(ifc));
if (addr->family == AF_INET)
{
- memset (&p, 0, sizeof (struct prefix));
- p.family = AF_INET;
- p.prefixlen = addr->prefixlen;
-
- if (ifc_pointopoint (ifc))
- p.u.prefix4 = dest->u.prefix4;
- else
- p.u.prefix4 = addr->u.prefix4;
-
apply_mask_ipv4 ((struct prefix_ipv4 *) &p);
if (prefix_ipv4_any ((struct prefix_ipv4 *) &p))
return;
- rn = bgp_node_get (bgp_connected_ipv4, (struct prefix *) &p);
+ bgp_address_add (addr);
+
+ rn = bgp_node_get (bgp_connected_table[AFI_IP], (struct prefix *) &p);
if (rn->info)
{
bc = rn->info;
}
else
{
- bc = XMALLOC (0, sizeof (struct bgp_connected));
- memset (bc, 0, sizeof (struct bgp_connected));
+ bc = XCALLOC (MTYPE_BGP_CONN, sizeof (struct bgp_connected_ref));
bc->refcnt = 1;
rn->info = bc;
}
+
+ for (ALL_LIST_ELEMENTS_RO (bm->bgp, mnode, bgp))
+ {
+ for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer))
+ {
+ if (peer->conf_if && (strcmp (peer->conf_if, ifc->ifp->name) == 0) &&
+ !CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY))
+ {
+ if (peer_active(peer))
+ BGP_EVENT_ADD (peer, BGP_Stop);
+ BGP_EVENT_ADD (peer, BGP_Start);
+ }
+ }
+ }
}
#ifdef HAVE_IPV6
- if (addr->family == AF_INET6)
+ else if (addr->family == AF_INET6)
{
- memset (&p, 0, sizeof (struct prefix));
- p.family = AF_INET6;
- p.prefixlen = addr->prefixlen;
-
- if (ifc_pointopoint (ifc))
- p.u.prefix6 = dest->u.prefix6;
- else
- p.u.prefix6 = addr->u.prefix6;
-
apply_mask_ipv6 ((struct prefix_ipv6 *) &p);
if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6))
if (IN6_IS_ADDR_LINKLOCAL (&p.u.prefix6))
return;
- rn = bgp_node_get (bgp_connected_ipv6, (struct prefix *) &p);
+ rn = bgp_node_get (bgp_connected_table[AFI_IP6], (struct prefix *) &p);
if (rn->info)
{
bc = rn->info;
}
else
{
- bc = XMALLOC (0, sizeof (struct bgp_connected));
- memset (bc, 0, sizeof (struct bgp_connected));
+ bc = XCALLOC (MTYPE_BGP_CONN, sizeof (struct bgp_connected_ref));
bc->refcnt = 1;
rn->info = bc;
}
{
struct prefix p;
struct prefix *addr;
- struct prefix *dest;
- struct interface *ifp;
struct bgp_node *rn;
- struct bgp_connected *bc;
-
- ifp = ifc->ifp;
-
- if (if_is_loopback (ifp))
- return;
+ struct bgp_connected_ref *bc;
addr = ifc->address;
- dest = ifc->destination;
+ p = *(CONNECTED_PREFIX(ifc));
if (addr->family == AF_INET)
{
- memset (&p, 0, sizeof (struct prefix));
- p.family = AF_INET;
- p.prefixlen = addr->prefixlen;
-
- if (ifc_pointopoint (ifc))
- p.u.prefix4 = dest->u.prefix4;
- else
- p.u.prefix4 = addr->u.prefix4;
-
apply_mask_ipv4 ((struct prefix_ipv4 *) &p);
if (prefix_ipv4_any ((struct prefix_ipv4 *) &p))
return;
- rn = bgp_node_lookup (bgp_connected_ipv4, &p);
+ bgp_address_del (addr);
+
+ rn = bgp_node_lookup (bgp_connected_table[AFI_IP], &p);
if (! rn)
return;
bc->refcnt--;
if (bc->refcnt == 0)
{
- XFREE (0, bc);
+ XFREE (MTYPE_BGP_CONN, bc);
rn->info = NULL;
}
bgp_unlock_node (rn);
#ifdef HAVE_IPV6
else if (addr->family == AF_INET6)
{
- memset (&p, 0, sizeof (struct prefix));
- p.family = AF_INET6;
- p.prefixlen = addr->prefixlen;
-
- if (ifc_pointopoint (ifc))
- p.u.prefix6 = dest->u.prefix6;
- else
- p.u.prefix6 = addr->u.prefix6;
-
apply_mask_ipv6 ((struct prefix_ipv6 *) &p);
if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6))
if (IN6_IS_ADDR_LINKLOCAL (&p.u.prefix6))
return;
- rn = bgp_node_lookup (bgp_connected_ipv6, (struct prefix *) &p);
+ rn = bgp_node_lookup (bgp_connected_table[AFI_IP6], (struct prefix *) &p);
if (! rn)
return;
bc->refcnt--;
if (bc->refcnt == 0)
{
- XFREE (0, bc);
+ XFREE (MTYPE_BGP_CONN, bc);
rn->info = NULL;
}
bgp_unlock_node (rn);
}
int
-bgp_nexthop_self (afi_t afi, struct attr *attr)
+bgp_nexthop_self (struct attr *attr)
{
- listnode node;
- listnode node2;
- struct interface *ifp;
- struct connected *ifc;
- struct prefix *p;
+ struct bgp_addr tmp, *addr;
- for (node = listhead (iflist); node; nextnode (node))
- {
- ifp = getdata (node);
+ tmp.addr = attr->nexthop;
- for (node2 = listhead (ifp->connected); node2; nextnode (node2))
- {
- ifc = getdata (node2);
- p = ifc->address;
+ addr = hash_lookup (bgp_address_hash, &tmp);
+ if (addr)
+ return 1;
- if (p && p->family == AF_INET
- && IPV4_ADDR_SAME (&p->u.prefix4, &attr->nexthop))
- return 1;
- }
- }
return 0;
}
-\f
-struct bgp_nexthop_cache *
-zlookup_read ()
-{
- struct stream *s;
- u_int16_t length;
- u_char command;
- int nbytes;
- struct in_addr raddr;
- u_int32_t metric;
- int i;
- u_char nexthop_num;
- struct nexthop *nexthop;
- struct bgp_nexthop_cache *bnc;
-
- s = zlookup->ibuf;
- stream_reset (s);
-
- nbytes = stream_read (s, zlookup->sock, 2);
- length = stream_getw (s);
-
- nbytes = stream_read (s, zlookup->sock, length - 2);
- command = stream_getc (s);
- raddr.s_addr = stream_get_ipv4 (s);
- metric = stream_getl (s);
- nexthop_num = stream_getc (s);
-
- if (nexthop_num)
- {
- bnc = bnc_new ();
- bnc->valid = 1;
- bnc->metric = metric;
- bnc->nexthop_num = nexthop_num;
-
- for (i = 0; i < nexthop_num; i++)
- {
- nexthop = XMALLOC (MTYPE_NEXTHOP, sizeof (struct nexthop));
- memset (nexthop, 0, sizeof (struct nexthop));
- nexthop->type = stream_getc (s);
- switch (nexthop->type)
- {
- case ZEBRA_NEXTHOP_IPV4:
- nexthop->gate.ipv4.s_addr = stream_get_ipv4 (s);
- break;
- case ZEBRA_NEXTHOP_IFINDEX:
- case ZEBRA_NEXTHOP_IFNAME:
- nexthop->ifindex = stream_getl (s);
- break;
- }
- bnc_nexthop_add (bnc, nexthop);
- }
- }
- else
- return NULL;
-
- return bnc;
-}
-
-struct bgp_nexthop_cache *
-zlookup_query (struct in_addr addr)
-{
- int ret;
- struct stream *s;
-
- /* Check socket. */
- if (zlookup->sock < 0)
- return NULL;
-
- s = zlookup->obuf;
- stream_reset (s);
- stream_putw (s, 7);
- stream_putc (s, ZEBRA_IPV4_NEXTHOP_LOOKUP);
- stream_put_in_addr (s, &addr);
-
- ret = writen (zlookup->sock, s->data, 7);
- if (ret < 0)
- {
- zlog_err ("can't write to zlookup->sock");
- close (zlookup->sock);
- zlookup->sock = -1;
- return NULL;
- }
- if (ret == 0)
- {
- zlog_err ("zlookup->sock connection closed");
- close (zlookup->sock);
- zlookup->sock = -1;
- return NULL;
- }
-
- return zlookup_read ();
-}
-
-#ifdef HAVE_IPV6
-struct bgp_nexthop_cache *
-zlookup_read_ipv6 ()
-{
- struct stream *s;
- u_int16_t length;
- u_char command;
- int nbytes;
- struct in6_addr raddr;
- u_int32_t metric;
- int i;
- u_char nexthop_num;
- struct nexthop *nexthop;
- struct bgp_nexthop_cache *bnc;
-
- s = zlookup->ibuf;
- stream_reset (s);
-
- nbytes = stream_read (s, zlookup->sock, 2);
- length = stream_getw (s);
-
- nbytes = stream_read (s, zlookup->sock, length - 2);
- command = stream_getc (s);
-
- stream_get (&raddr, s, 16);
-
- metric = stream_getl (s);
- nexthop_num = stream_getc (s);
-
- if (nexthop_num)
- {
- bnc = bnc_new ();
- bnc->valid = 1;
- bnc->metric = metric;
- bnc->nexthop_num = nexthop_num;
-
- for (i = 0; i < nexthop_num; i++)
- {
- nexthop = XMALLOC (MTYPE_NEXTHOP, sizeof (struct nexthop));
- memset (nexthop, 0, sizeof (struct nexthop));
- nexthop->type = stream_getc (s);
- switch (nexthop->type)
- {
- case ZEBRA_NEXTHOP_IPV6:
- stream_get (&nexthop->gate.ipv6, s, 16);
- break;
- case ZEBRA_NEXTHOP_IPV6_IFINDEX:
- case ZEBRA_NEXTHOP_IPV6_IFNAME:
- stream_get (&nexthop->gate.ipv6, s, 16);
- nexthop->ifindex = stream_getl (s);
- break;
- case ZEBRA_NEXTHOP_IFINDEX:
- case ZEBRA_NEXTHOP_IFNAME:
- nexthop->ifindex = stream_getl (s);
- break;
- }
- bnc_nexthop_add (bnc, nexthop);
- }
- }
- else
- return NULL;
-
- return bnc;
-}
-
-struct bgp_nexthop_cache *
-zlookup_query_ipv6 (struct in6_addr *addr)
-{
- int ret;
- struct stream *s;
-
- /* Check socket. */
- if (zlookup->sock < 0)
- return NULL;
-
- s = zlookup->obuf;
- stream_reset (s);
- stream_putw (s, 19);
- stream_putc (s, ZEBRA_IPV6_NEXTHOP_LOOKUP);
- stream_put (s, addr, 16);
-
- ret = writen (zlookup->sock, s->data, 19);
- if (ret < 0)
- {
- zlog_err ("can't write to zlookup->sock");
- close (zlookup->sock);
- zlookup->sock = -1;
- return NULL;
- }
- if (ret == 0)
- {
- zlog_err ("zlookup->sock connection closed");
- close (zlookup->sock);
- zlookup->sock = -1;
- return NULL;
- }
-
- return zlookup_read_ipv6 ();
-}
-#endif /* HAVE_IPV6 */
int
-bgp_import_check (struct prefix *p, u_int32_t *igpmetric, struct in_addr *igpnexthop)
+bgp_multiaccess_check_v4 (struct in_addr nexthop, struct peer *peer)
{
- struct stream *s;
+ struct bgp_node *rn1;
+ struct bgp_node *rn2;
+ struct prefix p;
int ret;
- u_int16_t length;
- u_char command;
- int nbytes;
- struct in_addr addr;
- struct in_addr nexthop;
- u_int32_t metric = 0;
- u_char nexthop_num;
- u_char nexthop_type;
- /* If lookup connection is not available return valid. */
- if (zlookup->sock < 0)
- {
- if (igpmetric)
- *igpmetric = 0;
- return 1;
- }
+ p.family = AF_INET;
+ p.prefixlen = IPV4_MAX_BITLEN;
+ p.u.prefix4 = nexthop;
- /* Send query to the lookup connection */
- s = zlookup->obuf;
- stream_reset (s);
- stream_putw (s, 8);
- stream_putc (s, ZEBRA_IPV4_IMPORT_LOOKUP);
- stream_putc (s, p->prefixlen);
- stream_put_in_addr (s, &p->u.prefix4);
+ rn1 = bgp_node_match (bgp_connected_table[AFI_IP], &p);
+ if (!rn1)
+ return 0;
- /* Write the packet. */
- ret = writen (zlookup->sock, s->data, 8);
+ p.family = AF_INET;
+ p.prefixlen = IPV4_MAX_BITLEN;
+ p.u.prefix4 = peer->su.sin.sin_addr;
- if (ret < 0)
+ rn2 = bgp_node_match (bgp_connected_table[AFI_IP], &p);
+ if (!rn2)
{
- zlog_err ("can't write to zlookup->sock");
- close (zlookup->sock);
- zlookup->sock = -1;
- return 1;
+ bgp_unlock_node(rn1);
+ return 0;
}
- if (ret == 0)
- {
- zlog_err ("zlookup->sock connection closed");
- close (zlookup->sock);
- zlookup->sock = -1;
- return 1;
- }
-
- /* Get result. */
- stream_reset (s);
- /* Fetch length. */
- nbytes = stream_read (s, zlookup->sock, 2);
- length = stream_getw (s);
+ ret = (rn1 == rn2) ? 1 : 0;
- /* Fetch whole data. */
- nbytes = stream_read (s, zlookup->sock, length - 2);
- command = stream_getc (s);
- addr.s_addr = stream_get_ipv4 (s);
- metric = stream_getl (s);
- nexthop_num = stream_getc (s);
-
- /* Set IGP metric value. */
- if (igpmetric)
- *igpmetric = metric;
-
- /* If there is nexthop then this is active route. */
- if (nexthop_num)
- {
- nexthop.s_addr = 0;
- nexthop_type = stream_getc (s);
- if (nexthop_type == ZEBRA_NEXTHOP_IPV4)
- {
- nexthop.s_addr = stream_get_ipv4 (s);
- if (igpnexthop)
- *igpnexthop = nexthop;
- }
- else
- *igpnexthop = nexthop;
+ bgp_unlock_node(rn1);
+ bgp_unlock_node(rn2);
- return 1;
- }
- else
- return 0;
+ return (ret);
}
-/* Scan all configured BGP route then check the route exists in IGP or
- not. */
-int
-bgp_import (struct thread *t)
+static int
+show_ip_bgp_nexthop_table (struct vty *vty, int detail)
{
- struct bgp_master *bm;
- struct bgp *bgp;
struct bgp_node *rn;
- struct bgp_static *bgp_static;
- struct listnode *nn;
- int valid;
- u_int32_t metric;
- struct in_addr nexthop;
+ struct bgp_nexthop_cache *bnc;
+ char buf[PREFIX2STR_BUFFER];
+ struct nexthop *nexthop;
+ time_t tbuf;
afi_t afi;
- safi_t safi;
-
- bgp_import_thread =
- thread_add_timer (master, bgp_import, NULL, bgp_import_interval);
- bm = bgp_get_master ();
- if (! bm)
- return 0;
-
- LIST_LOOP (bm->bgp, bgp, nn)
+ vty_out (vty, "Current BGP nexthop cache:%s", VTY_NEWLINE);
+ for (afi = AFI_IP ; afi < AFI_MAX ; afi++)
{
- for (afi = AFI_IP; afi < AFI_MAX; afi++)
- for (safi = SAFI_UNICAST; safi < SAFI_MPLS_VPN; safi++)
- for (rn = bgp_table_top (bgp->route[afi][safi]); rn;
- rn = bgp_route_next (rn))
- if ((bgp_static = rn->info) != NULL)
- {
- if (bgp_static->backdoor)
- continue;
-
- valid = bgp_static->valid;
- metric = bgp_static->igpmetric;
- nexthop = bgp_static->igpnexthop;
-
- if (bgp_flag_check (bgp, BGP_FLAG_IMPORT_CHECK)
- && afi == AFI_IP && safi == SAFI_UNICAST)
- bgp_static->valid = bgp_import_check (&rn->p, &bgp_static->igpmetric,
- &bgp_static->igpnexthop);
- else
- {
- bgp_static->valid = 1;
- bgp_static->igpmetric = 0;
- bgp_static->igpnexthop.s_addr = 0;
- }
-
- if (bgp_static->valid != valid)
- {
- if (bgp_static->valid)
- bgp_static_update (bgp, &rn->p, bgp_static, afi, safi);
- else
- bgp_static_withdraw (bgp, &rn->p, afi, safi);
- }
- else if (bgp_static->valid)
- {
- if (bgp_static->igpmetric != metric
- || bgp_static->igpnexthop.s_addr != nexthop.s_addr
- || bgp_static->rmap.name)
- bgp_static_update (bgp, &rn->p, bgp_static, afi, safi);
- }
- }
- }
- return 0;
-}
-
-/* Connect to zebra for nexthop lookup. */
-int
-zlookup_connect (struct thread *t)
-{
- struct zclient *zlookup;
-
- zlookup = THREAD_ARG (t);
- zlookup->t_connect = NULL;
-
- if (zlookup->sock != -1)
- return 0;
-
-#ifdef HAVE_TCP_ZEBRA
- zlookup->sock = zclient_socket ();
+ for (rn = bgp_table_top (bgp_nexthop_cache_table[afi]); rn; rn = bgp_route_next (rn))
+ {
+ if ((bnc = rn->info) != NULL)
+ {
+ if (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_VALID))
+ {
+ vty_out (vty, " %s valid [IGP metric %d], #paths %d%s",
+ inet_ntop (rn->p.family, &rn->p.u.prefix, buf, sizeof (buf)),
+ bnc->metric, bnc->path_count, VTY_NEWLINE);
+ if (detail)
+ for (nexthop = bnc->nexthop; nexthop; nexthop = nexthop->next)
+ switch (nexthop->type)
+ {
+ case NEXTHOP_TYPE_IPV6:
+ vty_out (vty, " gate %s%s",
+ inet_ntop (AF_INET6, &nexthop->gate.ipv6,
+ buf, sizeof (buf)), VTY_NEWLINE);
+ break;
+ case NEXTHOP_TYPE_IPV6_IFINDEX:
+ vty_out(vty, " gate %s, if %s%s",
+ inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf,
+ sizeof (buf)),
+ ifindex2ifname(nexthop->ifindex),
+ VTY_NEWLINE);
+ break;
+ case NEXTHOP_TYPE_IPV4:
+ vty_out (vty, " gate %s%s",
+ inet_ntop (AF_INET, &nexthop->gate.ipv4, buf,
+ sizeof (buf)), VTY_NEWLINE);
+ break;
+ case NEXTHOP_TYPE_IFINDEX:
+ vty_out (vty, " if %s%s",
+ ifindex2ifname(nexthop->ifindex), VTY_NEWLINE);
+ break;
+ case NEXTHOP_TYPE_IPV4_IFINDEX:
+ vty_out (vty, " gate %s, if %s%s",
+ inet_ntop(AF_INET, &nexthop->gate.ipv4, buf,
+ sizeof (buf)),
+ ifindex2ifname(nexthop->ifindex), VTY_NEWLINE);
+ break;
+ default:
+ vty_out (vty, " invalid nexthop type %u%s",
+ nexthop->type, VTY_NEWLINE);
+ }
+ }
+ else
+ {
+ vty_out (vty, " %s invalid%s",
+ inet_ntop (rn->p.family, &rn->p.u.prefix,
+ buf, sizeof (buf)), VTY_NEWLINE);
+ if (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_CONNECTED))
+ vty_out (vty, " Must be Connected%s", VTY_NEWLINE);
+ }
+#ifdef HAVE_CLOCK_MONOTONIC
+ tbuf = time(NULL) - (bgp_clock() - bnc->last_update);
+ vty_out (vty, " Last update: %s", ctime(&tbuf));
#else
- zlookup->sock = zclient_socket_un (ZEBRA_SERV_PATH);
-#endif /* HAVE_TCP_ZEBRA */
- if (zlookup->sock < 0)
- return -1;
-
- return 0;
-}
-
-/* Check specified multiaccess next-hop. */
-int
-bgp_multiaccess_check_v4 (struct in_addr nexthop, char *peer)
-{
- struct bgp_node *rn1;
- struct bgp_node *rn2;
- struct prefix p1;
- struct prefix p2;
- struct in_addr addr;
- int ret;
-
- ret = inet_aton (peer, &addr);
- if (! ret)
- return 0;
-
- memset (&p1, 0, sizeof (struct prefix));
- p1.family = AF_INET;
- p1.prefixlen = IPV4_MAX_BITLEN;
- p1.u.prefix4 = nexthop;
- memset (&p2, 0, sizeof (struct prefix));
- p2.family = AF_INET;
- p2.prefixlen = IPV4_MAX_BITLEN;
- p2.u.prefix4 = addr;
-
- /* If bgp scan is not enabled, return invalid. */
- if (zlookup->sock < 0)
- return 0;
-
- rn1 = bgp_node_match (bgp_connected_ipv4, &p1);
- if (! rn1)
- return 0;
-
- rn2 = bgp_node_match (bgp_connected_ipv4, &p2);
- if (! rn2)
- return 0;
-
- if (rn1 == rn2)
- return 1;
-
- return 0;
-}
-\f
-DEFUN (bgp_scan_time,
- bgp_scan_time_cmd,
- "bgp scan-time <5-60>",
- "BGP specific commands\n"
- "Configure background scanner interval\n"
- "Scanner interval (seconds)\n")
-{
- bgp_scan_interval = atoi (argv[0]);
-
- if (bgp_scan_thread)
- {
- thread_cancel (bgp_scan_thread);
- bgp_scan_thread =
- thread_add_timer (master, bgp_scan, NULL, bgp_scan_interval);
+ vty_out (vty, " Last update: %s", ctime(&bnc->uptime));
+#endif /* HAVE_CLOCK_MONOTONIC */
+ vty_out(vty, "%s", VTY_NEWLINE);
+ }
+ }
}
-
return CMD_SUCCESS;
}
-DEFUN (no_bgp_scan_time,
- no_bgp_scan_time_cmd,
- "no bgp scan-time",
- NO_STR
- "BGP specific commands\n"
- "Configure background scanner interval\n")
+DEFUN (show_ip_bgp_nexthop,
+ show_ip_bgp_nexthop_cmd,
+ "show ip bgp nexthop",
+ SHOW_STR
+ IP_STR
+ BGP_STR
+ "BGP nexthop table\n")
{
- bgp_scan_interval = BGP_SCAN_INTERVAL_DEFAULT;
-
- if (bgp_scan_thread)
- {
- thread_cancel (bgp_scan_thread);
- bgp_scan_thread =
- thread_add_timer (master, bgp_scan, NULL, bgp_scan_interval);
- }
-
- return CMD_SUCCESS;
+ return show_ip_bgp_nexthop_table (vty, 0);
}
-ALIAS (no_bgp_scan_time,
- no_bgp_scan_time_val_cmd,
- "no bgp scan-time <5-60>",
- NO_STR
- "BGP specific commands\n"
- "Configure background scanner interval\n"
- "Scanner interval (seconds)\n")
-
-DEFUN (show_ip_bgp_scan,
- show_ip_bgp_scan_cmd,
- "show ip bgp scan",
+DEFUN (show_ip_bgp_nexthop_detail,
+ show_ip_bgp_nexthop_detail_cmd,
+ "show ip bgp nexthop detail",
SHOW_STR
IP_STR
BGP_STR
- "BGP scan status\n")
+ "BGP nexthop table\n")
{
- struct bgp_node *rn;
- struct bgp_nexthop_cache *bnc;
-
- if (bgp_scan_thread)
- vty_out (vty, "BGP scan is running%s", VTY_NEWLINE);
- else
- vty_out (vty, "BGP scan is not running%s", VTY_NEWLINE);
- vty_out (vty, "BGP scan interval is %d%s", bgp_scan_interval, VTY_NEWLINE);
-
- vty_out (vty, "Current BGP nexthop cache:%s", VTY_NEWLINE);
- for (rn = bgp_table_top (bgp_nexthop_cache_ipv4); rn; rn = bgp_route_next (rn))
- if ((bnc = rn->info) != NULL)
- {
- if (bnc->valid)
- vty_out (vty, " %s valid [IGP metric %d]%s",
- inet_ntoa (rn->p.u.prefix4), bnc->metric, VTY_NEWLINE);
- else
- vty_out (vty, " %s invalid%s",
- inet_ntoa (rn->p.u.prefix4), VTY_NEWLINE);
- }
-
-#ifdef HAVE_IPV6
- {
- char buf[BUFSIZ];
- for (rn = bgp_table_top (bgp_nexthop_cache_ipv6); rn; rn = bgp_route_next (rn))
- if ((bnc = rn->info) != NULL)
- {
- if (bnc->valid)
- vty_out (vty, " %s valid [IGP metric %d]%s",
- inet_ntop (AF_INET6, &rn->p.u.prefix6, buf, BUFSIZ),
- bnc->metric, VTY_NEWLINE);
- else
- vty_out (vty, " %s invalid%s",
- inet_ntop (AF_INET6, &rn->p.u.prefix6, buf, BUFSIZ),
- VTY_NEWLINE);
- }
- }
-#endif /* HAVE_IPV6 */
+ return show_ip_bgp_nexthop_table (vty, 1);
+}
- vty_out (vty, "BGP connected route:%s", VTY_NEWLINE);
- for (rn = bgp_table_top (bgp_connected_ipv4); rn; rn = bgp_route_next (rn))
- if (rn->info != NULL)
- vty_out (vty, " %s/%d%s", inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen,
- VTY_NEWLINE);
+void
+bgp_scan_init (void)
+{
+ bgp_nexthop_cache_table[AFI_IP] = bgp_table_init (AFI_IP, SAFI_UNICAST);
+ bgp_connected_table[AFI_IP] = bgp_table_init (AFI_IP, SAFI_UNICAST);
+ bgp_import_check_table[AFI_IP] = bgp_table_init (AFI_IP, SAFI_UNICAST);
#ifdef HAVE_IPV6
- {
- char buf[BUFSIZ];
-
- for (rn = bgp_table_top (bgp_connected_ipv6); rn; rn = bgp_route_next (rn))
- if (rn->info != NULL)
- vty_out (vty, " %s/%d%s",
- inet_ntop (AF_INET6, &rn->p.u.prefix6, buf, BUFSIZ),
- rn->p.prefixlen,
- VTY_NEWLINE);
- }
+ bgp_nexthop_cache_table[AFI_IP6] = bgp_table_init (AFI_IP6, SAFI_UNICAST);
+ bgp_connected_table[AFI_IP6] = bgp_table_init (AFI_IP6, SAFI_UNICAST);
+ bgp_import_check_table[AFI_IP6] = bgp_table_init (AFI_IP6, SAFI_UNICAST);
#endif /* HAVE_IPV6 */
- return CMD_SUCCESS;
}
-int
-bgp_config_write_scan_time (struct vty *vty)
+void
+bgp_scan_vty_init (void)
{
- if (bgp_scan_interval != BGP_SCAN_INTERVAL_DEFAULT)
- vty_out (vty, " bgp scan-time %d%s", bgp_scan_interval, VTY_NEWLINE);
- return CMD_SUCCESS;
+ install_element (ENABLE_NODE, &show_ip_bgp_nexthop_cmd);
+ install_element (VIEW_NODE, &show_ip_bgp_nexthop_cmd);
+ install_element (VIEW_NODE, &show_ip_bgp_nexthop_detail_cmd);
+ install_element (ENABLE_NODE, &show_ip_bgp_nexthop_detail_cmd);
}
void
-bgp_scan_init ()
+bgp_scan_finish (void)
{
- zlookup = zclient_new ();
- zlookup->sock = -1;
- zlookup->ibuf = stream_new (ZEBRA_MAX_PACKET_SIZ);
- zlookup->obuf = stream_new (ZEBRA_MAX_PACKET_SIZ);
- zlookup->t_connect = thread_add_event (master, zlookup_connect, zlookup, 0);
+ /* Only the current one needs to be reset. */
+ bgp_nexthop_cache_reset (bgp_nexthop_cache_table[AFI_IP]);
- bgp_scan_interval = BGP_SCAN_INTERVAL_DEFAULT;
- bgp_import_interval = BGP_IMPORT_INTERVAL_DEFAULT;
+ bgp_table_unlock (bgp_nexthop_cache_table[AFI_IP]);
+ bgp_nexthop_cache_table[AFI_IP] = NULL;
- cache1 = bgp_table_init ();
- cache2 = bgp_table_init ();
- bgp_nexthop_cache_ipv4 = cache1;
+ bgp_table_unlock (bgp_connected_table[AFI_IP]);
+ bgp_connected_table[AFI_IP] = NULL;
- bgp_connected_ipv4 = bgp_table_init ();
+ bgp_table_unlock (bgp_import_check_table[AFI_IP]);
+ bgp_import_check_table[AFI_IP] = NULL;
#ifdef HAVE_IPV6
- cache6_1 = bgp_table_init ();
- cache6_2 = bgp_table_init ();
- bgp_nexthop_cache_ipv6 = cache6_1;
- bgp_connected_ipv6 = bgp_table_init ();
-#endif /* HAVE_IPV6 */
+ /* Only the current one needs to be reset. */
+ bgp_nexthop_cache_reset (bgp_nexthop_cache_table[AFI_IP6]);
+
+ bgp_table_unlock (bgp_nexthop_cache_table[AFI_IP6]);
+ bgp_nexthop_cache_table[AFI_IP6] = NULL;
- /* Make BGP scan thread. */
- bgp_scan_thread = thread_add_timer (master, bgp_scan, NULL, bgp_scan_interval);
- /* Make BGP import there. */
- bgp_import_thread = thread_add_timer (master, bgp_import, NULL, 0);
+ bgp_table_unlock (bgp_connected_table[AFI_IP6]);
+ bgp_connected_table[AFI_IP6] = NULL;
- install_element (BGP_NODE, &bgp_scan_time_cmd);
- install_element (BGP_NODE, &no_bgp_scan_time_cmd);
- install_element (BGP_NODE, &no_bgp_scan_time_val_cmd);
- install_element (VIEW_NODE, &show_ip_bgp_scan_cmd);
- install_element (ENABLE_NODE, &show_ip_bgp_scan_cmd);
+ bgp_table_unlock (bgp_import_check_table[AFI_IP6]);
+ bgp_import_check_table[AFI_IP6] = NULL;
+#endif /* HAVE_IPV6 */
}
projects / mirror_frr.git / blobdiff