Merge pull request #7384 from opensourcerouting/nb-dyn-modules

[mirror_frr.git] / zebra / if_netlink.c

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 81f77d4f9bb6256fe7f0e428bc1ca927fb2ad5b7..90a08bbd6c4d897154f4945705be465739a57cc3 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -798,8 +798,10 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        if (tb[IFLA_LINK])
                link_ifindex = *(ifindex_t *)RTA_DATA(tb[IFLA_LINK]);
 
-       if (tb[IFLA_LINK_NETNSID])
+       if (tb[IFLA_LINK_NETNSID]) {
                link_nsid = *(ns_id_t *)RTA_DATA(tb[IFLA_LINK_NETNSID]);
+               link_nsid = ns_id_get_absolute(ns_id, link_nsid);
+       }
 
        /* Add interface.
         * We add by index first because in some cases such as the master
@@ -848,7 +850,7 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        netlink_interface_update_l2info(ifp, linkinfo[IFLA_INFO_DATA],
                                        1, link_nsid);
        if (IS_ZEBRA_IF_BRIDGE_SLAVE(ifp))
-               zebra_l2if_update_bridge_slave(ifp, bridge_ifindex);
+               zebra_l2if_update_bridge_slave(ifp, bridge_ifindex, ns_id);
        else if (IS_ZEBRA_IF_BOND_SLAVE(ifp))
                zebra_l2if_update_bond_slave(ifp, bond_ifindex);
 
@@ -987,7 +989,8 @@ int kernel_interface_set_master(struct interface *master,
 }
 
 /* Interface address modification. */
-static int netlink_address_ctx(const struct zebra_dplane_ctx *ctx)
+static ssize_t netlink_address_msg_encoder(struct zebra_dplane_ctx *ctx,
+                                          void *buf, size_t buflen)
 {
        int bytelen;
        const struct prefix *p;
@@ -997,64 +1000,72 @@ static int netlink_address_ctx(const struct zebra_dplane_ctx *ctx)
        struct {
                struct nlmsghdr n;
                struct ifaddrmsg ifa;
-               char buf[NL_PKT_BUF_SIZE];
-       } req;
+               char buf[0];
+       } *req = buf;
+
+       if (buflen < sizeof(*req))
+               return 0;
 
        p = dplane_ctx_get_intf_addr(ctx);
-       memset(&req, 0, sizeof(req) - NL_PKT_BUF_SIZE);
+       memset(req, 0, sizeof(*req));
 
        bytelen = (p->family == AF_INET ? 4 : 16);
 
-       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
-       req.n.nlmsg_flags = NLM_F_REQUEST;
+       req->n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
+       req->n.nlmsg_flags = NLM_F_REQUEST;
 
        if (dplane_ctx_get_op(ctx) == DPLANE_OP_ADDR_INSTALL)
                cmd = RTM_NEWADDR;
        else
                cmd = RTM_DELADDR;
 
-       req.n.nlmsg_type = cmd;
-       req.ifa.ifa_family = p->family;
+       req->n.nlmsg_type = cmd;
+       req->ifa.ifa_family = p->family;
 
-       req.ifa.ifa_index = dplane_ctx_get_ifindex(ctx);
+       req->ifa.ifa_index = dplane_ctx_get_ifindex(ctx);
 
-       nl_attr_put(&req.n, sizeof(req), IFA_LOCAL, &p->u.prefix, bytelen);
+       if (!nl_attr_put(&req->n, buflen, IFA_LOCAL, &p->u.prefix, bytelen))
+               return 0;
 
        if (p->family == AF_INET) {
                if (dplane_ctx_intf_is_connected(ctx)) {
                        p = dplane_ctx_get_intf_dest(ctx);
-                       nl_attr_put(&req.n, sizeof(req), IFA_ADDRESS,
-                                   &p->u.prefix, bytelen);
+                       if (!nl_attr_put(&req->n, buflen, IFA_ADDRESS,
+                                        &p->u.prefix, bytelen))
+                               return 0;
                } else if (cmd == RTM_NEWADDR) {
                        struct in_addr broad = {
                                .s_addr = ipv4_broadcast_addr(p->u.prefix4.s_addr,
                                                        p->prefixlen)
                        };
-                       nl_attr_put(&req.n, sizeof(req), IFA_BROADCAST, &broad,
-                                   bytelen);
+                       if (!nl_attr_put(&req->n, buflen, IFA_BROADCAST, &broad,
+                                        bytelen))
+                               return 0;
                }
        }
 
        /* p is now either address or destination/bcast addr */
-       req.ifa.ifa_prefixlen = p->prefixlen;
+       req->ifa.ifa_prefixlen = p->prefixlen;
 
        if (dplane_ctx_intf_is_secondary(ctx))
-               SET_FLAG(req.ifa.ifa_flags, IFA_F_SECONDARY);
+               SET_FLAG(req->ifa.ifa_flags, IFA_F_SECONDARY);
 
        if (dplane_ctx_intf_has_label(ctx)) {
                label = dplane_ctx_get_intf_label(ctx);
-               nl_attr_put(&req.n, sizeof(req), IFA_LABEL, label,
-                           strlen(label) + 1);
+               if (!nl_attr_put(&req->n, buflen, IFA_LABEL, label,
+                                strlen(label) + 1))
+                       return 0;
        }
 
-       return netlink_talk_info(netlink_talk_filter, &req.n,
-                                dplane_ctx_get_ns(ctx), 0);
+       return NLMSG_ALIGN(req->n.nlmsg_len);
 }
 
-enum zebra_dplane_result kernel_address_update_ctx(struct zebra_dplane_ctx *ctx)
+enum netlink_msg_status
+netlink_put_address_update_msg(struct nl_batch *bth,
+                              struct zebra_dplane_ctx *ctx)
 {
-       return (netlink_address_ctx(ctx) == 0 ?
-               ZEBRA_DPLANE_REQUEST_SUCCESS : ZEBRA_DPLANE_REQUEST_FAILURE);
+       return netlink_batch_add_msg(bth, ctx, netlink_address_msg_encoder,
+                                    false);
 }
 
 int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
@@ -1340,9 +1351,10 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        if (tb[IFLA_LINK])
                link_ifindex = *(ifindex_t *)RTA_DATA(tb[IFLA_LINK]);
 
-       if (tb[IFLA_LINK_NETNSID])
+       if (tb[IFLA_LINK_NETNSID]) {
                link_nsid = *(ns_id_t *)RTA_DATA(tb[IFLA_LINK_NETNSID]);
-
+               link_nsid = ns_id_get_absolute(ns_id, link_nsid);
+       }
        if (tb[IFLA_IFALIAS]) {
                desc = (char *)RTA_DATA(tb[IFLA_IFALIAS]);
        }
@@ -1430,7 +1442,8 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
                                1, link_nsid);
                        if (IS_ZEBRA_IF_BRIDGE_SLAVE(ifp))
                                zebra_l2if_update_bridge_slave(ifp,
-                                                              bridge_ifindex);
+                                                              bridge_ifindex,
+                                                              ns_id);
                        else if (IS_ZEBRA_IF_BOND_SLAVE(ifp))
                                zebra_l2if_update_bond_slave(ifp, bond_ifindex);
                } else if (ifp->vrf_id != vrf_id) {
@@ -1531,7 +1544,8 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
                                0, link_nsid);
                        if (IS_ZEBRA_IF_BRIDGE_SLAVE(ifp) || was_bridge_slave)
                                zebra_l2if_update_bridge_slave(ifp,
-                                                              bridge_ifindex);
+                                                              bridge_ifindex,
+                                                              ns_id);
                        else if (IS_ZEBRA_IF_BOND_SLAVE(ifp) || was_bond_slave)
                                zebra_l2if_update_bond_slave(ifp, bond_ifindex);
                }