lib/ospf-topo1-vrf: don't compare headers of show ip route

[mirror_frr.git] / bgpd / bgp_nexthop.c

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 15f42e26dabbf8449aaef084a698fc8b41d03bae..1cb7e4c5e1b959b4af49bf1940c92733c34df98e 100644 (file)
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -47,6 +47,8 @@
 #include "zebra/rib.h"
 #include "zebra/zserv.h" /* For ZEBRA_SERV_PATH. */
 
+DEFINE_MTYPE_STATIC(BGPD, MARTIAN_STRING, "BGP Martian Address Intf String");
+
 char *bnc_str(struct bgp_nexthop_cache *bnc, char *buf, int size)
 {
        prefix2str(&(bnc->node->p), buf, size);
@@ -82,11 +84,18 @@ static void bgp_nexthop_cache_reset(struct bgp_table *table)
 
        for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
                bnc = bgp_nexthop_get_node_info(rn);
-               if (bnc != NULL) {
-                       bnc_free(bnc);
-                       bgp_nexthop_set_node_info(rn, NULL);
-                       bgp_unlock_node(rn);
+               if (!bnc)
+                       continue;
+
+               while (!LIST_EMPTY(&(bnc->paths))) {
+                       struct bgp_path_info *path = LIST_FIRST(&(bnc->paths));
+
+                       path_nh_map(path, bnc, false);
                }
+
+               bnc_free(bnc);
+               bgp_nexthop_set_node_info(rn, NULL);
+               bgp_unlock_node(rn);
        }
 }
 
@@ -114,7 +123,7 @@ static unsigned int bgp_tip_hash_key_make(void *p)
        return jhash_1word(addr->addr.s_addr, 0);
 }
 
-static int bgp_tip_hash_cmp(const void *p1, const void *p2)
+static bool bgp_tip_hash_cmp(const void *p1, const void *p2)
 {
        const struct tip_addr *addr1 = p1;
        const struct tip_addr *addr2 = p2;
@@ -171,20 +180,62 @@ void bgp_tip_del(struct bgp *bgp, struct in_addr *tip)
        }
 }
 
+/* BGP own address structure */
+struct bgp_addr {
+       struct in_addr addr;
+       struct list *ifp_name_list;
+};
+
+static void show_address_entry(struct hash_backet *backet, void *args)
+{
+       struct vty *vty = (struct vty *)args;
+       struct bgp_addr *addr = (struct bgp_addr *)backet->data;
+       char *name;
+       struct listnode *node;
+
+       vty_out(vty, "addr: %s, count: %d : ", inet_ntoa(addr->addr),
+               addr->ifp_name_list->count);
+
+       for (ALL_LIST_ELEMENTS_RO(addr->ifp_name_list, node, name)) {
+               vty_out(vty, " %s,", name);
+       }
+
+       vty_out(vty, "\n");
+}
+
+void bgp_nexthop_show_address_hash(struct vty *vty, struct bgp *bgp)
+{
+       hash_iterate(bgp->address_hash,
+                    (void (*)(struct hash_backet *, void *))show_address_entry,
+                    vty);
+}
+
+static void bgp_address_hash_string_del(void *val)
+{
+       char *data = val;
+
+       XFREE(MTYPE_MARTIAN_STRING, data);
+}
+
 static void *bgp_address_hash_alloc(void *p)
 {
        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->ifp_name_list = list_new();
+       addr->ifp_name_list->del = bgp_address_hash_string_del;
+
        return addr;
 }
 
-static void bgp_address_hash_free(void *addr)
+static void bgp_address_hash_free(void *data)
 {
+       struct bgp_addr *addr = data;
+
+       list_delete(&addr->ifp_name_list);
        XFREE(MTYPE_BGP_ADDR, addr);
 }
 
@@ -195,7 +246,7 @@ static unsigned int bgp_address_hash_key_make(void *p)
        return jhash_1word(addr->addr.s_addr, 0);
 }
 
-static int bgp_address_hash_cmp(const void *p1, const void *p2)
+static bool bgp_address_hash_cmp(const void *p1, const void *p2)
 {
        const struct bgp_addr *addr1 = p1;
        const struct bgp_addr *addr2 = p2;
@@ -219,24 +270,35 @@ void bgp_address_destroy(struct bgp *bgp)
        bgp->address_hash = NULL;
 }
 
-static void bgp_address_add(struct bgp *bgp, struct prefix *p)
+static void bgp_address_add(struct bgp *bgp, struct connected *ifc,
+                           struct prefix *p)
 {
        struct bgp_addr tmp;
        struct bgp_addr *addr;
+       struct listnode *node;
+       char *name;
 
        tmp.addr = p->u.prefix4;
 
        addr = hash_get(bgp->address_hash, &tmp, bgp_address_hash_alloc);
-       if (!addr)
-               return;
 
-       addr->refcnt++;
+       for (ALL_LIST_ELEMENTS_RO(addr->ifp_name_list, node, name)) {
+               if (strcmp(ifc->ifp->name, name) == 0)
+                       break;
+       }
+       if (!node) {
+               name = XSTRDUP(MTYPE_MARTIAN_STRING, ifc->ifp->name);
+               listnode_add(addr->ifp_name_list, name);
+       }
 }
 
-static void bgp_address_del(struct bgp *bgp, struct prefix *p)
+static void bgp_address_del(struct bgp *bgp, struct connected *ifc,
+                           struct prefix *p)
 {
        struct bgp_addr tmp;
        struct bgp_addr *addr;
+       struct listnode *node;
+       char *name;
 
        tmp.addr = p->u.prefix4;
 
@@ -245,10 +307,19 @@ static void bgp_address_del(struct bgp *bgp, struct prefix *p)
        if (addr == NULL)
                return;
 
-       addr->refcnt--;
+       for (ALL_LIST_ELEMENTS_RO(addr->ifp_name_list, node, name)) {
+               if (strcmp(ifc->ifp->name, name) == 0)
+                       break;
+       }
 
-       if (addr->refcnt == 0) {
+       if (node) {
+               list_delete_node(addr->ifp_name_list, node);
+               XFREE(MTYPE_MARTIAN_STRING, name);
+       }
+
+       if (addr->ifp_name_list->count == 0) {
                hash_release(bgp->address_hash, addr);
+               list_delete(&addr->ifp_name_list);
                XFREE(MTYPE_BGP_ADDR, addr);
        }
 }
@@ -276,7 +347,7 @@ void bgp_connected_add(struct bgp *bgp, struct connected *ifc)
                if (prefix_ipv4_any((struct prefix_ipv4 *)&p))
                        return;
 
-               bgp_address_add(bgp, addr);
+               bgp_address_add(bgp, ifc, addr);
 
                rn = bgp_node_get(bgp->connected_table[AFI_IP],
                                  (struct prefix *)&p);
@@ -340,7 +411,7 @@ void bgp_connected_delete(struct bgp *bgp, struct connected *ifc)
                if (prefix_ipv4_any((struct prefix_ipv4 *)&p))
                        return;
 
-               bgp_address_del(bgp, addr);
+               bgp_address_del(bgp, ifc, addr);
 
                rn = bgp_node_lookup(bgp->connected_table[AFI_IP], &p);
        } else if (addr->family == AF_INET6) {
@@ -557,7 +628,10 @@ static void bgp_show_nexthops(struct vty *vty, struct bgp *bgp, int detail)
                                if (CHECK_FLAG(bnc->flags,
                                               BGP_NEXTHOP_CONNECTED))
                                        vty_out(vty, "  Must be Connected\n");
-                               }
+                               if (!CHECK_FLAG(bnc->flags,
+                                               BGP_NEXTHOP_REGISTERED))
+                                       vty_out(vty, "  Is not Registered\n");
+                       }
                        tbuf = time(NULL) - (bgp_clock() - bnc->last_update);
                        vty_out(vty, "  Last update: %s", ctime(&tbuf));
                        vty_out(vty, "\n");
@@ -592,7 +666,7 @@ static void bgp_show_all_instances_nexthops_vty(struct vty *vty)
        for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
                vty_out(vty, "\nInstance %s:\n",
                        (bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT)
-                               ? "Default"
+                               ? VRF_DEFAULT_NAME
                                : bgp->name);
                bgp_show_nexthops(vty, bgp, 0);
        }