X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fcc82f451d3e51fdf636abbf927edb287bada0e0..1ee09c1510704191a14df4eb914dba3d5dc9ab58:/print-mobility.c?ds=sidebyside

diff --git a/print-mobility.c b/print-mobility.c
index de9f1531..1490b72e 100644
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -32,8 +32,8 @@
 #endif
 
 #ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.8 2002-12-11 07:14:05 guy Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-mobility.c,v 1.12 2005-04-20 22:21:00 guy Exp $";
 #endif
 
 #ifdef INET6
@@ -79,15 +79,14 @@ struct ip6_mobility {
 #define IP6MOPT_MINLEN		2
 #define IP6MOPT_PAD1          0x0	/* Pad1 */
 #define IP6MOPT_PADN          0x1	/* PadN */
-/*			      0x2	/* reserved */
+#define IP6MOPT_REFRESH	      0x2	/* Binding Refresh Advice */
+#define IP6MOPT_REFRESH_MINLEN  4
 #define IP6MOPT_ALTCOA        0x3	/* Alternate Care-of Address */
 #define IP6MOPT_ALTCOA_MINLEN  18
 #define IP6MOPT_NONCEID       0x4	/* Nonce Indices */
 #define IP6MOPT_NONCEID_MINLEN  6
 #define IP6MOPT_AUTH          0x5	/* Binding Authorization Data */
 #define IP6MOPT_AUTH_MINLEN    12
-#define IP6MOPT_REFRESH	      0x6	/* Binding Refresh Advice */
-#define IP6MOPT_REFRESH_MINLEN  4
 
 static void
 mobility_opt_print(const u_char *bp, int len)
@@ -118,6 +117,15 @@ mobility_opt_print(const u_char *bp, int len)
 			}
 			printf("(padn)");
 			break;
+		case IP6MOPT_REFRESH:
+			if (len - i < IP6MOPT_REFRESH_MINLEN) {
+				printf("(refresh: trunc)");
+				goto trunc;
+			}
+			/* units of 4 secs */
+			printf("(refresh: %d)",
+				EXTRACT_16BITS(&bp[i+2]) << 2);
+			break;
 		case IP6MOPT_ALTCOA:
 			if (len - i < IP6MOPT_ALTCOA_MINLEN) {
 				printf("(altcoa: trunc)");
@@ -130,7 +138,7 @@ mobility_opt_print(const u_char *bp, int len)
 				printf("(ni: trunc)");
 				goto trunc;
 			}
-			printf("(ni: ho=0x%04x ci=0x%04x)",
+			printf("(ni: ho=0x%04x co=0x%04x)",
 				EXTRACT_16BITS(&bp[i+2]),
 				EXTRACT_16BITS(&bp[i+4]));
 			break;
@@ -141,15 +149,6 @@ mobility_opt_print(const u_char *bp, int len)
 			}
 			printf("(auth)");
 			break;
-		case IP6MOPT_REFRESH:
-			if (len - i < IP6MOPT_REFRESH_MINLEN) {
-				printf("(refresh: trunc)");
-				goto trunc;
-			}
-			/* units of 4 secs */
-			printf("(refresh: %d)",
-				EXTRACT_16BITS(&bp[i+2]) << 2);
-			break;
 		default:
 			if (len - i < IP6MOPT_MINLEN) {
 				printf("(sopt_type %d: trunc)", bp[i]);
@@ -169,15 +168,13 @@ trunc:
  * Mobility Header
  */
 int
-mobility_print(const u_char *bp, const u_char *bp2)
+mobility_print(const u_char *bp, const u_char *bp2 _U_)
 {
 	const struct ip6_mobility *mh;
-	const struct ip6_hdr *ip6;
 	const u_char *ep;
 	int mhlen, hlen, type;
 
 	mh = (struct ip6_mobility *)bp;
-	ip6 = (struct ip6_hdr *)bp2;
 
 	/* 'ep' points to the end of available data. */
 	ep = snapend;
@@ -216,8 +213,8 @@ mobility_print(const u_char *bp, const u_char *bp2)
 		hlen = IP6M_MINLEN;
     		if (vflag) {
 			TCHECK2(*mh, hlen + 8);
-			printf(" %soT cookie=%08x:%08x",
-			       type == IP6M_HOME_TEST_INIT ? "H" : "C",
+			printf(" %s Init Cookie=%08x:%08x",
+			       type == IP6M_HOME_TEST_INIT ? "Home" : "Care-of",
 			       EXTRACT_32BITS(&bp[hlen]),
 			       EXTRACT_32BITS(&bp[hlen + 4]));
 		}
@@ -232,15 +229,15 @@ mobility_print(const u_char *bp, const u_char *bp2)
 		hlen = IP6M_MINLEN;
     		if (vflag) {
 			TCHECK2(*mh, hlen + 8);
-			printf(" %soTI cookie=%08x:%08x",
-			       type == IP6M_HOME_TEST ? "H" : "C",
+			printf(" %s Init Cookie=%08x:%08x",
+			       type == IP6M_HOME_TEST ? "Home" : "Care-of",
 			       EXTRACT_32BITS(&bp[hlen]),
 			       EXTRACT_32BITS(&bp[hlen + 4]));
 		}
 		hlen += 8;
     		if (vflag) {
 			TCHECK2(*mh, hlen + 8);
-			printf(" %s KN=%08x:%08x",
+			printf(" %s Keygen Token=%08x:%08x",
 			       type == IP6M_HOME_TEST ? "Home" : "Care-of",
 			       EXTRACT_32BITS(&bp[hlen]),
 			       EXTRACT_32BITS(&bp[hlen + 4]));
@@ -253,19 +250,17 @@ mobility_print(const u_char *bp, const u_char *bp2)
 		printf(" seq#=%d", EXTRACT_16BITS(&mh->ip6m_data16[0]));
 		hlen = IP6M_MINLEN;
 		TCHECK2(*mh, hlen + 1);
-		if (bp[hlen] & 0xf8)
+		if (bp[hlen] & 0xf0)
 			printf(" ");
 		if (bp[hlen] & 0x80)
 			printf("A");
 		if (bp[hlen] & 0x40)
 			printf("H");
 		if (bp[hlen] & 0x20)
-			printf("S");
-		if (bp[hlen] & 0x10)
-			printf("D");
-		if (bp[hlen] & 0x08)
 			printf("L");
-		/* Reserved (3bits) */
+		if (bp[hlen] & 0x10)
+			printf("K");
+		/* Reserved (4bits) */
 		hlen += 1;
 		/* Reserved (8bits) */
 		hlen += 1;
@@ -278,7 +273,9 @@ mobility_print(const u_char *bp, const u_char *bp2)
 		printf("mobility: BA");
 		TCHECK(mh->ip6m_data8[0]);
 		printf(" status=%d", mh->ip6m_data8[0]);
-		/* Reserved */
+		if (mh->ip6m_data8[1] & 0x80)
+			printf(" K");
+		/* Reserved (7bits) */
 		hlen = IP6M_MINLEN;
 		TCHECK2(*mh, hlen + 2);
 		printf(" seq#=%d", EXTRACT_16BITS(&bp[hlen]));