From 323418dd1c7825d38e8b1f83d5a8c23766a26de2 Mon Sep 17 00:00:00 2001 From: Nathan Moos Date: Fri, 15 Jan 2021 16:45:14 -0800 Subject: vppinfra: ensure _GNU_SOURCE is present Type: fix When building with musl, _GNU_SOURCE is required to be defined in more places. This patch defines it in those required places. Additionally, this patch changes the udphdr field names to the standard names. Change-Id: I0fec54214ccc8458289176488afb4218761e9d51 Signed-off-by: Nathan Moos --- src/vppinfra/unix-formats.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/vppinfra/unix-formats.c') diff --git a/src/vppinfra/unix-formats.c b/src/vppinfra/unix-formats.c index fd0539c7d2b..678700e6129 100644 --- a/src/vppinfra/unix-formats.c +++ b/src/vppinfra/unix-formats.c @@ -50,7 +50,6 @@ #define _GNU_SOURCE /* to get REG_* in ucontext.h */ #include -#undef _GNU_SOURCE #undef __USE_GNU #include @@ -317,11 +316,13 @@ u8 * format_udp4_packet (u8 * s, va_list * args) struct iphdr * ip = (void *) p; struct udphdr * udp = (void *) (ip + 1); - s = format (s, "udp %U:%U -> %U:%U", - format_network_address, AF_INET, &ip->saddr, - format_network_port, IPPROTO_UDP, ntohs (udp->source), - format_network_address, AF_INET, &ip->daddr, - format_network_port, IPPROTO_UDP, ntohs (udp->dest)); + u16 source = udp->uh_sport; + u16 dest = udp->uh_dport; + + s = format (s, "udp %U:%U -> %U:%U", format_network_address, AF_INET, + &ip->saddr, format_network_port, IPPROTO_UDP, ntohs (source), + format_network_address, AF_INET, &ip->daddr, format_network_port, + IPPROTO_UDP, ntohs (dest)); return s; } -- cgit 1.2.3-korg