Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zebra: cleanup netlink_ipneigh_change #9827

Closed
wants to merge 1 commit into from
Closed

zebra: cleanup netlink_ipneigh_change #9827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 44 additions & 50 deletions zebra/rt_netlink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3667,6 +3667,21 @@ static int netlink_nbr_entry_state_to_zclient(int nbr_state)
*/
return nbr_state;
}

static int netlink_nbr_cmd_to_zclient(int nlmsg_type)
{
switch (nlmsg_type) {
case RTM_NEWNEIGH:
return ZEBRA_NHRP_NEIGH_ADDED;
case RTM_DELNEIGH:
return ZEBRA_NHRP_NEIGH_REMOVED;
case RTM_GETNEIGH:
return ZEBRA_NHRP_NEIGH_GET;
}

return -1;
}

static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
{
struct ndmsg *ndm;
Expand All @@ -3684,7 +3699,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
uint32_t ext_flags = 0;
bool dp_static = false;
int l2_len = 0;
int cmd;
void *l2_data;

ndm = NLMSG_DATA(h);

Expand Down Expand Up @@ -3724,44 +3739,6 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
if (h->nlmsg_type == RTM_NEWNEIGH && !(ndm->ndm_state & NUD_VALID))
netlink_handle_5549(ndm, zif, ifp, &ip, true);

/* we send link layer information to client:
* - nlmsg_type = RTM_DELNEIGH|NEWNEIGH|GETNEIGH
* - struct ipaddr ( for DEL and GET)
* - struct ethaddr mac; (for NEW)
*/
if (h->nlmsg_type == RTM_NEWNEIGH)
cmd = ZEBRA_NHRP_NEIGH_ADDED;
else if (h->nlmsg_type == RTM_GETNEIGH)
cmd = ZEBRA_NHRP_NEIGH_GET;
else if (h->nlmsg_type == RTM_DELNEIGH)
cmd = ZEBRA_NHRP_NEIGH_REMOVED;
else {
zlog_debug("%s(): unknown nlmsg type %u", __func__,
h->nlmsg_type);
return 0;
}
if (tb[NDA_LLADDR]) {
/* copy LLADDR information */
l2_len = RTA_PAYLOAD(tb[NDA_LLADDR]);
}
if (l2_len == IPV4_MAX_BYTELEN || l2_len == 0) {
union sockunion link_layer_ipv4;

if (l2_len) {
sockunion_family(&link_layer_ipv4) = AF_INET;
memcpy((void *)sockunion_get_addr(&link_layer_ipv4),
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);
}

if (h->nlmsg_type == RTM_GETNEIGH)
return 0;

/* The neighbor is present on an SVI. From this, we locate the
* underlying
* bridge because we're only interested in neighbors on a VxLAN bridge.
Expand All @@ -3773,24 +3750,40 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
* inteface
* itself
*/
if (IS_ZEBRA_IF_VLAN(ifp)) {
if (IS_ZEBRA_IF_VLAN(ifp))
link_if = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id),
zif->link_ifindex);
if (!link_if)
return 0;
} else if (IS_ZEBRA_IF_BRIDGE(ifp))
else if (IS_ZEBRA_IF_BRIDGE(ifp))
link_if = ifp;
else {
else
link_if = NULL;

if (tb[NDA_LLADDR]) {
l2_len = RTA_PAYLOAD(tb[NDA_LLADDR]);
l2_data = RTA_DATA(tb[NDA_LLADDR]);
} else {
l2_len = 0;
l2_data = NULL;
}

zsend_nhrp_neighbor_notify(
netlink_nbr_cmd_to_zclient(h->nlmsg_type), ifp, &ip,
netlink_nbr_entry_state_to_zclient(ndm->ndm_state), l2_data,
l2_len);

if (h->nlmsg_type == RTM_GETNEIGH)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is not 1:1 functionality with the previous one. Suggestion: make this if into a switch and reject anything other than RTM_NEWNEIGH, RTM_DELNEIGH.

Here is what the previous remove code did (right above these lines addition):

	if (h->nlmsg_type == RTM_NEWNEIGH)
		cmd = ZEBRA_NHRP_NEIGH_ADDED;
	else if (h->nlmsg_type == RTM_GETNEIGH)
		cmd = ZEBRA_NHRP_NEIGH_GET;
	else if (h->nlmsg_type == RTM_DELNEIGH)
		cmd = ZEBRA_NHRP_NEIGH_REMOVED;
	else {
		zlog_debug("%s(): unknown nlmsg type %u", __func__,
			   h->nlmsg_type);
		return 0;
	}

return 0;

if (!link_if) {
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
" Neighbor Entry received is not on a VLAN or a BRIDGE, ignoring");
return 0;
}

memset(&mac, 0, sizeof(struct ethaddr));
if (h->nlmsg_type == RTM_NEWNEIGH) {
if (tb[NDA_LLADDR]) {
if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETH_ALEN) {
if (l2_len) {
if (l2_len != ETH_ALEN) {
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"%s family %s IF %s(%u) vrf %s(%u) - LLADDR is not MAC, len %lu",
Expand All @@ -3801,13 +3794,14 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
ifp->name, ndm->ndm_ifindex,
ifp->vrf->name,
ifp->vrf->vrf_id,
(unsigned long)RTA_PAYLOAD(
tb[NDA_LLADDR]));
(unsigned long)l2_len);
return 0;
}

mac_present = 1;
memcpy(&mac, RTA_DATA(tb[NDA_LLADDR]), ETH_ALEN);
memcpy(&mac, l2_data, l2_len);
} else {
memset(&mac, 0, sizeof(struct ethaddr));
}

is_ext = !!(ndm->ndm_flags & NTF_EXT_LEARNED);
Expand Down
18 changes: 16 additions & 2 deletions zebra/zapi_msg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,13 +967,27 @@ void zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx,

void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
struct ipaddr *ipaddr, int ndm_state,
union sockunion *link_layer_ipv4)
void *l2_data, int l2_len)
{
struct stream *s;
struct listnode *node, *nnode;
struct zserv *client;
afi_t afi;
union sockunion ip;
union sockunion link_layer_ipv4;

if (cmd < 0)
return;

if (l2_len == 0) {
sockunion_family(&link_layer_ipv4) = AF_UNSPEC;
} else if (l2_len == IPV4_MAX_BYTELEN) {
sockunion_family(&link_layer_ipv4) = AF_INET;
memcpy((void *)sockunion_get_addr(&link_layer_ipv4), l2_data,
l2_len);
} else {
return;
}

if (IS_ZEBRA_DEBUG_PACKET)
zlog_debug("%s: Notifying Neighbor entry (%u)", __func__, cmd);
Expand All @@ -989,7 +1003,7 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
continue;

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);
stream_putw_at(s, 0, stream_get_endp(s));
zserv_send_message(client, s);
Expand Down
2 changes: 1 addition & 1 deletion zebra/zapi_msg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ extern int zsend_sr_policy_notify_status(uint32_t color,
int status);
extern void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
struct ipaddr *ipaddr, int ndm_state,
union sockunion *link_layer_ipv4);
void *l2_data, int l2_len);

extern int zsend_client_close_notify(struct zserv *client,
struct zserv *closed_client);
Expand Down