More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-ah.c

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

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ah.c,v 1.6 2000-09-23 08:03:30 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #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 <net/route.h>
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+#include <tcpdump-stdinc.h>

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 

-/* there's no standard definition so we are on our own */
-struct ah {
-       u_int8_t        ah_nxt;         /* Next Header */
-       u_int8_t        ah_len;         /* Length of data, in 32bit */
-       u_int16_t       ah_reserve;     /* Reserved for future use */
-       u_int32_t       ah_spi;         /* Security parameter index */
-       /* variable size, 32bit bound*/ /* Authentication data */
-};
-
-struct newah {
-       u_int8_t        ah_nxt;         /* Next Header */
-       u_int8_t        ah_len;         /* Length of data + 1, in 32bit */
-       u_int16_t       ah_reserve;     /* Reserved for future use */
-       u_int32_t       ah_spi;         /* Security parameter index */
-       u_int32_t       ah_seq;         /* Sequence number field */
-       /* variable size, 32bit bound*/ /* Authentication data */
-};
+#include "ah.h"

 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 
 int
 
 int

-ah_print(register const u_char *bp, register const u_char *bp2)
+ah_print(register const u_char *bp)

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

-       ah = (struct ah *)bp;
-       ep = snapend;           /* 'ep' points to the end of avaible data. */
+       ah = (const struct ah *)bp;
+       ep = snapend;           /* 'ep' points to the end of available data. */

 
 

-       if ((u_char *)(ah + 1) >= ep - sizeof(struct ah))
-               goto trunc;
+       TCHECK(*ah);

 
        sumlen = ah->ah_len << 2;
 
        sumlen = ah->ah_len << 2;

-       spi = (u_int32_t)ntohl(ah->ah_spi);
+       spi = EXTRACT_32BITS(&ah->ah_spi);

 
 

-       printf("AH(spi=%u", spi);
+       printf("AH(spi=0x%08x", spi);

        if (vflag)
                printf(",sumlen=%d", sumlen);
        if (vflag)
                printf(",sumlen=%d", sumlen);

-       printf(",seq=0x%x", (u_int32_t)ntohl(*(u_int32_t *)(ah + 1)));
+       printf(",seq=0x%x", EXTRACT_32BITS(ah + 1));

        if (bp + sizeof(struct ah) + sumlen > ep)
                fputs("[truncated]", stdout);
        fputs("): ", stdout);
        if (bp + sizeof(struct ah) + sumlen > ep)
                fputs("[truncated]", stdout);
        fputs("): ", stdout);

-       
+

        return sizeof(struct ah) + sumlen;
  trunc:
        fputs("[|AH]", stdout);
        return sizeof(struct ah) + sumlen;
  trunc:
        fputs("[|AH]", stdout);

-       return 65535;
+       return -1;

 }
 }