diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-10 12:55:06 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-11 09:29:33 +0200 |
commit | 104304864887f0e3765bb28333dc7b9bd991aa4f (patch) | |
tree | c1472d363822507fba1cebca8fb18f611accd51b /freebsd/contrib/tcpdump/print-mpls.c | |
parent | Update CONTRIBUTING.md (diff) | |
download | rtems-libbsd-104304864887f0e3765bb28333dc7b9bd991aa4f.tar.bz2 |
tcpdump: Update to FreeBSD head 2017-04-04
Update tcpdump from Git mirror commit
99a648a912e81e29d9c4c159cbbe263462f2d719 to
642b174daddbd0efd9bb5f242c43f4ab4db6869f.
Diffstat (limited to 'freebsd/contrib/tcpdump/print-mpls.c')
-rw-r--r-- | freebsd/contrib/tcpdump/print-mpls.c | 83 |
1 files changed, 42 insertions, 41 deletions
diff --git a/freebsd/contrib/tcpdump/print-mpls.c b/freebsd/contrib/tcpdump/print-mpls.c index 3a755f77..07fdbe54 100644 --- a/freebsd/contrib/tcpdump/print-mpls.c +++ b/freebsd/contrib/tcpdump/print-mpls.c @@ -1,5 +1,8 @@ #include <machine/rtems-bsd-user-space.h> - +#ifdef __rtems__ +#include <machine/rtems-bsd-program.h> +#include "rtems-bsd-tcpdump-namespace.h" +#endif /* __rtems__ */ /* * Copyright (C) 2001 WIDE Project. All rights reserved. * @@ -28,24 +31,16 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.14 2005-07-05 09:38:19 hannes Exp $ (LBL)"; -#endif +/* \summary: Multi-Protocol Label Switching (MPLS) printer */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <tcpdump-stdinc.h> +#include <netdissect-stdinc.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "addrtoname.h" -#include "interface.h" -#include "extract.h" /* must come after interface.h */ +#include "netdissect.h" +#include "extract.h" #include "mpls.h" static const char *mpls_labelname[] = { @@ -67,31 +62,36 @@ enum mpls_packet_type { * RFC3032: MPLS label stack encoding */ void -mpls_print(const u_char *bp, u_int length) +mpls_print(netdissect_options *ndo, const u_char *bp, u_int length) { const u_char *p; - u_int32_t label_entry; - u_int16_t label_stack_depth = 0; + uint32_t label_entry; + uint16_t label_stack_depth = 0; enum mpls_packet_type pt = PT_UNKNOWN; p = bp; - printf("MPLS"); + ND_PRINT((ndo, "MPLS")); do { - TCHECK2(*p, sizeof(label_entry)); + ND_TCHECK2(*p, sizeof(label_entry)); + if (length < sizeof(label_entry)) { + ND_PRINT((ndo, "[|MPLS], length %u", length)); + return; + } label_entry = EXTRACT_32BITS(p); - printf("%s(label %u", - (label_stack_depth && vflag) ? "\n\t" : " ", - MPLS_LABEL(label_entry)); + ND_PRINT((ndo, "%s(label %u", + (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ", + MPLS_LABEL(label_entry))); label_stack_depth++; - if (vflag && + if (ndo->ndo_vflag && MPLS_LABEL(label_entry) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0])) - printf(" (%s)", mpls_labelname[MPLS_LABEL(label_entry)]); - printf(", exp %u", MPLS_EXP(label_entry)); + ND_PRINT((ndo, " (%s)", mpls_labelname[MPLS_LABEL(label_entry)])); + ND_PRINT((ndo, ", exp %u", MPLS_EXP(label_entry))); if (MPLS_STACK(label_entry)) - printf(", [S]"); - printf(", ttl %u)", MPLS_TTL(label_entry)); + ND_PRINT((ndo, ", [S]")); + ND_PRINT((ndo, ", ttl %u)", MPLS_TTL(label_entry))); p += sizeof(label_entry); + length -= sizeof(label_entry); } while (!MPLS_STACK(label_entry)); /* @@ -134,6 +134,11 @@ mpls_print(const u_char *bp, u_int length) * Cisco sends control-plane traffic MPLS-encapsulated in * this fashion. */ + ND_TCHECK(*p); + if (length < 1) { + /* nothing to print */ + return; + } switch(*p) { case 0x45: @@ -149,7 +154,7 @@ mpls_print(const u_char *bp, u_int length) case 0x4f: pt = PT_IPV4; break; - + case 0x60: case 0x61: case 0x62: @@ -185,30 +190,23 @@ mpls_print(const u_char *bp, u_int length) * Print the payload. */ if (pt == PT_UNKNOWN) { - if (!suppress_default_print) - default_print(p, length - (p - bp)); + if (!ndo->ndo_suppress_default_print) + ND_DEFAULTPRINT(p, length); return; } - if (vflag) - printf("\n\t"); - else - printf(" "); + ND_PRINT((ndo, ndo->ndo_vflag ? "\n\t" : " ")); switch (pt) { case PT_IPV4: - ip_print(gndo, p, length - (p - bp)); + ip_print(ndo, p, length); break; case PT_IPV6: -#ifdef INET6 - ip6_print(gndo, p, length - (p - bp)); -#else - printf("IPv6, length: %u", length); -#endif + ip6_print(ndo, p, length); break; case PT_OSI: - isoclns_print(p, length - (p - bp), length - (p - bp)); + isoclns_print(ndo, p, length, length); break; default: @@ -217,7 +215,7 @@ mpls_print(const u_char *bp, u_int length) return; trunc: - printf("[|MPLS]"); + ND_PRINT((ndo, "[|MPLS]")); } @@ -227,3 +225,6 @@ trunc: * c-basic-offset: 8 * End: */ +#ifdef __rtems__ +#include "rtems-bsd-tcpdump-print-mpls-data.h" +#endif /* __rtems__ */ |