diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-03-12 12:44:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-12 12:44:42 -0400 |
| commit | 6ac9718a2af66a796bf953e4ab9e7dd48f57754e (patch) | |
| tree | faad9ea7e5c69abcb72b16e50b420d5515a79af7 /zebra/rt_netlink.c | |
| parent | 7650a1ef0386499736fe7efc48273a2b2dbdb495 (diff) | |
| parent | 81793ac145e5f8c0c18d677062dcc85405bebe33 (diff) | |
Merge pull request #3893 from mjstapp/dplane_pw_nexthops
zebra: include nexthop info when installing pseudowires
Diffstat (limited to 'zebra/rt_netlink.c')
| -rw-r--r-- | zebra/rt_netlink.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 2a297409fe..c56e2f316d 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -927,7 +927,7 @@ static void _netlink_route_nl_add_gateway_info(uint8_t route_family, uint8_t gw_family, struct nlmsghdr *nlmsg, size_t req_size, int bytelen, - struct nexthop *nexthop) + const struct nexthop *nexthop) { if (route_family == AF_MPLS) { struct gw_family_t gw_fam; @@ -954,7 +954,7 @@ static void _netlink_route_rta_add_gateway_info(uint8_t route_family, struct rtattr *rta, struct rtnexthop *rtnh, size_t req_size, int bytelen, - struct nexthop *nexthop) + const struct nexthop *nexthop) { if (route_family == AF_MPLS) { struct gw_family_t gw_fam; @@ -990,7 +990,7 @@ static void _netlink_route_rta_add_gateway_info(uint8_t route_family, * @param req_size: The size allocated for the message. */ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen, - struct nexthop *nexthop, + const struct nexthop *nexthop, struct nlmsghdr *nlmsg, struct rtmsg *rtmsg, size_t req_size, int cmd) @@ -1009,7 +1009,7 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen, label_buf[0] = '\0'; assert(nexthop); - for (struct nexthop *nh = nexthop; nh; nh = nh->rparent) { + for (const struct nexthop *nh = nexthop; nh; nh = nh->rparent) { char label_buf1[20]; nh_label = nh->nh_label; @@ -1175,11 +1175,11 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen, * the prefsrc should be stored. */ static void _netlink_route_build_multipath(const char *routedesc, int bytelen, - struct nexthop *nexthop, + const struct nexthop *nexthop, struct rtattr *rta, struct rtnexthop *rtnh, struct rtmsg *rtmsg, - union g_addr **src) + const union g_addr **src) { struct mpls_label_stack *nh_label; mpls_lse_t out_lse[MPLS_MAX_LABELS]; @@ -1200,7 +1200,7 @@ static void _netlink_route_build_multipath(const char *routedesc, int bytelen, label_buf[0] = '\0'; assert(nexthop); - for (struct nexthop *nh = nexthop; nh; nh = nh->rparent) { + for (const struct nexthop *nh = nexthop; nh; nh = nh->rparent) { char label_buf1[20]; nh_label = nh->nh_label; @@ -1342,7 +1342,7 @@ static void _netlink_route_build_multipath(const char *routedesc, int bytelen, } static inline void _netlink_mpls_build_singlepath(const char *routedesc, - zebra_nhlfe_t *nhlfe, + const zebra_nhlfe_t *nhlfe, struct nlmsghdr *nlmsg, struct rtmsg *rtmsg, size_t req_size, int cmd) @@ -1358,9 +1358,9 @@ static inline void _netlink_mpls_build_singlepath(const char *routedesc, static inline void -_netlink_mpls_build_multipath(const char *routedesc, zebra_nhlfe_t *nhlfe, +_netlink_mpls_build_multipath(const char *routedesc, const zebra_nhlfe_t *nhlfe, struct rtattr *rta, struct rtnexthop *rtnh, - struct rtmsg *rtmsg, union g_addr **src) + struct rtmsg *rtmsg, const union g_addr **src) { int bytelen; uint8_t family; @@ -1655,7 +1655,7 @@ static int netlink_route_multipath(int cmd, struct zebra_dplane_ctx *ctx) char buf[NL_PKT_BUF_SIZE]; struct rtattr *rta = (void *)buf; struct rtnexthop *rtnh; - union g_addr *src1 = NULL; + const union g_addr *src1 = NULL; rta->rta_type = RTA_MULTIPATH; rta->rta_len = RTA_LENGTH(0); @@ -2776,7 +2776,7 @@ int kernel_upd_neigh(struct interface *ifp, struct ipaddr *ip, int netlink_mpls_multipath(int cmd, struct zebra_dplane_ctx *ctx) { mpls_lse_t lse; - zebra_nhlfe_t *nhlfe; + const zebra_nhlfe_t *nhlfe; struct nexthop *nexthop = NULL; unsigned int nexthop_num; const char *routedesc; @@ -2879,7 +2879,7 @@ int netlink_mpls_multipath(int cmd, struct zebra_dplane_ctx *ctx) char buf[NL_PKT_BUF_SIZE]; struct rtattr *rta = (void *)buf; struct rtnexthop *rtnh; - union g_addr *src1 = NULL; + const union g_addr *src1 = NULL; rta->rta_type = RTA_MULTIPATH; rta->rta_len = RTA_LENGTH(0); |