*: Rename ZEBRA_NHRP_NEIGH_XXX to ZEBRA_NEIGH_XXX

This does not need to be nhrp specific.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/lib/log.c b/lib/log.c
index b18b37efa3f50f563a4f3b411990af5e5b79c734..969ca7925660d9c9288b8bb2b52fa82739af62cb 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -444,11 +444,11 @@ static const struct zebra_desc_table command_types[] = {
        DESC_ENTRY(ZEBRA_NEIGH_DISCOVER),
        DESC_ENTRY(ZEBRA_ROUTE_NOTIFY_REQUEST),
        DESC_ENTRY(ZEBRA_CLIENT_CLOSE_NOTIFY),
-       DESC_ENTRY(ZEBRA_NHRP_NEIGH_ADDED),
-       DESC_ENTRY(ZEBRA_NHRP_NEIGH_REMOVED),
-       DESC_ENTRY(ZEBRA_NHRP_NEIGH_GET),
-       DESC_ENTRY(ZEBRA_NHRP_NEIGH_REGISTER),
-       DESC_ENTRY(ZEBRA_NHRP_NEIGH_UNREGISTER),
+       DESC_ENTRY(ZEBRA_NEIGH_ADDED),
+       DESC_ENTRY(ZEBRA_NEIGH_REMOVED),
+       DESC_ENTRY(ZEBRA_NEIGH_GET),
+       DESC_ENTRY(ZEBRA_NEIGH_REGISTER),
+       DESC_ENTRY(ZEBRA_NEIGH_UNREGISTER),
        DESC_ENTRY(ZEBRA_NEIGH_IP_ADD),
        DESC_ENTRY(ZEBRA_NEIGH_IP_DEL),
        DESC_ENTRY(ZEBRA_CONFIGURE_ARP),

diff --git a/lib/zclient.h b/lib/zclient.h
index 8d7faeb223d5851a4231a8ce5aae0970d7227c0e..f616dcda5d314b3d5c83949614044b2dd1ebe6f0 100644 (file)
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -216,11 +216,11 @@ typedef enum {
        ZEBRA_NEIGH_DISCOVER,
        ZEBRA_ROUTE_NOTIFY_REQUEST,
        ZEBRA_CLIENT_CLOSE_NOTIFY,
-       ZEBRA_NHRP_NEIGH_ADDED,
-       ZEBRA_NHRP_NEIGH_REMOVED,
-       ZEBRA_NHRP_NEIGH_GET,
-       ZEBRA_NHRP_NEIGH_REGISTER,
-       ZEBRA_NHRP_NEIGH_UNREGISTER,
+       ZEBRA_NEIGH_ADDED,
+       ZEBRA_NEIGH_REMOVED,
+       ZEBRA_NEIGH_GET,
+       ZEBRA_NEIGH_REGISTER,
+       ZEBRA_NEIGH_UNREGISTER,
        ZEBRA_NEIGH_IP_ADD,
        ZEBRA_NEIGH_IP_DEL,
        ZEBRA_CONFIGURE_ARP,

diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c
index bcecf9fc09b0b9ce8080b144399c6f8c8a831cc1..c0d77e62d238bc5cbf81885c5c58f3a8d0aaf80f 100644 (file)
--- a/nhrpd/netlink_arp.c
+++ b/nhrpd/netlink_arp.c
@@ -176,12 +176,11 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
                return 0;
        debugf(NHRP_DEBUG_KERNEL,
               "Netlink: %s %pSU dev %s lladdr %pSU nud 0x%x cache used %u type %u",
-              (cmd == ZEBRA_NHRP_NEIGH_GET)
-              ? "who-has"
-              : (cmd == ZEBRA_NHRP_NEIGH_ADDED) ? "new-neigh"
-              : "del-neigh",
+              (cmd == ZEBRA_NEIGH_GET)     ? "who-has"
+              : (cmd == ZEBRA_NEIGH_ADDED) ? "new-neigh"
+                                           : "del-neigh",
               &addr, ifp->name, &lladdr, ndm_state, c->used, c->cur.type);
-       if (cmd == ZEBRA_NHRP_NEIGH_GET) {
+       if (cmd == ZEBRA_NEIGH_GET) {
                if (c->cur.type >= NHRP_CACHE_CACHED) {
                        nhrp_cache_set_used(c, 1);
                        debugf(NHRP_DEBUG_KERNEL,
@@ -194,8 +193,8 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
                        netlink_update_binding(ifp, &addr, &lladdr);
                }
        } else {
-               state = (cmd == ZEBRA_NHRP_NEIGH_ADDED) ? ndm_state
-                       : ZEBRA_NEIGH_STATE_FAILED;
+               state = (cmd == ZEBRA_NEIGH_ADDED) ? ndm_state
+                                                  : ZEBRA_NEIGH_STATE_FAILED;
                nhrp_cache_set_used(c, state == ZEBRA_NEIGH_STATE_REACHABLE);
        }
        return 0;

diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
index 060e60314d73687a840739d34c80f1d60bdc67c4..edc3629723a34d807996ace0be3244f29f8561b3 100644 (file)
--- a/nhrpd/nhrp_route.c
+++ b/nhrpd/nhrp_route.c
@@ -85,8 +85,9 @@ static void nhrp_zebra_register_neigh(vrf_id_t vrf_id, afi_t afi, bool reg)
        s = zclient->obuf;
        stream_reset(s);
 
-       zclient_create_header(s, reg ? ZEBRA_NHRP_NEIGH_REGISTER :
-                             ZEBRA_NHRP_NEIGH_UNREGISTER,
+       zclient_create_header(s,
+                             reg ? ZEBRA_NEIGH_REGISTER
+                                 : ZEBRA_NEIGH_UNREGISTER,
                              vrf_id);
        stream_putw(s, afi);
        stream_putw_at(s, 0, stream_get_endp(s));
@@ -377,9 +378,9 @@ static zclient_handler *const nhrp_handlers[] = {
        [ZEBRA_INTERFACE_ADDRESS_DELETE] = nhrp_interface_address_delete,
        [ZEBRA_REDISTRIBUTE_ROUTE_ADD] = nhrp_route_read,
        [ZEBRA_REDISTRIBUTE_ROUTE_DEL] = nhrp_route_read,
-       [ZEBRA_NHRP_NEIGH_ADDED] = nhrp_neighbor_operation,
-       [ZEBRA_NHRP_NEIGH_REMOVED] = nhrp_neighbor_operation,
-       [ZEBRA_NHRP_NEIGH_GET] = nhrp_neighbor_operation,
+       [ZEBRA_NEIGH_ADDED] = nhrp_neighbor_operation,
+       [ZEBRA_NEIGH_REMOVED] = nhrp_neighbor_operation,
+       [ZEBRA_NEIGH_GET] = nhrp_neighbor_operation,
        [ZEBRA_GRE_UPDATE] = nhrp_gre_update,
 };
 

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 98bb890eb682924807001f2ae046176de5bc433e..711ceae6d6ececd2c82d4fb81fea8f0e4ba2c444 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -4242,11 +4242,11 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
         * - struct ethaddr mac; (for NEW)
         */
        if (h->nlmsg_type == RTM_NEWNEIGH)
-               cmd = ZEBRA_NHRP_NEIGH_ADDED;
+               cmd = ZEBRA_NEIGH_ADDED;
        else if (h->nlmsg_type == RTM_GETNEIGH)
-               cmd = ZEBRA_NHRP_NEIGH_GET;
+               cmd = ZEBRA_NEIGH_GET;
        else if (h->nlmsg_type == RTM_DELNEIGH)
-               cmd = ZEBRA_NHRP_NEIGH_REMOVED;
+               cmd = ZEBRA_NEIGH_REMOVED;
        else {
                zlog_debug("%s(): unknown nlmsg type %u", __func__,
                           h->nlmsg_type);
@@ -4265,10 +4265,10 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
                               RTA_DATA(tb[NDA_LLADDR]), l2_len);
                } else
                        sockunion_family(&link_layer_ipv4) = AF_UNSPEC;
-               zsend_nhrp_neighbor_notify(
-                       cmd, ifp, &ip,
-                       netlink_nbr_entry_state_to_zclient(ndm->ndm_state),
-                       &link_layer_ipv4);
+               zsend_neighbor_notify(cmd, ifp, &ip,
+                                     netlink_nbr_entry_state_to_zclient(
+                                             ndm->ndm_state),
+                                     &link_layer_ipv4);
        }
 
        if (h->nlmsg_type == RTM_GETNEIGH)

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 761eafeb13756b98dcc4c569d95dae433002ae47..f40413dc51b870d85f16e252a3b4037b81294107 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -968,9 +968,8 @@ void zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx,
        zserv_send_message(client, s);
 }
 
-void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
-                               struct ipaddr *ipaddr, int ndm_state,
-                               union sockunion *link_layer_ipv4)
+void zsend_neighbor_notify(int cmd, struct interface *ifp, struct ipaddr *ipaddr,
+                          int ndm_state, union sockunion *link_layer_ipv4)
 {
        struct stream *s;
        struct listnode *node, *nnode;
@@ -987,7 +986,7 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
               family2addrsize(sockunion_family(&ip)));
 
        for (ALL_LIST_ELEMENTS(zrouter.client_list, node, nnode, client)) {
-               if (!vrf_bitmap_check(&client->nhrp_neighinfo[afi],
+               if (!vrf_bitmap_check(&client->neighinfo[afi],
                                      ifp->vrf->vrf_id))
                        continue;
 
@@ -2431,7 +2430,7 @@ static void zread_vrf_unregister(ZAPI_HANDLER_ARGS)
                                         zvrf_id(zvrf));
                vrf_bitmap_unset(&client->redist_default[afi], zvrf_id(zvrf));
                vrf_bitmap_unset(&client->ridinfo[afi], zvrf_id(zvrf));
-               vrf_bitmap_unset(&client->nhrp_neighinfo[afi], zvrf_id(zvrf));
+               vrf_bitmap_unset(&client->neighinfo[afi], zvrf_id(zvrf));
        }
 }
 
@@ -3563,7 +3562,7 @@ static inline void zebra_neigh_register(ZAPI_HANDLER_ARGS)
                        afi);
                goto stream_failure;
        }
-       vrf_bitmap_set(&client->nhrp_neighinfo[afi], zvrf_id(zvrf));
+       vrf_bitmap_set(&client->neighinfo[afi], zvrf_id(zvrf));
 stream_failure:
        return;
 }
@@ -3579,7 +3578,7 @@ static inline void zebra_neigh_unregister(ZAPI_HANDLER_ARGS)
                        afi);
                goto stream_failure;
        }
-       vrf_bitmap_unset(&client->nhrp_neighinfo[afi], zvrf_id(zvrf));
+       vrf_bitmap_unset(&client->neighinfo[afi], zvrf_id(zvrf));
 stream_failure:
        return;
 }
@@ -3936,8 +3935,8 @@ void (*const zserv_handlers[])(ZAPI_HANDLER_ARGS) = {
        [ZEBRA_EVPN_REMOTE_NH_DEL] = zebra_evpn_proc_remote_nh,
        [ZEBRA_NEIGH_IP_ADD] = zebra_neigh_ip_add,
        [ZEBRA_NEIGH_IP_DEL] = zebra_neigh_ip_del,
-       [ZEBRA_NHRP_NEIGH_REGISTER] = zebra_neigh_register,
-       [ZEBRA_NHRP_NEIGH_UNREGISTER] = zebra_neigh_unregister,
+       [ZEBRA_NEIGH_REGISTER] = zebra_neigh_register,
+       [ZEBRA_NEIGH_UNREGISTER] = zebra_neigh_unregister,
        [ZEBRA_CONFIGURE_ARP] = zebra_configure_arp,
        [ZEBRA_GRE_GET] = zebra_gre_get,
        [ZEBRA_GRE_SOURCE_SET] = zebra_gre_source_set,

diff --git a/zebra/zapi_msg.h b/zebra/zapi_msg.h
index def1e8a1bdff6f37ad44016632499f2f4dac824d..c750c275151223cef10c3e3c21927e150b45acea 100644 (file)
--- a/zebra/zapi_msg.h
+++ b/zebra/zapi_msg.h
@@ -91,9 +91,9 @@ extern int zsend_label_manager_connect_response(struct zserv *client,
 extern int zsend_sr_policy_notify_status(uint32_t color,
                                         struct ipaddr *endpoint, char *name,
                                         int status);
-extern void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
-                                      struct ipaddr *ipaddr, int ndm_state,
-                                      union sockunion *link_layer_ipv4);
+extern void zsend_neighbor_notify(int cmd, struct interface *ifp,
+                                 struct ipaddr *ipaddr, int ndm_state,
+                                 union sockunion *link_layer_ipv4);
 
 extern int zsend_client_close_notify(struct zserv *client,
                                     struct zserv *closed_client);

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 1d3989dc733de3e8544aed1db7f7f7a96cd9c393..6a64176d98b3ef97da6ebf816065e70cfa518320 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -637,7 +637,7 @@ static void zserv_client_free(struct zserv *client)
 
                vrf_bitmap_free(&client->redist_default[afi]);
                vrf_bitmap_free(&client->ridinfo[afi]);
-               vrf_bitmap_free(&client->nhrp_neighinfo[afi]);
+               vrf_bitmap_free(&client->neighinfo[afi]);
        }
 
        /*
@@ -758,7 +758,7 @@ static struct zserv *zserv_client_create(int sock)
                        vrf_bitmap_init(&client->redist[afi][i]);
                vrf_bitmap_init(&client->redist_default[afi]);
                vrf_bitmap_init(&client->ridinfo[afi]);
-               vrf_bitmap_init(&client->nhrp_neighinfo[afi]);
+               vrf_bitmap_init(&client->neighinfo[afi]);
        }
 
        /* Add this client to linked list. */

diff --git a/zebra/zserv.h b/zebra/zserv.h
index 5e15d1fbc29f3b42f68f8df095848869d7780c01..4ab201b5ea15f124cd23378c611adb9c58c15413 100644 (file)
--- a/zebra/zserv.h
+++ b/zebra/zserv.h
@@ -121,7 +121,7 @@ struct zserv {
        vrf_bitmap_t ridinfo[AFI_MAX];
 
        /* Router-id information. */
-       vrf_bitmap_t nhrp_neighinfo[AFI_MAX];
+       vrf_bitmap_t neighinfo[AFI_MAX];
 
        bool notify_owner;