Guy Harris <[EMAIL PROTECTED]> writes:
>>I'd check it in, but I don't have IPv6 support on my home machine, so
>>the code doesn't get compiled, so I can't check whether it works - there
>>appeared to be a newline missing from the end of the patch, and I don't
>>know if that means it's incomplete or not.
I have fixed print-icmp6. Please try attached patches.
Thanks for reporting,
sugyo
Index: icmp6.h
===================================================================
RCS file: /tcpdump/master/tcpdump/icmp6.h,v
retrieving revision 1.11
diff -u -u -r1.11 icmp6.h
--- icmp6.h 2001/06/01 23:01:04 1.11
+++ icmp6.h 2002/03/27 06:13:29
@@ -122,7 +122,13 @@
#define MLD6_MTRACE_RESP 141 /* mtrace response(to sender) */
#define MLD6_MTRACE 142 /* mtrace messages */
-#define ICMP6_MAXTYPE 142
+/* Folloing numbers are defined in the mobile-ip draft. */
+#define ICMP6_HADISCOV_REQUEST 150 /* XXX To be authorized */
+#define ICMP6_HADISCOV_REPLY 151 /* XXX To be authorized */
+#define ICMP6_MOBILEPREFIX_SOLICIT 152 /* XXX To be authorized */
+#define ICMP6_MOBILEPREFIX_ADVERT 153 /* XXX To be authorized */
+
+#define ICMP6_MAXTYPE 153
#define ICMP6_DST_UNREACH_NOROUTE 0 /* no route to destination */
#define ICMP6_DST_UNREACH_ADMIN 1 /* administratively prohibited
*/
Index: print-icmp6.c
===================================================================
RCS file: /tcpdump/master/tcpdump/print-icmp6.c,v
retrieving revision 1.57
diff -u -u -r1.57 print-icmp6.c
--- print-icmp6.c 2001/12/09 05:22:27 1.57
+++ print-icmp6.c 2002/03/27 06:13:30
@@ -356,6 +356,29 @@
case ICMP6_NI_REPLY:
icmp6_nodeinfo_print(icmp6len, bp, ep);
break;
+ case ICMP6_HADISCOV_REQUEST:
+ case ICMP6_HADISCOV_REPLY:
+ {
+ struct in6_addr *in6;
+ u_int32_t *res;
+ u_char *cp;
+ int cnt, i;
+ printf("icmp6: ha discovery %s: ",
+ dp->icmp6_type == ICMP6_HADISCOV_REQUEST ?
+ "request" : "reply");
+ TCHECK(dp->icmp6_data16[0]);
+ printf("id=%d", ntohs(dp->icmp6_data16[0]));
+ cp = (u_char *)dp + icmp6len;
+ res = (u_int32_t *)(dp + 1);
+ in6 = (struct in6_addr *)(res + 2);
+ for (; (u_char *)in6 < cp; in6++) {
+ TCHECK(*in6);
+ printf(", %s", ip6addr_string(in6));
+ }
+ break;
+ }
+ case ICMP6_MOBILEPREFIX_SOLICIT:
+ case ICMP6_MOBILEPREFIX_ADVERT:
default:
printf("icmp6: type-#%d", dp->icmp6_type);
break;
Index: print-ip6opts.c
===================================================================
RCS file: /tcpdump/master/tcpdump/print-ip6opts.c,v
retrieving revision 1.9
diff -u -u -r1.9 print-ip6opts.c
--- print-ip6opts.c 2001/05/09 02:47:26 1.9
+++ print-ip6opts.c 2002/03/27 06:13:30
@@ -64,10 +64,12 @@
#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 @@
}
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 @@
}
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 @@
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 @@
}
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],
