diff options
| author | fenner <fenner@FreeBSD.org> | 2003-03-02 08:22:26 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2003-03-02 08:22:26 +0000 |
| commit | 5f76ebca43302f98858e83a6212d9c610e939bad (patch) | |
| tree | c244ceda18deb5fc8e576971e1e83b7b631f5219 /contrib/tcpdump/print-mpls.c | |
| parent | 24ede2d805a7ffac09999aafe7d4f285e45a6edd (diff) | |
| download | FreeBSD-src-5f76ebca43302f98858e83a6212d9c610e939bad.zip FreeBSD-src-5f76ebca43302f98858e83a6212d9c610e939bad.tar.gz | |
Import tcpdump 3.7.2 (fudging for multi-DLT support) from
http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz
Diffstat (limited to 'contrib/tcpdump/print-mpls.c')
| -rw-r--r-- | contrib/tcpdump/print-mpls.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/contrib/tcpdump/print-mpls.c b/contrib/tcpdump/print-mpls.c index eb03705..ed7defb 100644 --- a/contrib/tcpdump/print-mpls.c +++ b/contrib/tcpdump/print-mpls.c @@ -28,7 +28,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.2 2001/06/26 06:24:57 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.2.4.1 2002/05/07 18:36:28 fenner Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -83,23 +83,24 @@ mpls_print(const u_char *bp, u_int length) p = bp; printf("MPLS"); - TCHECK2(*p, sizeof(v)); - memcpy(&v, p, sizeof(v)); - v = (u_int32_t)ntohl(v); - printf(" ("); /*)*/ - printf("label 0x%x", MPLS_LABEL(v)); - if (vflag && - MPLS_LABEL(v) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0])) - printf("(%s)", mpls_labelname[MPLS_LABEL(v)]); - if (MPLS_EXP(v)) - printf(" exp 0x%x", MPLS_EXP(v)); - if (MPLS_STACK(v)) - printf("[S]"); - printf(" TTL %u", MPLS_TTL(v)); - /*(*/ - printf(")"); + do { + TCHECK2(*p, sizeof(v)); + v = EXTRACT_32BITS(p); + printf(" ("); /*)*/ + printf("label 0x%x", MPLS_LABEL(v)); + if (vflag && + MPLS_LABEL(v) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0])) + printf("(%s)", mpls_labelname[MPLS_LABEL(v)]); + if (MPLS_EXP(v)) + printf(" exp 0x%x", MPLS_EXP(v)); + if (MPLS_STACK(v)) + printf("[S]"); + printf(" TTL %u", MPLS_TTL(v)); + /*(*/ + printf(")"); - p += sizeof(v); + p += sizeof(v); + } while (!MPLS_STACK(v)); switch (MPLS_LABEL(v)) { case 0: /* IPv4 explicit NULL label */ |
