From 88ed83794a9e0703903e1cb2aa9114fff11083ab Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Mon, 28 Aug 2017 05:06:56 +0200 Subject: [PATCH] zebra: kernel_socket: read extra attributes This is just to silence the "didn't read all data" warning. Signed-off-by: David Lamparter --- lib/sockunion.h | 1 + zebra/kernel_socket.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/lib/sockunion.h b/lib/sockunion.h index 7b1c7ba9c5..67a7a46272 100644 --- 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 c6fb34562f..46ef0e6110 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); @@ -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*/ -- 2.39.5