#ifndef lint
static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.38 2003-11-19 06:17:10 guy Exp $";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47.2.3 2005-09-20 06:05:38 guy Exp $";
#endif
#ifdef HAVE_CONFIG_H
TCHECK(*ip6);
if (length < sizeof (struct ip6_hdr)) {
- (void)printf("truncated-ip6 %d", length);
+ (void)printf("truncated-ip6 %u", length);
return;
}
- len = EXTRACT_16BITS(&ip6->ip6_plen) + sizeof(struct ip6_hdr);
+ if (!eflag)
+ printf("IP6 ");
+
+ payload_len = EXTRACT_16BITS(&ip6->ip6_plen);
+ len = payload_len + sizeof(struct ip6_hdr);
if (length < len)
- (void)printf("truncated-ip6 - %d bytes missing!",
+ (void)printf("truncated-ip6 - %u bytes missing!",
len - length);
+ if (vflag) {
+ flow = EXTRACT_32BITS(&ip6->ip6_flow);
+ printf("(");
+#if 0
+ /* rfc1883 */
+ if (flow & 0x0f000000)
+ (void)printf("pri 0x%02x, ", (flow & 0x0f000000) >> 24);
+ if (flow & 0x00ffffff)
+ (void)printf("flowlabel 0x%06x, ", flow & 0x00ffffff);
+#else
+ /* RFC 2460 */
+ if (flow & 0x0ff00000)
+ (void)printf("class 0x%02x, ", (flow & 0x0ff00000) >> 20);
+ if (flow & 0x000fffff)
+ (void)printf("flowlabel 0x%05x, ", flow & 0x000fffff);
+#endif
+
+ (void)printf("hlim %u, next-header: %s (%u), length: %u) ",
+ ip6->ip6_hlim,
+ tok2str(ipproto_values,"unknown",ip6->ip6_nxt),
+ ip6->ip6_nxt,
+ payload_len);
+ }
+
/*
* Cut off the snapshot length to the end of the IP payload.
*/
snapend = ipend;
cp = (const u_char *)ip6;
- payload_len = len;
advance = sizeof(struct ip6_hdr);
nh = ip6->ip6_nxt;
while (cp < snapend && advance > 0) {
cp += advance;
- payload_len -= advance;
+ len -= advance;
if (cp == (const u_char *)(ip6 + 1) &&
nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
- nh != IPPROTO_SCTP) {
+ nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) {
(void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
ip6addr_string(&ip6->ip6_dst));
}
case IPPROTO_FRAGMENT:
advance = frag6_print(cp, (const u_char *)ip6);
if (snapend <= cp + advance)
- goto end;
+ return;
nh = *cp;
fragmented = 1;
break;
+ case IPPROTO_MOBILITY_OLD:
case IPPROTO_MOBILITY:
/*
- * XXX - we don't use "advance"; is this
- * header always a final header?
+ * XXX - we don't use "advance"; the current
+ * "Mobility Support in IPv6" draft
+ * (draft-ietf-mobileip-ipv6-24) says that
+ * the next header field in a mobility header
+ * should be IPPROTO_NONE, but speaks of
+ * the possiblity of a future extension in
+ * which payload can be piggybacked atop a
+ * mobility header.
*/
advance = mobility_print(cp, (const u_char *)ip6);
nh = *cp;
- goto end;
+ return;
case IPPROTO_ROUTING:
advance = rt6_print(cp, (const u_char *)ip6);
nh = *cp;
break;
case IPPROTO_SCTP:
- sctp_print(cp, (const u_char *)ip6, payload_len);
- goto end;
+ sctp_print(cp, (const u_char *)ip6, len);
+ return;
+ case IPPROTO_DCCP:
+ dccp_print(cp, (const u_char *)ip6, len);
+ return;
case IPPROTO_TCP:
- tcp_print(cp, payload_len, (const u_char *)ip6,
- fragmented);
- goto end;
+ tcp_print(cp, len, (const u_char *)ip6, fragmented);
+ return;
case IPPROTO_UDP:
- udp_print(cp, payload_len, (const u_char *)ip6,
- fragmented);
- goto end;
+ udp_print(cp, len, (const u_char *)ip6, fragmented);
+ return;
case IPPROTO_ICMPV6:
- icmp6_print(cp, payload_len, (const u_char *)ip6,
- fragmented);
- goto end;
+ icmp6_print(cp, len, (const u_char *)ip6, fragmented);
+ return;
case IPPROTO_AH:
advance = ah_print(cp);
nh = *cp;
case IPPROTO_ESP:
{
int enh, padlen;
- advance = esp_print(cp, (const u_char *)ip6, &enh, &padlen);
+ advance = esp_print(gndo, cp, len, (const u_char *)ip6, &enh, &padlen);
nh = enh & 0xff;
len -= padlen;
break;
}
case IPPROTO_PIM:
- pim_print(cp, payload_len);
- goto end;
+ pim_print(cp, len);
+ return;
+
case IPPROTO_OSPF:
- ospf6_print(cp, payload_len);
- goto end;
+ ospf6_print(cp, len);
+ return;
case IPPROTO_IPV6:
- ip6_print(cp, payload_len);
- goto end;
+ ip6_print(cp, len);
+ return;
case IPPROTO_IPV4:
- ip_print(cp, payload_len);
- goto end;
+ ip_print(gndo, cp, len);
+ return;
+
+ case IPPROTO_PGM:
+ pgm_print(cp, len, (const u_char *)ip6);
+ return;
+
+ case IPPROTO_GRE:
+ gre_print(cp, len);
+ return;
+
+ case IPPROTO_RSVP:
+ rsvp_print(cp, len);
+ return;
case IPPROTO_NONE:
(void)printf("no next header");
- goto end;
+ return;
default:
- (void)printf("ip-proto-%d %d", ip6->ip6_nxt,
- payload_len);
- goto end;
+ (void)printf("ip-proto-%d %d", ip6->ip6_nxt, len);
+ return;
}
}
- end:
-
- flow = EXTRACT_32BITS(&ip6->ip6_flow);
-#if 0
- /* rfc1883 */
- if (flow & 0x0f000000)
- (void)printf(" [pri 0x%x]", (flow & 0x0f000000) >> 24);
- if (flow & 0x00ffffff)
- (void)printf(" [flowlabel 0x%x]", flow & 0x00ffffff);
-#else
- /* RFC 2460 */
- if (flow & 0x0ff00000)
- (void)printf(" [class 0x%x]", (flow & 0x0ff00000) >> 20);
- if (flow & 0x000fffff)
- (void)printf(" [flowlabel 0x%x]", flow & 0x000fffff);
-#endif
-
- if (ip6->ip6_hlim <= 1)
- (void)printf(" [hlim %d]", (int)ip6->ip6_hlim);
-
- if (vflag) {
- printf(" (");
- (void)printf("len %d", len);
- if (ip6->ip6_hlim > 1)
- (void)printf(", hlim %d", (int)ip6->ip6_hlim);
- printf(")");
- }
return;
trunc:
(void)printf("[|ip6]");
projects / tcpdump / blobdiff