document SIGUSR1 in manual page

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index a37574d14e8af4acb36450e3f8357b5c98f5c0fe..0badf48233bffc1b915278c12529d9e779009735 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,46 +21,44 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-

 #include "ah.h"
 
 #include "interface.h"
 #include "ah.h"
 
 #include "interface.h"

-#include "addrtoname.h"

 #include "extract.h"
 
 int
 #include "extract.h"
 
 int

-ah_print(register const u_char *bp)
+ah_print(netdissect_options *ndo, register const u_char *bp)

 {
        register const struct ah *ah;
        register const u_char *ep;
        int sumlen;
 {
        register const struct ah *ah;
        register const u_char *ep;
        int sumlen;

-       u_int32_t spi;
+       uint32_t spi;

 
        ah = (const struct ah *)bp;
 
        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 = EXTRACT_32BITS(&ah->ah_spi);
 
 
        sumlen = ah->ah_len << 2;
        spi = EXTRACT_32BITS(&ah->ah_spi);
 

-       printf("AH(spi=0x%08x", spi);
-       if (vflag)
-               printf(",sumlen=%d", sumlen);
-       printf(",seq=0x%x", EXTRACT_32BITS(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)
        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:
 
        return sizeof(struct ah) + sumlen;
  trunc:

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

        return -1;
 }
        return -1;
 }