Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index e125bd3ef9d2049c22e916e422b861165c0f7bd3..fe8f3cf774b47600ff1088cb28bebca81d7ddd71 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,29 +19,21 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.20 2005-04-20 22:33:06 guy Exp $";
-#endif
+/* \summary: IPv6 fragmentation header printer */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#ifdef INET6
-
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 

-#include <stdio.h>
+#include "netdissect.h"
+#include "extract.h"

 
 #include "ip6.h"
 
 
 #include "ip6.h"
 

-#include "interface.h"
-#include "addrtoname.h"
-#include "extract.h"
-

 int
 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;
 {
        register const struct ip6_frag *dp;
        register const struct ip6_hdr *ip6;


@@ -49,34 +41,30 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
 
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
 

-       TCHECK(dp->ip6f_offlg);
+       ND_TCHECK(*dp);

 
 

-       if (vflag) {
-               printf("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));
+       if (ndo->ndo_vflag) {
+               ND_PRINT((ndo, "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)));

        } else {
        } else {

-               printf("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));
+               ND_PRINT((ndo, "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)));

        }
 
        }
 

-#if 1

        /* it is meaningless to decode non-first fragment */
        /* 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
                return -1;
        else

-#endif

        {
        {

-               fputs(" ", stdout);
+               ND_PRINT((ndo, " "));

                return sizeof(struct ip6_frag);
        }
 trunc:
                return sizeof(struct ip6_frag);
        }
 trunc:

-       fputs("[|frag]", stdout);
+       ND_PRINT((ndo, "[|frag]"));

        return -1;
        return -1;

-#undef TCHECK

 }
 }

-#endif /* INET6 */