diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-07 11:47:30 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-07 13:36:41 +0100 |
| commit | e2982e7f6f0b624a773ec5a58885ee80fab46d34 (patch) | |
| tree | 52c8e511ccaff8ef09dc3337b213273865522162 /print-frag6.c | |
| parent | 8ab5c3a4e75a3ce8da691cd6ca6a9945082827af (diff) | |
| download | tcpdump-e2982e7f6f0b624a773ec5a58885ee80fab46d34.tar.gz | |
Update ND_PRINT() as a variadic macro
Diffstat (limited to 'print-frag6.c')
| -rw-r--r-- | print-frag6.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/print-frag6.c b/print-frag6.c index cecef613..460f841f 100644 --- a/print-frag6.c +++ b/print-frag6.c @@ -44,16 +44,16 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2) ND_TCHECK_SIZE(dp); if (ndo->ndo_vflag) { - ND_PRINT((ndo, "frag (0x%08x:%d|%ld)", + ND_PRINT("frag (0x%08x:%d|%ld)", EXTRACT_BE_U_4(&dp->ip6f_ident), EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK, sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen) - - (long)(bp - bp2) - sizeof(struct ip6_frag))); + (long)(bp - bp2) - sizeof(struct ip6_frag)); } else { - ND_PRINT((ndo, "frag (%d|%ld)", + ND_PRINT("frag (%d|%ld)", EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK, sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen) - - (long)(bp - bp2) - sizeof(struct ip6_frag))); + (long)(bp - bp2) - sizeof(struct ip6_frag)); } /* it is meaningless to decode non-first fragment */ @@ -61,10 +61,10 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2) return -1; else { - ND_PRINT((ndo, " ")); + ND_PRINT(" "); return sizeof(struct ip6_frag); } trunc: - ND_PRINT((ndo, "[|frag]")); + ND_PRINT("[|frag]"); return -1; } |