X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/63d81f5ab7c2699ac21a0b342f9ac6831efe9dd2..ad6df73f5a6c46a409c7629f5588b1b81dff6357:/print-ip6opts.c

diff --git a/print-ip6opts.c b/print-ip6opts.c
index ac0ac905..07124068 100644
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.9 2001-05-09 02:47:26 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.10 2002-03-28 10:02:35 guy Exp $";
 #endif
 
 #ifdef INET6
@@ -64,10 +64,12 @@ static const char rcsid[] =
 #define IP6OPT_BU_MINLEN       10
 #define IP6OPT_BA_MINLEN       13
 #define IP6OPT_BR_MINLEN        2
-#define IP6SOPT_ALTCOA        0x4
-#define IP6SOPT_ALTCOA_MINLEN  18
 #define IP6SOPT_UI            0x2
 #define IP6SOPT_UI_MINLEN       4
+#define IP6SOPT_ALTCOA        0x3
+#define IP6SOPT_ALTCOA_MINLEN  18
+#define IP6SOPT_AUTH          0x4
+#define IP6SOPT_AUTH_MINLEN     6
 
 static void ip6_sopt_print(const u_char *, int);
 
@@ -100,6 +102,13 @@ ip6_sopt_print(const u_char *bp, int len)
 	    }
             printf(", padn");
 	    break;
+        case IP6SOPT_UI:
+             if (len - i < IP6SOPT_UI_MINLEN) {
+		printf(", ui: trunc");
+		goto trunc;
+	    }
+            printf(", ui: 0x%04x ", ntohs(*(u_int16_t *)&bp[i + 2]));
+	    break;
         case IP6SOPT_ALTCOA:
              if (len - i < IP6SOPT_ALTCOA_MINLEN) {
 		printf(", altcoa: trunc");
@@ -107,12 +116,13 @@ ip6_sopt_print(const u_char *bp, int len)
 	    }
             printf(", alt-CoA: %s", ip6addr_string(&bp[i+2]));
 	    break;
-        case IP6SOPT_UI:
-             if (len - i < IP6SOPT_UI_MINLEN) {
-		printf(", ui: trunc");
+        case IP6SOPT_AUTH:
+             if (len - i < IP6SOPT_AUTH_MINLEN) {
+		printf(", auth: trunc");
 		goto trunc;
 	    }
-            printf("(ui: 0x%04x) ", ntohs(*(u_int16_t *)&bp[i + 2]));
+            printf(", auth spi: 0x%08x",
+		   (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 2]));
 	    break;
 	default:
 	    if (len - i < IP6OPT_MINLEN) {
@@ -211,16 +221,14 @@ ip6_opt_print(const u_char *bp, int len)
 	    if (bp[i + 2] & 0x40)
 		    printf("H");
 	    if (bp[i + 2] & 0x20)
-		    printf("R");
+		    printf("S");
 	    if (bp[i + 2] & 0x10)
 		    printf("D");
-	    if (bp[i + 2] & 0x0f)
+	    if ((bp[i + 2] & 0x0f) || bp[i + 3] || bp[i + 4])
 		    printf("res");
-	    printf(", prefixlen: %u", bp[i + 3]);
-	    printf(", sequence: %u",
-		(u_int16_t)ntohs(*(u_int16_t *)&bp[i + 4]));
+	    printf(", sequence: %u", bp[i + 5]);
 	    printf(", lifetime: %u",
-		(u_int32_t)ntohs(*(u_int32_t *)&bp[i + 8]));
+		(u_int32_t)ntohl(*(u_int32_t *)&bp[i + 6]));
 
 	    if (bp[i + 1] > IP6OPT_BU_MINLEN - 2) {
 		ip6_sopt_print(&bp[i + IP6OPT_BU_MINLEN],
@@ -239,12 +247,13 @@ ip6_opt_print(const u_char *bp, int len)
 	    }
 	    printf("(ba: ");
 	    printf("status: %u", bp[i + 2]);
-	    printf(", sequence: %u",
-		(u_int16_t)ntohs(*(u_int16_t *)&bp[i + 3]));
+	    if (bp[i + 3])
+		    printf("res");
+	    printf(", sequence: %u", bp[i + 4]);
 	    printf(", lifetime: %u",
-		(u_int32_t)ntohs(*(u_int32_t *)&bp[i + 7]));
+		(u_int32_t)ntohl(*(u_int32_t *)&bp[i + 5]));
 	    printf(", refresh: %u",
-		(u_int32_t)ntohs(*(u_int32_t *)&bp[i + 11]));
+		(u_int32_t)ntohl(*(u_int32_t *)&bp[i + 9]));
 
 	    if (bp[i + 1] > IP6OPT_BA_MINLEN - 2) {
 		ip6_sopt_print(&bp[i + IP6OPT_BA_MINLEN],