proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 14:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #703 from donaldsharp/nl_pid

Browse Source 
zebra: When calling netlink, set the nl_pid as appropriate
This commit is contained in:
David Lamparter 2017-06-13 10:08:43 +02:00 committed by GitHub
commit 5da670a08b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/if_netlink.c
View File

@ -495,6 +495,8 @@ netlink_address (int cmd, int family, struct interface *ifp,
req.n.nlmsg_len = NLMSG_LENGTH (sizeof (struct ifaddrmsg)); req.n.nlmsg_len = NLMSG_LENGTH (sizeof (struct ifaddrmsg));
req.n.nlmsg_flags = NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_REQUEST;
req.n.nlmsg_type = cmd; req.n.nlmsg_type = cmd;
req.n.nlmsg_pid = zns->netlink_cmd.snl.nl_pid;
req.ifa.ifa_family = family; req.ifa.ifa_family = family;
req.ifa.ifa_index = ifp->ifindex; req.ifa.ifa_index = ifp->ifindex;

8
zebra/rt_netlink.c
View File

@ -1166,6 +1166,8 @@ netlink_neigh_update (int cmd, int ifindex, uint32_t addr, char *lla, int llalen
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
req.n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST;
req.n.nlmsg_type = cmd; //RTM_NEWNEIGH or RTM_DELNEIGH req.n.nlmsg_type = cmd; //RTM_NEWNEIGH or RTM_DELNEIGH
req.n.nlmsg_pid = zns->netlink_cmd.snl.nl_pid;
req.ndm.ndm_family = AF_INET; req.ndm.ndm_family = AF_INET;
req.ndm.ndm_state = NUD_PERMANENT; req.ndm.ndm_state = NUD_PERMANENT;
req.ndm.ndm_ifindex = ifindex; req.ndm.ndm_ifindex = ifindex;
@ -1213,6 +1215,8 @@ netlink_route_multipath (int cmd, struct prefix *p, struct prefix *src_p,
if ((cmd == RTM_NEWROUTE) && update) if ((cmd == RTM_NEWROUTE) && update)
req.n.nlmsg_flags |= NLM_F_REPLACE; req.n.nlmsg_flags |= NLM_F_REPLACE;
req.n.nlmsg_type = cmd; req.n.nlmsg_type = cmd;
req.n.nlmsg_pid = zns->netlink_cmd.snl.nl_pid;
req.r.rtm_family = family; req.r.rtm_family = family;
req.r.rtm_dst_len = p->prefixlen; req.r.rtm_dst_len = p->prefixlen;
req.r.rtm_src_len = src_p ? src_p->prefixlen : 0; req.r.rtm_src_len = src_p ? src_p->prefixlen : 0;
@ -1494,6 +1498,8 @@ kernel_get_ipmr_sg_stats (void *in)
req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)); req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
req.n.nlmsg_flags = NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_REQUEST;
req.n.nlmsg_pid = zns->netlink_cmd.snl.nl_pid;
req.ndm.ndm_family = AF_INET; req.ndm.ndm_family = AF_INET;
req.n.nlmsg_type = RTM_GETROUTE; req.n.nlmsg_type = RTM_GETROUTE;
@ -1582,6 +1588,8 @@ netlink_mpls_multipath (int cmd, zebra_lsp_t *lsp)
req.n.nlmsg_len = NLMSG_LENGTH (sizeof (struct rtmsg)); req.n.nlmsg_len = NLMSG_LENGTH (sizeof (struct rtmsg));
req.n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST; req.n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST;
req.n.nlmsg_type = cmd; req.n.nlmsg_type = cmd;
req.n.nlmsg_pid = zns->netlink_cmd.snl.nl_pid;
req.r.rtm_family = AF_MPLS; req.r.rtm_family = AF_MPLS;
req.r.rtm_table = RT_TABLE_MAIN; req.r.rtm_table = RT_TABLE_MAIN;
req.r.rtm_dst_len = MPLS_LABEL_LEN_BITS; req.r.rtm_dst_len = MPLS_LABEL_LEN_BITS;