diff options
Diffstat (limited to 'bgpd/bgp_nexthop.c')
| -rw-r--r-- | bgpd/bgp_nexthop.c | 745 |
1 files changed, 372 insertions, 373 deletions
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index 148fba2d4..63a84684b 100644 --- a/bgpd/bgp_nexthop.c +++ b/bgpd/bgp_nexthop.c @@ -45,443 +45,445 @@ #include "bgpd/bgp_fsm.h" #include "bgpd/bgp_vty.h" #include "zebra/rib.h" -#include "zebra/zserv.h" /* For ZEBRA_SERV_PATH. */ +#include "zebra/zserv.h" /* For ZEBRA_SERV_PATH. */ -char * -bnc_str (struct bgp_nexthop_cache *bnc, char *buf, int size) +char *bnc_str(struct bgp_nexthop_cache *bnc, char *buf, int size) { - prefix2str(&(bnc->node->p), buf, size); - return buf; + prefix2str(&(bnc->node->p), buf, size); + return buf; } -void -bnc_nexthop_free (struct bgp_nexthop_cache *bnc) +void bnc_nexthop_free(struct bgp_nexthop_cache *bnc) { - nexthops_free(bnc->nexthop); + nexthops_free(bnc->nexthop); } -struct bgp_nexthop_cache * -bnc_new (void) +struct bgp_nexthop_cache *bnc_new(void) { - struct bgp_nexthop_cache *bnc; + struct bgp_nexthop_cache *bnc; - bnc = XCALLOC (MTYPE_BGP_NEXTHOP_CACHE, sizeof (struct bgp_nexthop_cache)); - LIST_INIT(&(bnc->paths)); - return bnc; + bnc = XCALLOC(MTYPE_BGP_NEXTHOP_CACHE, + sizeof(struct bgp_nexthop_cache)); + LIST_INIT(&(bnc->paths)); + return bnc; } -void -bnc_free (struct bgp_nexthop_cache *bnc) +void bnc_free(struct bgp_nexthop_cache *bnc) { - bnc_nexthop_free (bnc); - XFREE (MTYPE_BGP_NEXTHOP_CACHE, bnc); + bnc_nexthop_free(bnc); + XFREE(MTYPE_BGP_NEXTHOP_CACHE, bnc); } /* Reset and free all BGP nexthop cache. */ -static void -bgp_nexthop_cache_reset (struct bgp_table *table) +static void bgp_nexthop_cache_reset(struct bgp_table *table) { - struct bgp_node *rn; - struct bgp_nexthop_cache *bnc; - - for (rn = bgp_table_top (table); rn; rn = bgp_route_next (rn)) - if ((bnc = rn->info) != NULL) - { - bnc_free (bnc); - rn->info = NULL; - bgp_unlock_node (rn); - } + struct bgp_node *rn; + struct bgp_nexthop_cache *bnc; + + for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) + if ((bnc = rn->info) != NULL) { + bnc_free(bnc); + rn->info = NULL; + bgp_unlock_node(rn); + } } /* BGP own address structure */ -struct bgp_addr -{ - struct in_addr addr; - int refcnt; +struct bgp_addr { + struct in_addr addr; + int refcnt; }; -static void * -bgp_address_hash_alloc (void *p) +static void *bgp_address_hash_alloc(void *p) { - const struct in_addr *val = (const struct in_addr *)p; - struct bgp_addr *addr; + const struct in_addr *val = (const struct in_addr *)p; + struct bgp_addr *addr; - addr = XMALLOC (MTYPE_BGP_ADDR, sizeof (struct bgp_addr)); - addr->refcnt = 0; - addr->addr.s_addr = val->s_addr; + addr = XMALLOC(MTYPE_BGP_ADDR, sizeof(struct bgp_addr)); + addr->refcnt = 0; + addr->addr.s_addr = val->s_addr; - return addr; + return addr; } -static void -bgp_address_hash_free (void *addr) +static void bgp_address_hash_free(void *addr) { - XFREE (MTYPE_BGP_ADDR, addr); + XFREE(MTYPE_BGP_ADDR, addr); } -static unsigned int -bgp_address_hash_key_make (void *p) +static unsigned int bgp_address_hash_key_make(void *p) { - const struct bgp_addr *addr = p; + const struct bgp_addr *addr = p; - return jhash_1word(addr->addr.s_addr, 0); + return jhash_1word(addr->addr.s_addr, 0); } -static int -bgp_address_hash_cmp (const void *p1, const void *p2) +static int bgp_address_hash_cmp(const void *p1, const void *p2) { - const struct bgp_addr *addr1 = p1; - const struct bgp_addr *addr2 = p2; + const struct bgp_addr *addr1 = p1; + const struct bgp_addr *addr2 = p2; - return addr1->addr.s_addr == addr2->addr.s_addr; + return addr1->addr.s_addr == addr2->addr.s_addr; } -void -bgp_address_init (struct bgp *bgp) +void bgp_address_init(struct bgp *bgp) { - bgp->address_hash = hash_create (bgp_address_hash_key_make, - bgp_address_hash_cmp, NULL); + bgp->address_hash = hash_create(bgp_address_hash_key_make, + bgp_address_hash_cmp, NULL); } -void -bgp_address_destroy (struct bgp *bgp) +void bgp_address_destroy(struct bgp *bgp) { - if (bgp->address_hash == NULL) - return; - hash_clean(bgp->address_hash, bgp_address_hash_free); - hash_free(bgp->address_hash); - bgp->address_hash = NULL; + if (bgp->address_hash == NULL) + return; + hash_clean(bgp->address_hash, bgp_address_hash_free); + hash_free(bgp->address_hash); + bgp->address_hash = NULL; } -static void -bgp_address_add (struct bgp *bgp, struct prefix *p) +static void bgp_address_add(struct bgp *bgp, struct prefix *p) { - struct bgp_addr tmp; - struct bgp_addr *addr; + struct bgp_addr tmp; + struct bgp_addr *addr; - tmp.addr = p->u.prefix4; + tmp.addr = p->u.prefix4; - addr = hash_get (bgp->address_hash, &tmp, bgp_address_hash_alloc); - if (!addr) - return; + addr = hash_get(bgp->address_hash, &tmp, bgp_address_hash_alloc); + if (!addr) + return; - addr->refcnt++; + addr->refcnt++; } -static void -bgp_address_del (struct bgp *bgp, struct prefix *p) +static void bgp_address_del(struct bgp *bgp, struct prefix *p) { - struct bgp_addr tmp; - struct bgp_addr *addr; + struct bgp_addr tmp; + struct bgp_addr *addr; - tmp.addr = p->u.prefix4; + tmp.addr = p->u.prefix4; - addr = hash_lookup (bgp->address_hash, &tmp); - /* may have been deleted earlier by bgp_interface_down() */ - if (addr == NULL) - return; + addr = hash_lookup(bgp->address_hash, &tmp); + /* may have been deleted earlier by bgp_interface_down() */ + if (addr == NULL) + return; - addr->refcnt--; + addr->refcnt--; - if (addr->refcnt == 0) - { - hash_release (bgp->address_hash, addr); - XFREE (MTYPE_BGP_ADDR, addr); - } + if (addr->refcnt == 0) { + hash_release(bgp->address_hash, addr); + XFREE(MTYPE_BGP_ADDR, addr); + } } -struct bgp_connected_ref -{ - unsigned int refcnt; +struct bgp_connected_ref { + unsigned int refcnt; }; -void -bgp_connected_add (struct bgp *bgp, struct connected *ifc) +void bgp_connected_add(struct bgp *bgp, struct connected *ifc) { - struct prefix p; - struct prefix *addr; - struct bgp_node *rn; - struct bgp_connected_ref *bc; - struct listnode *node, *nnode; - struct peer *peer; - - addr = ifc->address; - - p = *(CONNECTED_PREFIX(ifc)); - if (addr->family == AF_INET) - { - apply_mask_ipv4 ((struct prefix_ipv4 *) &p); - - if (prefix_ipv4_any ((struct prefix_ipv4 *) &p)) - return; - - bgp_address_add (bgp, addr); - - rn = bgp_node_get (bgp->connected_table[AFI_IP], (struct prefix *) &p); - if (rn->info) - { - bc = rn->info; - bc->refcnt++; - } - else - { - bc = XCALLOC (MTYPE_BGP_CONN, sizeof (struct bgp_connected_ref)); - bc->refcnt = 1; - rn->info = bc; - } + struct prefix p; + struct prefix *addr; + struct bgp_node *rn; + struct bgp_connected_ref *bc; + struct listnode *node, *nnode; + struct peer *peer; + + addr = ifc->address; + + p = *(CONNECTED_PREFIX(ifc)); + if (addr->family == AF_INET) { + apply_mask_ipv4((struct prefix_ipv4 *)&p); + + if (prefix_ipv4_any((struct prefix_ipv4 *)&p)) + return; + + bgp_address_add(bgp, addr); + + rn = bgp_node_get(bgp->connected_table[AFI_IP], + (struct prefix *)&p); + if (rn->info) { + bc = rn->info; + bc->refcnt++; + } else { + bc = XCALLOC(MTYPE_BGP_CONN, + sizeof(struct bgp_connected_ref)); + bc->refcnt = 1; + rn->info = bc; + } - for (ALL_LIST_ELEMENTS (bgp->peer, node, nnode, peer)) - { - if (peer->conf_if && (strcmp (peer->conf_if, ifc->ifp->name) == 0) && - peer->status != Established && - !CHECK_FLAG(peer->flags, PEER_FLAG_IFPEER_V6ONLY)) - { - if (peer_active(peer)) - BGP_EVENT_ADD (peer, BGP_Stop); - BGP_EVENT_ADD (peer, BGP_Start); - } - } - } - else if (addr->family == AF_INET6) - { - apply_mask_ipv6 ((struct prefix_ipv6 *) &p); - - if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6)) - return; - - if (IN6_IS_ADDR_LINKLOCAL (&p.u.prefix6)) - return; - - rn = bgp_node_get (bgp->connected_table[AFI_IP6], (struct prefix *) &p); - if (rn->info) - { - bc = rn->info; - bc->refcnt++; - } - else - { - bc = XCALLOC (MTYPE_BGP_CONN, sizeof (struct bgp_connected_ref)); - bc->refcnt = 1; - rn->info = bc; + for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) { + if (peer->conf_if + && (strcmp(peer->conf_if, ifc->ifp->name) == 0) + && peer->status != Established + && !CHECK_FLAG(peer->flags, + PEER_FLAG_IFPEER_V6ONLY)) { + if (peer_active(peer)) + BGP_EVENT_ADD(peer, BGP_Stop); + BGP_EVENT_ADD(peer, BGP_Start); + } + } + } else if (addr->family == AF_INET6) { + apply_mask_ipv6((struct prefix_ipv6 *)&p); + + if (IN6_IS_ADDR_UNSPECIFIED(&p.u.prefix6)) + return; + + if (IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6)) + return; + + rn = bgp_node_get(bgp->connected_table[AFI_IP6], + (struct prefix *)&p); + if (rn->info) { + bc = rn->info; + bc->refcnt++; + } else { + bc = XCALLOC(MTYPE_BGP_CONN, + sizeof(struct bgp_connected_ref)); + bc->refcnt = 1; + rn->info = bc; + } } - } } -void -bgp_connected_delete (struct bgp *bgp, struct connected *ifc) +void bgp_connected_delete(struct bgp *bgp, struct connected *ifc) { - struct prefix p; - struct prefix *addr; - struct bgp_node *rn; - struct bgp_connected_ref *bc; + struct prefix p; + struct prefix *addr; + struct bgp_node *rn; + struct bgp_connected_ref *bc; - addr = ifc->address; + addr = ifc->address; - p = *(CONNECTED_PREFIX(ifc)); - if (addr->family == AF_INET) - { - apply_mask_ipv4 ((struct prefix_ipv4 *) &p); + p = *(CONNECTED_PREFIX(ifc)); + if (addr->family == AF_INET) { + apply_mask_ipv4((struct prefix_ipv4 *)&p); - if (prefix_ipv4_any ((struct prefix_ipv4 *) &p)) - return; + if (prefix_ipv4_any((struct prefix_ipv4 *)&p)) + return; - bgp_address_del (bgp, addr); + bgp_address_del(bgp, addr); - rn = bgp_node_lookup (bgp->connected_table[AFI_IP], &p); - if (! rn) - return; + rn = bgp_node_lookup(bgp->connected_table[AFI_IP], &p); + if (!rn) + return; - bc = rn->info; - bc->refcnt--; - if (bc->refcnt == 0) - { - XFREE (MTYPE_BGP_CONN, bc); - rn->info = NULL; - } - bgp_unlock_node (rn); - bgp_unlock_node (rn); - } - else if (addr->family == AF_INET6) - { - apply_mask_ipv6 ((struct prefix_ipv6 *) &p); - - if (IN6_IS_ADDR_UNSPECIFIED (&p.u.prefix6)) - return; - - if (IN6_IS_ADDR_LINKLOCAL (&p.u.prefix6)) - return; - - rn = bgp_node_lookup (bgp->connected_table[AFI_IP6], (struct prefix *) &p); - if (! rn) - return; - - bc = rn->info; - bc->refcnt--; - if (bc->refcnt == 0) - { - XFREE (MTYPE_BGP_CONN, bc); - rn->info = NULL; + bc = rn->info; + bc->refcnt--; + if (bc->refcnt == 0) { + XFREE(MTYPE_BGP_CONN, bc); + rn->info = NULL; + } + bgp_unlock_node(rn); + bgp_unlock_node(rn); + } else if (addr->family == AF_INET6) { + apply_mask_ipv6((struct prefix_ipv6 *)&p); + + if (IN6_IS_ADDR_UNSPECIFIED(&p.u.prefix6)) + return; + + if (IN6_IS_ADDR_LINKLOCAL(&p.u.prefix6)) + return; + + rn = bgp_node_lookup(bgp->connected_table[AFI_IP6], + (struct prefix *)&p); + if (!rn) + return; + + bc = rn->info; + bc->refcnt--; + if (bc->refcnt == 0) { + XFREE(MTYPE_BGP_CONN, bc); + rn->info = NULL; + } + bgp_unlock_node(rn); + bgp_unlock_node(rn); } - bgp_unlock_node (rn); - bgp_unlock_node (rn); - } } -int -bgp_nexthop_self (struct bgp *bgp, struct in_addr nh_addr) +int bgp_nexthop_self(struct bgp *bgp, struct in_addr nh_addr) { - struct bgp_addr tmp, *addr; + struct bgp_addr tmp, *addr; - tmp.addr = nh_addr; + tmp.addr = nh_addr; - addr = hash_lookup (bgp->address_hash, &tmp); - if (addr) - return 1; + addr = hash_lookup(bgp->address_hash, &tmp); + if (addr) + return 1; - return 0; + return 0; } -int -bgp_multiaccess_check_v4 (struct in_addr nexthop, struct peer *peer) +int bgp_multiaccess_check_v4(struct in_addr nexthop, struct peer *peer) { - struct bgp_node *rn1; - struct bgp_node *rn2; - struct prefix p; - int ret; - - p.family = AF_INET; - p.prefixlen = IPV4_MAX_BITLEN; - p.u.prefix4 = nexthop; - - rn1 = bgp_node_match (peer->bgp->connected_table[AFI_IP], &p); - if (!rn1) - return 0; - - p.family = AF_INET; - p.prefixlen = IPV4_MAX_BITLEN; - p.u.prefix4 = peer->su.sin.sin_addr; - - rn2 = bgp_node_match (peer->bgp->connected_table[AFI_IP], &p); - if (!rn2) - { - bgp_unlock_node(rn1); - return 0; - } + struct bgp_node *rn1; + struct bgp_node *rn2; + struct prefix p; + int ret; + + p.family = AF_INET; + p.prefixlen = IPV4_MAX_BITLEN; + p.u.prefix4 = nexthop; + + rn1 = bgp_node_match(peer->bgp->connected_table[AFI_IP], &p); + if (!rn1) + return 0; + + p.family = AF_INET; + p.prefixlen = IPV4_MAX_BITLEN; + p.u.prefix4 = peer->su.sin.sin_addr; + + rn2 = bgp_node_match(peer->bgp->connected_table[AFI_IP], &p); + if (!rn2) { + bgp_unlock_node(rn1); + return 0; + } - ret = (rn1 == rn2) ? 1 : 0; + ret = (rn1 == rn2) ? 1 : 0; - bgp_unlock_node(rn1); - bgp_unlock_node(rn2); + bgp_unlock_node(rn1); + bgp_unlock_node(rn2); - return (ret); + return (ret); } -static void -bgp_show_nexthops (struct vty *vty, struct bgp *bgp, int detail) +static void bgp_show_nexthops(struct vty *vty, struct bgp *bgp, int detail) { - struct bgp_node *rn; - struct bgp_nexthop_cache *bnc; - char buf[PREFIX2STR_BUFFER]; - struct nexthop *nexthop; - time_t tbuf; - afi_t afi; - - vty_out (vty, "Current BGP nexthop cache:\n"); - for (afi = AFI_IP ; afi < AFI_MAX ; afi++) - { - if (!bgp->nexthop_cache_table[afi]) - continue; - - 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\n", - inet_ntop (rn->p.family, &rn->p.u.prefix, buf, sizeof (buf)), - bnc->metric, bnc->path_count); - if (detail) - for (nexthop = bnc->nexthop; nexthop; nexthop = nexthop->next) - switch (nexthop->type) - { - case NEXTHOP_TYPE_IPV6: - vty_out (vty, " gate %s\n", - inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf, sizeof(buf))); - break; - case NEXTHOP_TYPE_IPV6_IFINDEX: - vty_out (vty, " gate %s, if %s\n", - inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf, - sizeof (buf)), - ifindex2ifname(nexthop->ifindex, bgp->vrf_id)); - break; - case NEXTHOP_TYPE_IPV4: - vty_out (vty, " gate %s\n", - inet_ntop(AF_INET, &nexthop->gate.ipv4, buf, sizeof(buf))); - break; - case NEXTHOP_TYPE_IFINDEX: - vty_out (vty, " if %s\n", - ifindex2ifname(nexthop->ifindex, bgp->vrf_id)); - break; - case NEXTHOP_TYPE_IPV4_IFINDEX: - vty_out (vty, " gate %s, if %s\n", - inet_ntop(AF_INET, &nexthop->gate.ipv4, buf, - sizeof (buf)), - ifindex2ifname(nexthop->ifindex, bgp->vrf_id)); - break; - default: - vty_out (vty, " invalid nexthop type %u\n", - nexthop->type); + struct bgp_node *rn; + struct bgp_nexthop_cache *bnc; + char buf[PREFIX2STR_BUFFER]; + struct nexthop *nexthop; + time_t tbuf; + afi_t afi; + + vty_out(vty, "Current BGP nexthop cache:\n"); + for (afi = AFI_IP; afi < AFI_MAX; afi++) { + if (!bgp->nexthop_cache_table[afi]) + continue; + + 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\n", + inet_ntop(rn->p.family, + &rn->p.u.prefix, buf, + sizeof(buf)), + bnc->metric, bnc->path_count); + if (detail) + for (nexthop = bnc->nexthop; + nexthop; + nexthop = nexthop->next) + switch (nexthop->type) { + case NEXTHOP_TYPE_IPV6: + vty_out(vty, + " gate %s\n", + inet_ntop( + AF_INET6, + &nexthop->gate + .ipv6, + buf, + sizeof(buf))); + break; + case NEXTHOP_TYPE_IPV6_IFINDEX: + vty_out(vty, + " gate %s, if %s\n", + inet_ntop( + AF_INET6, + &nexthop->gate + .ipv6, + buf, + sizeof(buf)), + ifindex2ifname( + nexthop->ifindex, + bgp->vrf_id)); + break; + case NEXTHOP_TYPE_IPV4: + vty_out(vty, + " gate %s\n", + inet_ntop( + AF_INET, + &nexthop->gate + .ipv4, + buf, + sizeof(buf))); + break; + case NEXTHOP_TYPE_IFINDEX: + vty_out(vty, + " if %s\n", + ifindex2ifname( + nexthop->ifindex, + bgp->vrf_id)); + break; + case NEXTHOP_TYPE_IPV4_IFINDEX: + vty_out(vty, + " gate %s, if %s\n", + inet_ntop( + AF_INET, + &nexthop->gate + .ipv4, + buf, + sizeof(buf)), + ifindex2ifname( + nexthop->ifindex, + bgp->vrf_id)); + break; + default: + vty_out(vty, + " invalid nexthop type %u\n", + nexthop->type); + } + } else { + vty_out(vty, " %s invalid\n", + inet_ntop(rn->p.family, + &rn->p.u.prefix, buf, + sizeof(buf))); + if (CHECK_FLAG(bnc->flags, + BGP_NEXTHOP_CONNECTED)) + vty_out(vty, + " Must be Connected\n"); + } + tbuf = time(NULL) + - (bgp_clock() - bnc->last_update); + vty_out(vty, " Last update: %s", ctime(&tbuf)); + vty_out(vty, "\n"); } } - else - { - vty_out (vty, " %s invalid\n", - inet_ntop(rn->p.family, &rn->p.u.prefix, buf, sizeof(buf))); - if (CHECK_FLAG(bnc->flags, BGP_NEXTHOP_CONNECTED)) - vty_out (vty, " Must be Connected\n"); - } - tbuf = time(NULL) - (bgp_clock() - bnc->last_update); - vty_out (vty, " Last update: %s", ctime(&tbuf)); - vty_out (vty, "\n"); - } } - } } -static int -show_ip_bgp_nexthop_table (struct vty *vty, const char *name, int detail) +static int show_ip_bgp_nexthop_table(struct vty *vty, const char *name, + int detail) { - struct bgp *bgp; - - if (name) - bgp = bgp_lookup_by_name (name); - else - bgp = bgp_get_default (); - if (!bgp) - { - vty_out (vty, "%% No such BGP instance exist\n"); - return CMD_WARNING; - } + struct bgp *bgp; + + if (name) + bgp = bgp_lookup_by_name(name); + else + bgp = bgp_get_default(); + if (!bgp) { + vty_out(vty, "%% No such BGP instance exist\n"); + return CMD_WARNING; + } - bgp_show_nexthops (vty, bgp, detail); + bgp_show_nexthops(vty, bgp, detail); - return CMD_SUCCESS; + return CMD_SUCCESS; } -static void -bgp_show_all_instances_nexthops_vty (struct vty *vty) +static void bgp_show_all_instances_nexthops_vty(struct vty *vty) { - struct listnode *node, *nnode; - struct bgp *bgp; - - for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp)) - { - vty_out (vty, "\nInstance %s:\n", - (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) ? "Default" : bgp->name); - bgp_show_nexthops (vty, bgp, 0); - } + struct listnode *node, *nnode; + struct bgp *bgp; + + for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { + vty_out(vty, "\nInstance %s:\n", + (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT) + ? "Default" + : bgp->name); + bgp_show_nexthops(vty, bgp, 0); + } } DEFUN (show_ip_bgp_nexthop, @@ -494,10 +496,10 @@ DEFUN (show_ip_bgp_nexthop, "BGP nexthop table\n" "Show detailed information\n") { - int idx = 0; - char *vrf = argv_find (argv, argc, "WORD", &idx) ? argv[idx]->arg : NULL; - int detail = argv_find (argv, argc, "detail", &idx) ? 1 : 0; - return show_ip_bgp_nexthop_table (vty, vrf, detail); + int idx = 0; + char *vrf = argv_find(argv, argc, "WORD", &idx) ? argv[idx]->arg : NULL; + int detail = argv_find(argv, argc, "detail", &idx) ? 1 : 0; + return show_ip_bgp_nexthop_table(vty, vrf, detail); } DEFUN (show_ip_bgp_instance_all_nexthop, @@ -509,46 +511,43 @@ DEFUN (show_ip_bgp_instance_all_nexthop, BGP_INSTANCE_ALL_HELP_STR "BGP nexthop table\n") { - bgp_show_all_instances_nexthops_vty (vty); - return CMD_SUCCESS; + bgp_show_all_instances_nexthops_vty(vty); + return CMD_SUCCESS; } -void -bgp_scan_init (struct bgp *bgp) +void bgp_scan_init(struct bgp *bgp) { - afi_t afi; - - for (afi = AFI_IP; afi < AFI_MAX; afi++) - { - bgp->nexthop_cache_table[afi] = bgp_table_init (afi, SAFI_UNICAST); - bgp->connected_table[afi] = bgp_table_init (afi, SAFI_UNICAST); - bgp->import_check_table[afi] = bgp_table_init (afi, SAFI_UNICAST); - } + afi_t afi; + + for (afi = AFI_IP; afi < AFI_MAX; afi++) { + bgp->nexthop_cache_table[afi] = + bgp_table_init(afi, SAFI_UNICAST); + bgp->connected_table[afi] = bgp_table_init(afi, SAFI_UNICAST); + bgp->import_check_table[afi] = + bgp_table_init(afi, SAFI_UNICAST); + } } -void -bgp_scan_vty_init (void) +void bgp_scan_vty_init(void) { - install_element (VIEW_NODE, &show_ip_bgp_nexthop_cmd); - install_element (VIEW_NODE, &show_ip_bgp_instance_all_nexthop_cmd); + install_element(VIEW_NODE, &show_ip_bgp_nexthop_cmd); + install_element(VIEW_NODE, &show_ip_bgp_instance_all_nexthop_cmd); } -void -bgp_scan_finish (struct bgp *bgp) +void bgp_scan_finish(struct bgp *bgp) { - afi_t afi; + afi_t afi; - for (afi = AFI_IP; afi < AFI_MAX; afi++) - { - /* Only the current one needs to be reset. */ - bgp_nexthop_cache_reset (bgp->nexthop_cache_table[afi]); - bgp_table_unlock (bgp->nexthop_cache_table[afi]); - bgp->nexthop_cache_table[afi] = NULL; + for (afi = AFI_IP; afi < AFI_MAX; afi++) { + /* Only the current one needs to be reset. */ + bgp_nexthop_cache_reset(bgp->nexthop_cache_table[afi]); + bgp_table_unlock(bgp->nexthop_cache_table[afi]); + bgp->nexthop_cache_table[afi] = NULL; - bgp_table_unlock (bgp->connected_table[afi]); - bgp->connected_table[afi] = NULL; + bgp_table_unlock(bgp->connected_table[afi]); + bgp->connected_table[afi] = NULL; - bgp_table_unlock (bgp->import_check_table[afi]); - bgp->import_check_table[afi] = NULL; - } + bgp_table_unlock(bgp->import_check_table[afi]); + bgp->import_check_table[afi] = NULL; + } } |