CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-ah.c

diff --git a/print-ah.c b/print-ah.c
index 792003046309b036a632a0a65878d42ab4c1687c..3b3a792133c238ad98993308c369b77c44c8701f 100644 (file)
--- a/print-ah.c
+++ b/print-ah.c
@@ -21,82 +21,53 @@
  * 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
+/* \summary: IPSEC Authentication Header printer */

 
 

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

 
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "netdissect-stdinc.h"

 
 

-#include <net/route.h>
-#include <net/if.h>
+#include "netdissect.h"
+#include "extract.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 <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 "interface.h"
-#include "addrtoname.h"
+#include "ah.h"

 
 int
 
 int

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

 {
 {

-       register const struct ah *ah;
-       register const u_char *ep;
-       int sumlen;
-       u_int32_t spi;
+       const struct ah *ah;
+       uint8_t ah_len;
+       u_int ah_hdr_len;
+       uint16_t reserved;
+       const u_char *p;

 
 

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

 
 

-       if ((u_char *)(ah + 1) >= ep - sizeof(struct ah))
-               goto trunc;
+       nd_print_protocol_caps(ndo);
+/*
+ * RFC4302
+ *
+ * 2.2.  Payload Length
+ *
+ *    This 8-bit field specifies the length of AH in 32-bit words (4-byte
+ *    units), minus "2".
+ */
+       ah_len = GET_U_1(ah->ah_len);
+       ah_hdr_len = (ah_len + 2) * 4;

 
 

-       sumlen = ah->ah_len << 2;
-       spi = (u_int32_t)ntohl(ah->ah_spi);
+       ND_PRINT("(");
+       if (ndo->ndo_vflag)
+               ND_PRINT("length=%u(%u-bytes),", ah_len, ah_hdr_len);
+       reserved = GET_BE_U_2(ah->ah_reserved);
+       if (reserved)
+               ND_PRINT("reserved=0x%x[MustBeZero],", reserved);
+       ND_PRINT("spi=0x%08x,", GET_BE_U_4(ah->ah_spi));
+       ND_PRINT("seq=0x%x,", GET_BE_U_4(ah->ah_seq));
+       ND_PRINT("icv=0x");
+       for (p = (const u_char *)(ah + 1); p < bp + ah_hdr_len; p++)
+               ND_PRINT("%02x", GET_U_1(p));
+       ND_PRINT("): ");

 
 

-       printf("AH(spi=%u", spi);
-       if (vflag)
-               printf(",sumlen=%d", sumlen);
-       printf(",seq=0x%x", (u_int32_t)ntohl(*(u_int32_t *)(ah + 1)));
-       if (bp + sizeof(struct ah) + sumlen > ep)
-               fputs("[truncated]", stdout);
-       fputs("): ", stdout);
-       
-       return sizeof(struct ah) + sumlen;
- trunc:
-       fputs("[|AH]", stdout);
-       return 65535;
+       return ah_hdr_len;

 }
 }