proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 06:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9488 from pguibert6WIND/fix_nhrp_neigh_state

Browse Source 
Fix nhrp neigh state
This commit is contained in:
Russ White 2021-08-27 19:00:45 -04:00 committed by GitHub
commit 648c73647d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/zclient.c
View File

@ -4487,11 +4487,9 @@ static int zclient_neigh_ip_read_entry(struct stream *s, struct ipaddr *add)
return -1; return -1;
} }
int zclient_neigh_ip_encode(struct stream *s, int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
uint16_t cmd, union sockunion *out, struct interface *ifp,
union sockunion *in, int ndm_state)
union sockunion *out,
struct interface *ifp)
{ {
int ret = 0; int ret = 0;
@ -4506,7 +4504,7 @@ int zclient_neigh_ip_encode(struct stream *s,
stream_putc(s, AF_UNSPEC); stream_putc(s, AF_UNSPEC);
stream_putl(s, ifp->ifindex); stream_putl(s, ifp->ifindex);
if (out) if (out)
stream_putl(s, ZEBRA_NEIGH_STATE_REACHABLE); stream_putl(s, ndm_state);
else else
stream_putl(s, ZEBRA_NEIGH_STATE_FAILED); stream_putl(s, ZEBRA_NEIGH_STATE_FAILED);
return ret; return ret;

19
lib/zclient.h
View File

@ -856,9 +856,18 @@ extern struct zclient_options zclient_options_default;
* ip_in is the underlay IP, ip_out is the tunnel dest * ip_in is the underlay IP, ip_out is the tunnel dest
* index stands for the index of the interface * index stands for the index of the interface
* ndm state stands for the NDM value in netlink * ndm state stands for the NDM value in netlink
* (see linux/neighbour.h)
*/ */
#define ZEBRA_NEIGH_STATE_INCOMPLETE (0x01)
#define ZEBRA_NEIGH_STATE_REACHABLE (0x02) #define ZEBRA_NEIGH_STATE_REACHABLE (0x02)
#define ZEBRA_NEIGH_STATE_FAILED (0x20) #define ZEBRA_NEIGH_STATE_STALE (0x04)
#define ZEBRA_NEIGH_STATE_DELAY (0x08)
#define ZEBRA_NEIGH_STATE_PROBE (0x10)
#define ZEBRA_NEIGH_STATE_FAILED (0x20)
#define ZEBRA_NEIGH_STATE_NOARP (0x40)
#define ZEBRA_NEIGH_STATE_PERMANENT (0x80)
#define ZEBRA_NEIGH_STATE_NONE (0x00)
struct zapi_neigh_ip { struct zapi_neigh_ip {
int cmd; int cmd;
struct ipaddr ip_in; struct ipaddr ip_in;
@ -867,11 +876,9 @@ struct zapi_neigh_ip {
uint32_t ndm_state; uint32_t ndm_state;
}; };
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, int zclient_neigh_ip_encode(struct stream *s, uint16_t cmd, union sockunion *in,
uint16_t cmd, union sockunion *out, struct interface *ifp,
union sockunion *in, int ndm_state);
union sockunion *out,
struct interface *ifp);
/* /*
* We reserve the top 4 bits for l2-NHG, everything else * We reserve the top 4 bits for l2-NHG, everything else

3
nhrpd/nhrp_route.c
View File

@ -452,7 +452,8 @@ void nhrp_send_zebra_nbr(union sockunion *in,
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, in, out, ZEBRA_NEIGH_IP_DEL, in, out,
ifp); ifp, out ? ZEBRA_NEIGH_STATE_REACHABLE
: ZEBRA_NEIGH_STATE_FAILED);
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);
} }

15
zebra/rt_netlink.c
View File

@ -3658,6 +3658,15 @@ static void netlink_handle_5549(struct ndmsg *ndm, struct zebra_if *zif,
#define NUD_LOCAL_ACTIVE \ #define NUD_LOCAL_ACTIVE \
(NUD_PERMANENT | NUD_NOARP | NUD_REACHABLE) (NUD_PERMANENT | NUD_NOARP | NUD_REACHABLE)
static int netlink_nbr_entry_state_to_zclient(int nbr_state)
{
/* an exact match is done between
* - netlink neighbor state values: NDM_XXX (see in linux/neighbour.h)
* - zclient neighbor state values: ZEBRA_NEIGH_STATE_XXX
* (see in lib/zclient.h)
*/
return nbr_state;
}
static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id) static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
{ {
struct ndmsg *ndm; struct ndmsg *ndm;
@ -3747,8 +3756,10 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
&mac, l2_len); &mac, l2_len);
} else } else
sockunion_family(&link_layer_ipv4) = AF_UNSPEC; sockunion_family(&link_layer_ipv4) = AF_UNSPEC;
zsend_nhrp_neighbor_notify(cmd, ifp, &ip, ndm->ndm_state, zsend_nhrp_neighbor_notify(
&link_layer_ipv4); cmd, ifp, &ip,
netlink_nbr_entry_state_to_zclient(ndm->ndm_state),
&link_layer_ipv4);
} }
if (h->nlmsg_type == RTM_GETNEIGH) if (h->nlmsg_type == RTM_GETNEIGH)

3
zebra/zapi_msg.c
View File

@ -997,7 +997,8 @@ void zsend_nhrp_neighbor_notify(int cmd, struct interface *ifp,
continue; continue;
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);
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);
} }