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

lib, nhrpd: Move neighbor reg/unreg to lib/zclient.c

Browse source 
This is needed to be generic.  Let's make it so.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-01-19 14:51:34 -05:00
parent 275edb5c16
commit a0d38a7ac6
7 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/zclient.c
View file

@ -4709,7 +4709,7 @@ static int zclient_neigh_ip_read_entry(struct stream *s, struct ipaddr *add)
int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in, int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
union sockunion *out, struct interface *ifp, union sockunion *out, struct interface *ifp,
int ndm_state) int ndm_state, int ip_len)
{ {
int ret = 0; int ret = 0;
@ -4722,6 +4722,7 @@ int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
sockunion_get_addrlen(out)); sockunion_get_addrlen(out));
} else } else
stream_putc(s, AF_UNSPEC); stream_putc(s, AF_UNSPEC);
stream_putl(s, ip_len);
stream_putl(s, ifp->ifindex); stream_putl(s, ifp->ifindex);
if (out) if (out)
stream_putl(s, ndm_state); stream_putl(s, ndm_state);
@ -4739,6 +4740,7 @@ int zclient_neigh_ip_decode(struct stream *s, struct zapi_neigh_ip *api)
return -1; return -1;
zclient_neigh_ip_read_entry(s, &api->ip_out); zclient_neigh_ip_read_entry(s, &api->ip_out);
STREAM_GETL(s, api->ip_len);
STREAM_GETL(s, api->index); STREAM_GETL(s, api->index);
STREAM_GETL(s, api->ndm_state); STREAM_GETL(s, api->ndm_state);
return 0; return 0;
@ -4885,3 +4887,23 @@ enum zclient_send_status zclient_opaque_drop_notify(struct zclient *zclient,
return zclient_send_message(zclient); return zclient_send_message(zclient);
} }
void zclient_register_neigh(struct zclient *zclient, vrf_id_t vrf_id, afi_t afi,
bool reg)
{
struct stream *s;
if (!zclient || zclient->sock < 0)
return;
s = zclient->obuf;
stream_reset(s);
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));
zclient_send_message(zclient);
}

6
lib/zclient.h
View file

@ -867,6 +867,7 @@ extern const struct zclient_options zclient_options_auxiliary;
struct zapi_neigh_ip { struct zapi_neigh_ip {
int cmd; int cmd;
int ip_len;
struct ipaddr ip_in; struct ipaddr ip_in;
struct ipaddr ip_out; struct ipaddr ip_out;
ifindex_t index; ifindex_t index;
@ -875,7 +876,7 @@ struct zapi_neigh_ip {
int zclient_neigh_ip_decode(struct stream *s, struct zapi_neigh_ip *api); int zclient_neigh_ip_decode(struct stream *s, struct zapi_neigh_ip *api);
int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in, int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
union sockunion *out, struct interface *ifp, union sockunion *out, struct interface *ifp,
int ndm_state); int ndm_state, int ip_len);
/* /*
* We reserve the top 4 bits for l2-NHG, everything else * We reserve the top 4 bits for l2-NHG, everything else
@ -1322,6 +1323,9 @@ enum zapi_opaque_registry {
*/ */
extern enum zclient_send_status zclient_send_hello(struct zclient *client); extern enum zclient_send_status zclient_send_hello(struct zclient *client);
extern void zclient_register_neigh(struct zclient *zclient, vrf_id_t vrf_id,
afi_t afi, bool reg);
extern enum zclient_send_status extern enum zclient_send_status
zclient_send_neigh_discovery_req(struct zclient *zclient, zclient_send_neigh_discovery_req(struct zclient *zclient,
const struct interface *ifp, const struct interface *ifp,

4
nhrpd/netlink_arp.c
View file

@ -154,6 +154,10 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
struct zapi_neigh_ip api = {}; struct zapi_neigh_ip api = {};
zclient_neigh_ip_decode(zclient->ibuf, &api); zclient_neigh_ip_decode(zclient->ibuf, &api);
if (api.ip_len != IPV4_MAX_BYTELEN && api.ip_len != 0)
return 0;
if (api.ip_in.ipa_type == AF_UNSPEC) if (api.ip_in.ipa_type == AF_UNSPEC)
return 0; return 0;
sockunion_family(&addr) = api.ip_in.ipa_type; sockunion_family(&addr) = api.ip_in.ipa_type;

36
nhrpd/nhrp_route.c
View file

@ -75,25 +75,6 @@ static void nhrp_route_update_zebra(const struct prefix *p,
} }
} }
static void nhrp_zebra_register_neigh(vrf_id_t vrf_id, afi_t afi, bool reg)
{
struct stream *s;
if (!zclient || zclient->sock < 0)
return;
s = zclient->obuf;
stream_reset(s);
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));
zclient_send_message(zclient);
}
void nhrp_route_update_nhrp(const struct prefix *p, struct interface *ifp) void nhrp_route_update_nhrp(const struct prefix *p, struct interface *ifp)
{ {
struct route_node *rn; struct route_node *rn;
@ -369,8 +350,8 @@ static void nhrp_zebra_connected(struct zclient *zclient)
ZEBRA_ROUTE_ALL, 0, VRF_DEFAULT); ZEBRA_ROUTE_ALL, 0, VRF_DEFAULT);
zebra_redistribute_send(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6, zebra_redistribute_send(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP6,
ZEBRA_ROUTE_ALL, 0, VRF_DEFAULT); ZEBRA_ROUTE_ALL, 0, VRF_DEFAULT);
nhrp_zebra_register_neigh(VRF_DEFAULT, AFI_IP, true); zclient_register_neigh(zclient, VRF_DEFAULT, AFI_IP, true);
nhrp_zebra_register_neigh(VRF_DEFAULT, AFI_IP6, true); zclient_register_neigh(zclient, VRF_DEFAULT, AFI_IP6, true);
} }
static zclient_handler *const nhrp_handlers[] = { static zclient_handler *const nhrp_handlers[] = {
@ -457,10 +438,11 @@ void nhrp_send_zebra_nbr(union sockunion *in,
return; return;
s = zclient->obuf; s = zclient->obuf;
stream_reset(s); stream_reset(s);
zclient_neigh_ip_encode(s, out ? ZEBRA_NEIGH_IP_ADD : zclient_neigh_ip_encode(s, out ? ZEBRA_NEIGH_IP_ADD : ZEBRA_NEIGH_IP_DEL,
ZEBRA_NEIGH_IP_DEL, in, out, in, out, ifp,
ifp, out ? ZEBRA_NEIGH_STATE_REACHABLE out ? ZEBRA_NEIGH_STATE_REACHABLE
: ZEBRA_NEIGH_STATE_FAILED); : ZEBRA_NEIGH_STATE_FAILED,
0);
stream_putw_at(s, 0, stream_get_endp(s)); stream_putw_at(s, 0, stream_get_endp(s));
zclient_send_message(zclient); zclient_send_message(zclient);
} }
@ -472,8 +454,8 @@ int nhrp_send_zebra_gre_request(struct interface *ifp)
void nhrp_zebra_terminate(void) void nhrp_zebra_terminate(void)
{ {
nhrp_zebra_register_neigh(VRF_DEFAULT, AFI_IP, false); zclient_register_neigh(zclient, VRF_DEFAULT, AFI_IP, false);
nhrp_zebra_register_neigh(VRF_DEFAULT, AFI_IP6, false); zclient_register_neigh(zclient, VRF_DEFAULT, AFI_IP6, false);
zclient_stop(zclient); zclient_stop(zclient);
zclient_free(zclient); zclient_free(zclient);

24
zebra/rt_netlink.c
View file

@ -4256,20 +4256,18 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
/* copy LLADDR information */ /* copy LLADDR information */
l2_len = RTA_PAYLOAD(tb[NDA_LLADDR]); l2_len = RTA_PAYLOAD(tb[NDA_LLADDR]);
} }
if (l2_len == IPV4_MAX_BYTELEN || l2_len == 0) {
union sockunion link_layer_ipv4;
if (l2_len) { union sockunion link_layer_ipv4;
sockunion_family(&link_layer_ipv4) = AF_INET;
memcpy((void *)sockunion_get_addr(&link_layer_ipv4), if (l2_len) {
RTA_DATA(tb[NDA_LLADDR]), l2_len); sockunion_family(&link_layer_ipv4) = AF_INET;
} else memcpy((void *)sockunion_get_addr(&link_layer_ipv4),
sockunion_family(&link_layer_ipv4) = AF_UNSPEC; RTA_DATA(tb[NDA_LLADDR]), l2_len);
zsend_neighbor_notify(cmd, ifp, &ip, } else
netlink_nbr_entry_state_to_zclient( sockunion_family(&link_layer_ipv4) = AF_UNSPEC;
ndm->ndm_state), zsend_neighbor_notify(cmd, ifp, &ip,
&link_layer_ipv4); netlink_nbr_entry_state_to_zclient(ndm->ndm_state),
} &link_layer_ipv4, l2_len);
if (h->nlmsg_type == RTM_GETNEIGH) if (h->nlmsg_type == RTM_GETNEIGH)
return 0; return 0;

7
zebra/zapi_msg.c
View file

@ -968,8 +968,9 @@ void zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx,
zserv_send_message(client, s); zserv_send_message(client, s);
} }
void zsend_neighbor_notify(int cmd, struct interface *ifp, struct ipaddr *ipaddr, void zsend_neighbor_notify(int cmd, struct interface *ifp,
int ndm_state, union sockunion *link_layer_ipv4) struct ipaddr *ipaddr, int ndm_state,
union sockunion *link_layer_ipv4, int ip_len)
{ {
struct stream *s; struct stream *s;
struct listnode *node, *nnode; struct listnode *node, *nnode;
@ -992,7 +993,7 @@ void zsend_neighbor_notify(int cmd, struct interface *ifp, struct ipaddr *ipaddr
s = stream_new(ZEBRA_MAX_PACKET_SIZ); s = stream_new(ZEBRA_MAX_PACKET_SIZ);
zclient_neigh_ip_encode(s, cmd, &ip, link_layer_ipv4, ifp, zclient_neigh_ip_encode(s, cmd, &ip, link_layer_ipv4, ifp,
ndm_state); ndm_state, ip_len);
stream_putw_at(s, 0, stream_get_endp(s)); stream_putw_at(s, 0, stream_get_endp(s));
zserv_send_message(client, s); zserv_send_message(client, s);
} }

2
zebra/zapi_msg.h
View file

@ -93,7 +93,7 @@ extern int zsend_sr_policy_notify_status(uint32_t color,
int status); int status);
extern void zsend_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, int ip_len);
extern int zsend_client_close_notify(struct zserv *client, extern int zsend_client_close_notify(struct zserv *client,
struct zserv *closed_client); struct zserv *closed_client);