diff options
Diffstat (limited to 'zebra/kernel_socket.c')
| -rw-r--r-- | zebra/kernel_socket.c | 81 |
1 files changed, 61 insertions, 20 deletions
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index e2a1deb9ac..df8cdb3ab3 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -441,6 +441,12 @@ int ifm_read(struct if_msghdr *ifm) RTA_ADDR_GET(NULL, RTA_IFA, ifm->ifm_addrs, cp); RTA_ADDR_GET(NULL, RTA_AUTHOR, ifm->ifm_addrs, cp); RTA_ADDR_GET(NULL, RTA_BRD, ifm->ifm_addrs, cp); +#ifdef RTA_LABEL + RTA_ATTR_GET(NULL, RTA_LABEL, ifm->ifm_addrs, cp); +#endif +#ifdef RTA_SRC + RTA_ADDR_GET(NULL, RTA_SRC, ifm->ifm_addrs, cp); +#endif if (IS_ZEBRA_DEBUG_KERNEL) zlog_debug("%s: sdl ifname %s", __func__, @@ -661,6 +667,12 @@ static void ifam_read_mesg(struct ifa_msghdr *ifm, union sockunion *addr, RTA_ADDR_GET(addr, RTA_IFA, ifm->ifam_addrs, pnt); RTA_ADDR_GET(NULL, RTA_AUTHOR, ifm->ifam_addrs, pnt); RTA_ADDR_GET(brd, RTA_BRD, ifm->ifam_addrs, pnt); +#ifdef RTA_LABEL + RTA_ATTR_GET(NULL, RTA_LABEL, ifm->ifam_addrs, pnt); +#endif +#ifdef RTA_SRC + RTA_ADDR_GET(NULL, RTA_SRC, ifm->ifam_addrs, pnt); +#endif if (IS_ZEBRA_DEBUG_KERNEL) { int family = sockunion_family(addr); @@ -762,12 +774,10 @@ int ifam_read(struct ifa_msghdr *ifam) if (ifam->ifam_type == RTM_NEWADDR) connected_add_ipv6(ifp, flags, &addr.sin6.sin6_addr, ip6_masklen(mask.sin6.sin6_addr), - &brd.sin6.sin6_addr, (isalias ? ifname : NULL)); else connected_delete_ipv6(ifp, &addr.sin6.sin6_addr, - ip6_masklen(mask.sin6.sin6_addr), - &brd.sin6.sin6_addr); + ip6_masklen(mask.sin6.sin6_addr)); break; default: /* Unsupported family silently ignore... */ @@ -829,6 +839,17 @@ static int rtm_read_mesg(struct rt_msghdr *rtm, union sockunion *dest, RTA_ADDR_GET(NULL, RTA_IFA, rtm->rtm_addrs, pnt); RTA_ADDR_GET(NULL, RTA_AUTHOR, rtm->rtm_addrs, pnt); RTA_ADDR_GET(NULL, RTA_BRD, rtm->rtm_addrs, pnt); +#ifdef RTA_LABEL +#if 0 + union sockunion label; + memset(&label, 0, sizeof(label)); + RTA_ATTR_GET(&label, RTA_LABEL, rtm->rtm_addrs, pnt); +#endif + RTA_ATTR_GET(NULL, RTA_LABEL, rtm->rtm_addrs, pnt); +#endif +#ifdef RTA_SRC + RTA_ADDR_GET(NULL, RTA_SRC, rtm->rtm_addrs, pnt); +#endif /* If there is netmask information set it's family same as destination family*/ @@ -849,6 +870,7 @@ void rtm_read(struct rt_msghdr *rtm) union sockunion dest, mask, gate; char ifname[INTERFACE_NAMSIZ + 1]; short ifnlen = 0; + struct nexthop nh; zebra_flags = 0; @@ -886,11 +908,15 @@ void rtm_read(struct rt_msghdr *rtm) if (flags & RTF_STATIC) SET_FLAG(zebra_flags, ZEBRA_FLAG_STATIC); + memset(&nh, 0, sizeof(nh)); /* This is a reject or blackhole route */ - if (flags & RTF_REJECT) - SET_FLAG(zebra_flags, ZEBRA_FLAG_REJECT); - if (flags & RTF_BLACKHOLE) - SET_FLAG(zebra_flags, ZEBRA_FLAG_BLACKHOLE); + if (flags & RTF_REJECT) { + nh.type = NEXTHOP_TYPE_BLACKHOLE; + nh.bh_type = BLACKHOLE_REJECT; + } else if (flags & RTF_BLACKHOLE) { + nh.type = NEXTHOP_TYPE_BLACKHOLE; + nh.bh_type = BLACKHOLE_NULL; + } if (dest.sa.sa_family == AF_INET) { struct prefix p; @@ -1016,18 +1042,22 @@ void rtm_read(struct rt_msghdr *rtm) if (rtm->rtm_type == RTM_CHANGE) rib_delete(AFI_IP, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL, - NULL, 0, 0, 0); + NULL, 0, 0); + + if (!nh.type) { + nh.type = NEXTHOP_TYPE_IPV4; + nh.gate.ipv4 = gate.sin.sin_addr; + } - union g_addr ggate = {.ipv4 = gate.sin.sin_addr}; if (rtm->rtm_type == RTM_GET || rtm->rtm_type == RTM_ADD || rtm->rtm_type == RTM_CHANGE) rib_add(AFI_IP, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL, - &ggate, NULL, 0, 0, 0, 0, 0); + &nh, 0, 0, 0, 0); else rib_delete(AFI_IP, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL, - &ggate, 0, 0, 0); + &nh, 0, 0); } if (dest.sa.sa_family == AF_INET6) { /* One day we might have a debug section here like one in the @@ -1058,18 +1088,24 @@ void rtm_read(struct rt_msghdr *rtm) if (rtm->rtm_type == RTM_CHANGE) rib_delete(AFI_IP6, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL, - NULL, 0, 0, 0); + NULL, 0, 0); + + if (!nh.type) { + nh.type = ifindex ? NEXTHOP_TYPE_IPV6_IFINDEX + : NEXTHOP_TYPE_IPV6; + nh.gate.ipv6 = gate.sin6.sin6_addr; + nh.ifindex = ifindex; + } - union g_addr ggate = {.ipv6 = gate.sin6.sin6_addr}; if (rtm->rtm_type == RTM_GET || rtm->rtm_type == RTM_ADD || rtm->rtm_type == RTM_CHANGE) rib_add(AFI_IP6, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL, - &ggate, NULL, ifindex, 0, 0, 0, 0); + &nh, 0, 0, 0, 0); else rib_delete(AFI_IP6, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL, - &ggate, ifindex, 0, 0); + &nh, 0, 0); } } @@ -1079,7 +1115,7 @@ void rtm_read(struct rt_msghdr *rtm) */ int rtm_write(int message, union sockunion *dest, union sockunion *mask, union sockunion *gate, union sockunion *mpls, unsigned int index, - int zebra_flags, int metric) + enum blackhole_type bh_type, int metric) { int ret; caddr_t pnt; @@ -1169,11 +1205,16 @@ int rtm_write(int message, union sockunion *dest, union sockunion *mask, /* Tagging route with flags */ msg.rtm.rtm_flags |= (RTF_PROTO1); - /* Additional flags. */ - if (zebra_flags & ZEBRA_FLAG_BLACKHOLE) - msg.rtm.rtm_flags |= RTF_BLACKHOLE; - if (zebra_flags & ZEBRA_FLAG_REJECT) + switch (bh_type) { + case BLACKHOLE_UNSPEC: + break; + case BLACKHOLE_REJECT: msg.rtm.rtm_flags |= RTF_REJECT; + break; + default: + msg.rtm.rtm_flags |= RTF_BLACKHOLE; + break; + } #define SOCKADDRSET(X, R) \ |