proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-28 12:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3635 from opensourcerouting/rsock-debug-fix

Browse Source 
zebra: fix routing socket debug messages
This commit is contained in:
Russ White 2019-01-21 19:24:55 -05:00 committed by GitHub
commit 7592bf29dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 144 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
zebra/kernel_socket.c
View File

@ -236,6 +236,7 @@ size_t _rta_get(caddr_t sap, void *destp, size_t destlen, bool checkaf);
size_t rta_get(caddr_t sap, void *dest, size_t destlen);
size_t rta_getattr(caddr_t sap, void *destp, size_t destlen);
size_t rta_getsdlname(caddr_t sap, void *dest, short *destlen);
const char *rtatostr(unsigned int flags, char *buf, size_t buflen);
/* Supported address family check. */
static inline int af_check(int family)
@ -329,6 +330,85 @@ size_t rta_getsdlname(caddr_t sap, void *destp, short *destlen)
return tlen;
}
const char *rtatostr(unsigned int flags, char *buf, size_t buflen)
{
const char *flagstr, *bufstart;
int bit, wlen;
char ustr[32];
/* Hold the pointer to the buffer beginning. */
bufstart = buf;
for (bit = 1; bit; bit <<= 1) {
if ((flags & bit) == 0)
continue;
switch (bit) {
case RTA_DST:
flagstr = "DST";
break;
case RTA_GATEWAY:
flagstr = "GATEWAY";
break;
case RTA_NETMASK:
flagstr = "NETMASK";
break;
#ifdef RTA_GENMASK
case RTA_GENMASK:
flagstr = "GENMASK";
break;
#endif /* RTA_GENMASK */
case RTA_IFP:
flagstr = "IFP";
break;
case RTA_IFA:
flagstr = "IFA";
break;
#ifdef RTA_AUTHOR
case RTA_AUTHOR:
flagstr = "AUTHOR";
break;
#endif /* RTA_AUTHOR */
case RTA_BRD:
flagstr = "BRD";
break;
#ifdef RTA_SRC
case RTA_SRC:
flagstr = "SRC";
break;
#endif /* RTA_SRC */
#ifdef RTA_SRCMASK
case RTA_SRCMASK:
flagstr = "SRCMASK";
break;
#endif /* RTA_SRCMASK */
#ifdef RTA_LABEL
case RTA_LABEL:
flagstr = "LABEL";
break;
#endif /* RTA_LABEL */
default:
snprintf(ustr, sizeof(ustr), "0x%x", bit);
flagstr = ustr;
break;
}
wlen = snprintf(buf, buflen, "%s,", flagstr);
buf += wlen;
buflen -= wlen;
}
/* Check for empty buffer. */
if (bufstart != buf)
buf--;
/* Remove the last comma. */
*buf = 0;
return bufstart;
}
/* Dump routing table flag for debug purpose. */
static void rtm_flag_dump(int flag)
{
@ -443,6 +523,7 @@ int ifm_read(struct if_msghdr *ifm)
short ifnlen = 0;
int maskbit;
caddr_t cp;
char fbuf[64];
/* terminate ifname at head (for strnlen) and tail (for safety) */
ifname[IFNAMSIZ - 1] = '\0';
@ -488,8 +569,9 @@ int ifm_read(struct if_msghdr *ifm)
}
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: sdl ifname %s", __func__,
(ifnlen ? ifname : "(nil)"));
zlog_debug("%s: sdl ifname %s addrs {%s}", __func__,
(ifnlen ? ifname : "(nil)"),
rtatostr(ifm->ifm_addrs, fbuf, sizeof(fbuf)));
/*
* Look up on ifindex first, because ifindices are the primary handle
@ -687,6 +769,7 @@ static void ifam_read_mesg(struct ifa_msghdr *ifm, union sockunion *addr,
union sockunion dst;
union sockunion gateway;
int maskbit;
char fbuf[64];
pnt = (caddr_t)(ifm + 1);
end = ((caddr_t)ifm) + ifm->ifam_msglen;
@ -736,33 +819,35 @@ static void ifam_read_mesg(struct ifa_msghdr *ifm, union sockunion *addr,
}
if (IS_ZEBRA_DEBUG_KERNEL) {
int family = sockunion_family(addr);
switch (family) {
switch (sockunion_family(addr)) {
case AF_INET:
case AF_INET6: {
char buf[4][INET6_ADDRSTRLEN];
int masklen =
(sockunion_family(addr) == AF_INET)
? ip_masklen(mask->sin.sin_addr)
: ip6_masklen(mask->sin6.sin6_addr);
zlog_debug(
"%s: ifindex %d, ifname %s, ifam_addrs 0x%x, "
"%s: ifindex %d, ifname %s, ifam_addrs {%s}, "
"ifam_flags 0x%x, addr %s/%d broad %s dst %s "
"gateway %s",
__func__, ifm->ifam_index,
(ifnlen ? ifname : "(nil)"), ifm->ifam_addrs,
(ifnlen ? ifname : "(nil)"),
rtatostr(ifm->ifam_addrs, fbuf, sizeof(fbuf)),
ifm->ifam_flags,
inet_ntop(family, &addr->sin.sin_addr, buf[0],
sizeof(buf[0])),
ip_masklen(mask->sin.sin_addr),
inet_ntop(family, &brd->sin.sin_addr, buf[1],
sizeof(buf[1])),
inet_ntop(family, &dst.sin.sin_addr, buf[2],
sizeof(buf[2])),
inet_ntop(family, &gateway.sin.sin_addr, buf[3],
sizeof(buf[3])));
sockunion2str(addr, buf[0], sizeof(buf[0])),
masklen,
sockunion2str(brd, buf[1], sizeof(buf[1])),
sockunion2str(&dst, buf[2], sizeof(buf[2])),
sockunion2str(&gateway, buf[2],
sizeof(buf[2])));
} break;
default:
zlog_debug("%s: ifindex %d, ifname %s, ifam_addrs 0x%x",
zlog_debug("%s: ifindex %d, ifname %s, ifam_addrs {%s}",
__func__, ifm->ifam_index,
(ifnlen ? ifname : "(nil)"),
ifm->ifam_addrs);
rtatostr(ifm->ifam_addrs, fbuf,
sizeof(fbuf)));
break;
}
}
@ -950,6 +1035,7 @@ void rtm_read(struct rt_msghdr *rtm)
struct prefix p;
ifindex_t ifindex = 0;
afi_t afi;
char fbuf[64];
zebra_flags = 0;
@ -959,9 +1045,10 @@ void rtm_read(struct rt_msghdr *rtm)
if (!(flags & RTF_DONE))
return;
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: got rtm of type %d (%s)", __func__,
zlog_debug("%s: got rtm of type %d (%s) addrs {%s}", __func__,
rtm->rtm_type,
lookup_msg(rtm_type_str, rtm->rtm_type, NULL));
lookup_msg(rtm_type_str, rtm->rtm_type, NULL),
rtatostr(rtm->rtm_addrs, fbuf, sizeof(fbuf)));
#ifdef RTF_CLONED /*bsdi, netbsd 1.6*/
if (flags & RTF_CLONED)
@ -1207,12 +1294,14 @@ int rtm_write(int message, union sockunion *dest, union sockunion *mask,
/* For debug purpose. */
static void rtmsg_debug(struct rt_msghdr *rtm)
{
char fbuf[64];
zlog_debug("Kernel: Len: %d Type: %s", rtm->rtm_msglen,
lookup_msg(rtm_type_str, rtm->rtm_type, NULL));
rtm_flag_dump(rtm->rtm_flags);
zlog_debug("Kernel: message seq %d", rtm->rtm_seq);
zlog_debug("Kernel: pid %lld, rtm_addrs 0x%x", (long long)rtm->rtm_pid,
rtm->rtm_addrs);
zlog_debug("Kernel: pid %lld, rtm_addrs {%s}", (long long)rtm->rtm_pid,
rtatostr(rtm->rtm_addrs, fbuf, sizeof(fbuf)));
}
/* This is pretty gross, better suggestions welcome -- mhandler */

52
zebra/rt_socket.c
View File

@ -128,10 +128,11 @@ static int kernel_rtm(int cmd, const struct prefix *p,
ifindex_t ifindex = 0;
bool gate = false;
int error;
char gate_buf[INET6_BUFSIZ];
char prefix_buf[PREFIX_STRLEN];
enum blackhole_type bh_type = BLACKHOLE_UNSPEC;
if (IS_ZEBRA_DEBUG_RIB)
if (IS_ZEBRA_DEBUG_RIB || IS_ZEBRA_DEBUG_KERNEL)
prefix2str(p, prefix_buf, sizeof(prefix_buf));
/*
@ -185,7 +186,7 @@ static int kernel_rtm(int cmd, const struct prefix *p,
smplsp = NULL;
gate = false;
char gate_buf[INET_ADDRSTRLEN] = "NULL";
snprintf(gate_buf, sizeof(gate_buf), "NULL");
switch (nexthop->type) {
case NEXTHOP_TYPE_IPV4:
@ -266,13 +267,29 @@ static int kernel_rtm(int cmd, const struct prefix *p,
if (IS_ZEBRA_DEBUG_KERNEL) {
if (!gate) {
zlog_debug("%s: %s: attention! gate not found for re",
__func__, prefix_buf);
} else
inet_ntop(p->family == AFI_IP ? AF_INET
: AF_INET6,
&sin_gate.sin.sin_addr,
gate_buf, INET_ADDRSTRLEN);
zlog_debug(
"%s: %s: attention! gate not found for re",
__func__, prefix_buf);
} else {
switch (p->family) {
case AFI_IP:
inet_ntop(AF_INET,
&sin_gate.sin.sin_addr,
gate_buf, sizeof(gate_buf));
break;
case AFI_IP6:
inet_ntop(AF_INET6,
&sin_gate.sin6.sin6_addr,
gate_buf, sizeof(gate_buf));
break;
default:
snprintf(gate_buf, sizeof(gate_buf),
"(invalid-af)");
break;
}
}
}
switch (error) {
/* We only flag nexthops as being in FIB if
@ -301,12 +318,11 @@ static int kernel_rtm(int cmd, const struct prefix *p,
/* Note any unexpected status returns */
default:
flog_err(EC_LIB_SYSTEM_CALL,
"%s: %s: rtm_write() unexpectedly returned %d for command %s",
__func__,
prefix2str(p, prefix_buf,
sizeof(prefix_buf)),
error, lookup_msg(rtm_type_str, cmd, NULL));
flog_err(
EC_LIB_SYSTEM_CALL,
"%s: %s: rtm_write() unexpectedly returned %d for command %s",
__func__, prefix_buf, error,
lookup_msg(rtm_type_str, cmd, NULL));
break;
}
} /* for (ALL_NEXTHOPS(...))*/
@ -314,9 +330,9 @@ static int kernel_rtm(int cmd, const struct prefix *p,
/* If there was no useful nexthop, then complain. */
if (nexthop_num == 0) {
if (IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("%s: No useful nexthops were found in RIB prefix %s",
__func__, prefix2str(p, prefix_buf,
sizeof(prefix_buf)));
zlog_debug(
"%s: No useful nexthops were found in RIB prefix %s",
__func__, prefix_buf);
return 1;
}