Add program_name field in the netdissect_options structure

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 6450295b7cf092ffe7dc54cd0394f19806e4ac53..8d71e1b42527d457a95c447cb89932c786dc0ae7 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,55 +21,43 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.15 2001-09-17 21:57:54 fenner Exp $ (LBL)";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <stdio.h>
+#include <tcpdump-stdinc.h>
 
 #include "ah.h"
 
-#include "interface.h"
-#include "addrtoname.h"
+#include "netdissect.h"
+#include "extract.h"
 
 int
-ah_print(register const u_char *bp, register const u_char *bp2)
+ah_print(netdissect_options *ndo, register const u_char *bp)
 {
        register const struct ah *ah;
        register const u_char *ep;
        int sumlen;
-       u_int32_t spi;
+       uint32_t spi;
 
        ah = (const struct ah *)bp;
-       ep = snapend;           /* 'ep' points to the end of available data. */
+       ep = ndo->ndo_snapend;          /* 'ep' points to the end of available data. */
 
-       TCHECK(*ah);
+       ND_TCHECK(*ah);
 
        sumlen = ah->ah_len << 2;
-       spi = (u_int32_t)ntohl(ah->ah_spi);
+       spi = EXTRACT_32BITS(&ah->ah_spi);
 
-       printf("AH(spi=0x%08x", spi);
-       if (vflag)
-               printf(",sumlen=%d", sumlen);
-       printf(",seq=0x%x", (u_int32_t)ntohl(*(const u_int32_t *)(ah + 1)));
+       ND_PRINT((ndo, "AH(spi=0x%08x", spi));
+       if (ndo->ndo_vflag)
+               ND_PRINT((ndo, ",sumlen=%d", sumlen));
+       ND_PRINT((ndo, ",seq=0x%x", EXTRACT_32BITS(ah + 1)));
        if (bp + sizeof(struct ah) + sumlen > ep)
-               fputs("[truncated]", stdout);
-       fputs("): ", stdout);
-       
+               ND_PRINT((ndo, "[truncated]"));
+       ND_PRINT((ndo, "): "));
+
        return sizeof(struct ah) + sumlen;
  trunc:
-       fputs("[|AH]", stdout);
-       return 65535;
+       ND_PRINT((ndo, "[|AH]"));
+       return -1;
 }