diff options
| author | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-07 17:52:45 +0400 |
|---|---|---|
| committer | Denis Ovsienko <infrastation@yandex.ru> | 2014-03-07 19:51:31 +0400 |
| commit | 374aad6c0ea6d12ac4316ead82bb78fc3ff5e05d (patch) | |
| tree | b329894a9ce392f2baed0b03523ba39567028bb2 /print-frag6.c | |
| parent | 7eafeed0b70bd2176cc0c7b77ea693518bf030cb (diff) | |
| download | tcpdump-374aad6c0ea6d12ac4316ead82bb78fc3ff5e05d.tar.gz | |
NDOize 5 more decoders
Update Apple's IP over IEEE1394, Bluetooth, CALM/FAST, IPv6 fragments
and LAN emulation decoders. Remove some stray passages while at it.
Diffstat (limited to 'print-frag6.c')
| -rw-r--r-- | print-frag6.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/print-frag6.c b/print-frag6.c index 0cc99d50..b8c49fd9 100644 --- a/print-frag6.c +++ b/print-frag6.c @@ -27,15 +27,12 @@ #include <tcpdump-stdinc.h> -#include <stdio.h> - #include "ip6.h" - -#include "interface.h" +#include "netdissect.h" #include "extract.h" int -frag6_print(register const u_char *bp, register const u_char *bp2) +frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2) { register const struct ip6_frag *dp; register const struct ip6_hdr *ip6; @@ -43,34 +40,31 @@ frag6_print(register const u_char *bp, register const u_char *bp2) dp = (const struct ip6_frag *)bp; ip6 = (const struct ip6_hdr *)bp2; - TCHECK(dp->ip6f_offlg); + ND_TCHECK(dp->ip6f_offlg); - if (vflag) { - printf("frag (0x%08x:%d|%ld)", + if (ndo->ndo_vflag) { + ND_PRINT((ndo, "frag (0x%08x:%d|%ld)", EXTRACT_32BITS(&dp->ip6f_ident), EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK, sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) - - (long)(bp - bp2) - sizeof(struct ip6_frag)); + (long)(bp - bp2) - sizeof(struct ip6_frag))); } else { - printf("frag (%d|%ld)", + ND_PRINT((ndo, "frag (%d|%ld)", EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK, sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) - - (long)(bp - bp2) - sizeof(struct ip6_frag)); + (long)(bp - bp2) - sizeof(struct ip6_frag))); } -#if 1 /* it is meaningless to decode non-first fragment */ if ((EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0) return -1; else -#endif { - fputs(" ", stdout); + ND_PRINT((ndo, " ")); return sizeof(struct ip6_frag); } trunc: - fputs("[|frag]", stdout); + ND_PRINT((ndo, "[|frag]")); return -1; -#undef TCHECK } #endif /* INET6 */ |