Use nd_ types, add EXTRACT_ calls, use %u for unsigned values.

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index fbcabc5b00cdc82a97ca76e7f15ca94823f40561..f1728f0c530f51693a62f13baf160d2e5ae5e82c 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -33,10 +33,10 @@
 #include "ip6.h"
 
 int
-frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
+frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
 {
-       register const struct ip6_frag *dp;
-       register const struct ip6_hdr *ip6;
+       const struct ip6_frag *dp;
+       const struct ip6_hdr *ip6;
 
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
@@ -45,19 +45,19 @@ frag6_print(netdissect_options *ndo, register const u_char *bp, register const u
 
        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)));
+                      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)));
        } else {
                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)));
+                      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)));
        }
 
        /* it is meaningless to decode non-first fragment */
-       if ((EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+       if ((EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
                return -1;
        else
        {