zebra: kernel_socket: read extra attributes

This is just to silence the "didn't read all data" warning.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/lib/sockunion.h b/lib/sockunion.h
index 7b1c7ba9c56414aff8b11dd735dd30bc7eef90a3..67a7a46272d3370aef68ac6b78fcdbf2f33cf62e 100644 (file)
--- a/lib/sockunion.h
+++ b/lib/sockunion.h
@@ -34,6 +34,7 @@ union sockunion {
        struct sockaddr_in6 sin6;
 #ifdef __OpenBSD__
        struct sockaddr_mpls smpls;
+       struct sockaddr_rtlabel rtlabel;
 #endif
 };
 

diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index c6fb34562f52287606246d5562f79450533a3e9f..46ef0e6110dce6a00fe76711d061e0cd7fd4f03a 100644 (file)
--- 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);
@@ -827,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*/