matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

*: Rename ZEBRA_NHRP_NEIGH_XXX to ZEBRA_NEIGH_XXX

Browse source 
This does not need to be nhrp specific.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-01-19 14:45:25 -05:00
parent 22d1ad786f
commit 275edb5c16
9 changed files with 43 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/log.c
View file

@ -444,11 +444,11 @@ static const struct zebra_desc_table command_types[] = {
DESC_ENTRY(ZEBRA_NEIGH_DISCOVER), DESC_ENTRY(ZEBRA_NEIGH_DISCOVER),
DESC_ENTRY(ZEBRA_ROUTE_NOTIFY_REQUEST), DESC_ENTRY(ZEBRA_ROUTE_NOTIFY_REQUEST),
DESC_ENTRY(ZEBRA_CLIENT_CLOSE_NOTIFY), DESC_ENTRY(ZEBRA_CLIENT_CLOSE_NOTIFY),
DESC_ENTRY(ZEBRA_NHRP_NEIGH_ADDED), DESC_ENTRY(ZEBRA_NEIGH_ADDED),
DESC_ENTRY(ZEBRA_NHRP_NEIGH_REMOVED), DESC_ENTRY(ZEBRA_NEIGH_REMOVED),
DESC_ENTRY(ZEBRA_NHRP_NEIGH_GET), DESC_ENTRY(ZEBRA_NEIGH_GET),
DESC_ENTRY(ZEBRA_NHRP_NEIGH_REGISTER), DESC_ENTRY(ZEBRA_NEIGH_REGISTER),
DESC_ENTRY(ZEBRA_NHRP_NEIGH_UNREGISTER), DESC_ENTRY(ZEBRA_NEIGH_UNREGISTER),
DESC_ENTRY(ZEBRA_NEIGH_IP_ADD), DESC_ENTRY(ZEBRA_NEIGH_IP_ADD),
DESC_ENTRY(ZEBRA_NEIGH_IP_DEL), DESC_ENTRY(ZEBRA_NEIGH_IP_DEL),
DESC_ENTRY(ZEBRA_CONFIGURE_ARP), DESC_ENTRY(ZEBRA_CONFIGURE_ARP),

10
lib/zclient.h
View file

@ -216,11 +216,11 @@ typedef enum {
ZEBRA_NEIGH_DISCOVER, ZEBRA_NEIGH_DISCOVER,
ZEBRA_ROUTE_NOTIFY_REQUEST, ZEBRA_ROUTE_NOTIFY_REQUEST,
ZEBRA_CLIENT_CLOSE_NOTIFY, ZEBRA_CLIENT_CLOSE_NOTIFY,
ZEBRA_NHRP_NEIGH_ADDED, ZEBRA_NEIGH_ADDED,
ZEBRA_NHRP_NEIGH_REMOVED, ZEBRA_NEIGH_REMOVED,
ZEBRA_NHRP_NEIGH_GET, ZEBRA_NEIGH_GET,
ZEBRA_NHRP_NEIGH_REGISTER, ZEBRA_NEIGH_REGISTER,
ZEBRA_NHRP_NEIGH_UNREGISTER, ZEBRA_NEIGH_UNREGISTER,
ZEBRA_NEIGH_IP_ADD, ZEBRA_NEIGH_IP_ADD,
ZEBRA_NEIGH_IP_DEL, ZEBRA_NEIGH_IP_DEL,
ZEBRA_CONFIGURE_ARP, ZEBRA_CONFIGURE_ARP,

9
nhrpd/netlink_arp.c
View file

@ -176,12 +176,11 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
return 0; return 0;
debugf(NHRP_DEBUG_KERNEL, debugf(NHRP_DEBUG_KERNEL,
"Netlink: %s %pSU dev %s lladdr %pSU nud 0x%x cache used %u type %u", "Netlink: %s %pSU dev %s lladdr %pSU nud 0x%x cache used %u type %u",
(cmd == ZEBRA_NHRP_NEIGH_GET) (cmd == ZEBRA_NEIGH_GET) ? "who-has"
? "who-has" : (cmd == ZEBRA_NEIGH_ADDED) ? "new-neigh"
: (cmd == ZEBRA_NHRP_NEIGH_ADDED) ? "new-neigh"
: "del-neigh", : "del-neigh",
&addr, ifp->name, &lladdr, ndm_state, c->used, c->cur.type); &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) { if (c->cur.type >= NHRP_CACHE_CACHED) {
nhrp_cache_set_used(c, 1); nhrp_cache_set_used(c, 1);
debugf(NHRP_DEBUG_KERNEL, debugf(NHRP_DEBUG_KERNEL,
@ -194,7 +193,7 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
netlink_update_binding(ifp, &addr, &lladdr); netlink_update_binding(ifp, &addr, &lladdr);
} }
} else { } else {
state = (cmd == ZEBRA_NHRP_NEIGH_ADDED) ? ndm_state state = (cmd == ZEBRA_NEIGH_ADDED) ? ndm_state
: ZEBRA_NEIGH_STATE_FAILED; : ZEBRA_NEIGH_STATE_FAILED;
nhrp_cache_set_used(c, state == ZEBRA_NEIGH_STATE_REACHABLE); nhrp_cache_set_used(c, state == ZEBRA_NEIGH_STATE_REACHABLE);
} }

11
nhrpd/nhrp_route.c
View file

@ -85,8 +85,9 @@ static void nhrp_zebra_register_neigh(vrf_id_t vrf_id, afi_t afi, bool reg)
s = zclient->obuf; s = zclient->obuf;
stream_reset(s); stream_reset(s);
zclient_create_header(s, reg ? ZEBRA_NHRP_NEIGH_REGISTER : zclient_create_header(s,
ZEBRA_NHRP_NEIGH_UNREGISTER, reg ? ZEBRA_NEIGH_REGISTER
: ZEBRA_NEIGH_UNREGISTER,
vrf_id); vrf_id);
stream_putw(s, afi); stream_putw(s, afi);
stream_putw_at(s, 0, stream_get_endp(s)); 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_INTERFACE_ADDRESS_DELETE] = nhrp_interface_address_delete,
[ZEBRA_REDISTRIBUTE_ROUTE_ADD] = nhrp_route_read, [ZEBRA_REDISTRIBUTE_ROUTE_ADD] = nhrp_route_read,
[ZEBRA_REDISTRIBUTE_ROUTE_DEL] = nhrp_route_read, [ZEBRA_REDISTRIBUTE_ROUTE_DEL] = nhrp_route_read,
[ZEBRA_NHRP_NEIGH_ADDED] = nhrp_neighbor_operation, [ZEBRA_NEIGH_ADDED] = nhrp_neighbor_operation,
[ZEBRA_NHRP_NEIGH_REMOVED] = nhrp_neighbor_operation, [ZEBRA_NEIGH_REMOVED] = nhrp_neighbor_operation,
[ZEBRA_NHRP_NEIGH_GET] = nhrp_neighbor_operation, [ZEBRA_NEIGH_GET] = nhrp_neighbor_operation,
[ZEBRA_GRE_UPDATE] = nhrp_gre_update, [ZEBRA_GRE_UPDATE] = nhrp_gre_update,
}; };

12
zebra/rt_netlink.c
View file

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

17
zebra/zapi_msg.c
View file

@ -968,9 +968,8 @@ void zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx,
zserv_send_message(client, s); zserv_send_message(client, s);
} }
void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp, void zsend_neighbor_notify(int cmd, struct interface *ifp, struct ipaddr *ipaddr,
struct ipaddr *ipaddr, int ndm_state, int ndm_state, union sockunion *link_layer_ipv4)
union sockunion *link_layer_ipv4)
{ {
struct stream *s; struct stream *s;
struct listnode *node, *nnode; struct listnode *node, *nnode;
@ -987,7 +986,7 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
family2addrsize(sockunion_family(&ip))); family2addrsize(sockunion_family(&ip)));
for (ALL_LIST_ELEMENTS(zrouter.client_list, node, nnode, client)) { 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)) ifp->vrf->vrf_id))
continue; continue;
@ -2431,7 +2430,7 @@ static void zread_vrf_unregister(ZAPI_HANDLER_ARGS)
zvrf_id(zvrf)); zvrf_id(zvrf));
vrf_bitmap_unset(&client->redist_default[afi], 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->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); afi);
goto stream_failure; goto stream_failure;
} }
vrf_bitmap_set(&client->nhrp_neighinfo[afi], zvrf_id(zvrf)); vrf_bitmap_set(&client->neighinfo[afi], zvrf_id(zvrf));
stream_failure: stream_failure:
return; return;
} }
@ -3579,7 +3578,7 @@ static inline void zebra_neigh_unregister(ZAPI_HANDLER_ARGS)
afi); afi);
goto stream_failure; goto stream_failure;
} }
vrf_bitmap_unset(&client->nhrp_neighinfo[afi], zvrf_id(zvrf)); vrf_bitmap_unset(&client->neighinfo[afi], zvrf_id(zvrf));
stream_failure: stream_failure:
return; return;
} }
@ -3936,8 +3935,8 @@ void (*const zserv_handlers[])(ZAPI_HANDLER_ARGS) = {
[ZEBRA_EVPN_REMOTE_NH_DEL] = zebra_evpn_proc_remote_nh, [ZEBRA_EVPN_REMOTE_NH_DEL] = zebra_evpn_proc_remote_nh,
[ZEBRA_NEIGH_IP_ADD] = zebra_neigh_ip_add, [ZEBRA_NEIGH_IP_ADD] = zebra_neigh_ip_add,
[ZEBRA_NEIGH_IP_DEL] = zebra_neigh_ip_del, [ZEBRA_NEIGH_IP_DEL] = zebra_neigh_ip_del,
[ZEBRA_NHRP_NEIGH_REGISTER] = zebra_neigh_register, [ZEBRA_NEIGH_REGISTER] = zebra_neigh_register,
[ZEBRA_NHRP_NEIGH_UNREGISTER] = zebra_neigh_unregister, [ZEBRA_NEIGH_UNREGISTER] = zebra_neigh_unregister,
[ZEBRA_CONFIGURE_ARP] = zebra_configure_arp, [ZEBRA_CONFIGURE_ARP] = zebra_configure_arp,
[ZEBRA_GRE_GET] = zebra_gre_get, [ZEBRA_GRE_GET] = zebra_gre_get,
[ZEBRA_GRE_SOURCE_SET] = zebra_gre_source_set, [ZEBRA_GRE_SOURCE_SET] = zebra_gre_source_set,

2
zebra/zapi_msg.h
View file

@ -91,7 +91,7 @@ extern int zsend_label_manager_connect_response(struct zserv *client,
extern int zsend_sr_policy_notify_status(uint32_t color, extern int zsend_sr_policy_notify_status(uint32_t color,
struct ipaddr *endpoint, char *name, struct ipaddr *endpoint, char *name,
int status); int status);
extern void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp, extern void zsend_neighbor_notify(int cmd, struct interface *ifp,
struct ipaddr *ipaddr, int ndm_state, struct ipaddr *ipaddr, int ndm_state,
union sockunion *link_layer_ipv4); union sockunion *link_layer_ipv4);

4
zebra/zserv.c
View file

@ -637,7 +637,7 @@ static void zserv_client_free(struct zserv *client)
vrf_bitmap_free(&client->redist_default[afi]); vrf_bitmap_free(&client->redist_default[afi]);
vrf_bitmap_free(&client->ridinfo[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[afi][i]);
vrf_bitmap_init(&client->redist_default[afi]); vrf_bitmap_init(&client->redist_default[afi]);
vrf_bitmap_init(&client->ridinfo[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. */ /* Add this client to linked list. */

2
zebra/zserv.h
View file

@ -121,7 +121,7 @@ struct zserv {
vrf_bitmap_t ridinfo[AFI_MAX]; vrf_bitmap_t ridinfo[AFI_MAX];
/* Router-id information. */ /* Router-id information. */
vrf_bitmap_t nhrp_neighinfo[AFI_MAX]; vrf_bitmap_t neighinfo[AFI_MAX];
bool notify_owner; bool notify_owner;