#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.5 2000-04-09 19:15:14 assar Exp $";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.31 2003-06-07 11:57:54 guy Exp $";
#endif
#ifdef HAVE_CONFIG_H
#ifdef INET6
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+#include <tcpdump-stdinc.h>
#include <stdio.h>
-#ifdef __STDC__
#include <stdlib.h>
-#endif
-#include <unistd.h>
+#include <string.h>
#include "interface.h"
#include "addrtoname.h"
+#include "extract.h"
-#include <netinet/ip6.h>
+#include "ip6.h"
+#include "ipproto.h"
/*
* print an IP6 datagram.
*/
void
-ip6_print(register const u_char *bp, register int length)
+ip6_print(register const u_char *bp, register u_int length)
{
register const struct ip6_hdr *ip6;
- register int hlen;
- register int len;
+ register int advance;
+ register u_int len;
register const u_char *cp;
int nh;
+ int fragmented = 0;
u_int flow;
-
+
ip6 = (const struct ip6_hdr *)bp;
-#ifdef TCPDUMP_ALIGN
- /*
- * The IP header is not word aligned, so copy into abuf.
- * This will never happen with BPF. It does happen raw packet
- * dumps from -r.
- */
- if ((int)ip & (sizeof(long)-1)) {
- static u_char *abuf;
-
- if (abuf == 0)
- abuf = (u_char *)malloc(snaplen);
- bcopy((char *)ip, (char *)abuf, min(length, snaplen));
- snapend += abuf - (u_char *)ip;
- packetp = abuf;
- ip = (struct ip6_hdr *)abuf;
- }
-#endif
- if ((u_char *)(ip6 + 1) > snapend) {
- printf("[|ip6]");
- return;
- }
+ TCHECK(*ip6);
if (length < sizeof (struct ip6_hdr)) {
(void)printf("truncated-ip6 %d", length);
return;
}
- hlen = sizeof(struct ip6_hdr);
+ advance = sizeof(struct ip6_hdr);
- len = ntohs(ip6->ip6_plen);
- if (length < len + hlen)
+ len = EXTRACT_16BITS(&ip6->ip6_plen);
+ if (length < len + advance)
(void)printf("truncated-ip6 - %d bytes missing!",
- len + hlen - length);
+ len + advance - length);
cp = (const u_char *)ip6;
nh = ip6->ip6_nxt;
while (cp < snapend) {
- cp += hlen;
+ cp += advance;
- if (cp == (u_char *)(ip6 + 1)
- && nh != IPPROTO_TCP && nh != IPPROTO_UDP) {
+ if (cp == (const u_char *)(ip6 + 1)
+ && nh != IPPROTO_TCP && nh != IPPROTO_UDP
+ && nh != IPPROTO_SCTP) {
(void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
ip6addr_string(&ip6->ip6_dst));
}
switch (nh) {
case IPPROTO_HOPOPTS:
- hlen = hbhopt_print(cp);
+ advance = hbhopt_print(cp);
nh = *cp;
break;
case IPPROTO_DSTOPTS:
- hlen = dstopt_print(cp);
+ advance = dstopt_print(cp);
nh = *cp;
break;
case IPPROTO_FRAGMENT:
- hlen = frag6_print(cp, (const u_char *)ip6);
- if (snapend <= cp + hlen)
+ advance = frag6_print(cp, (const u_char *)ip6);
+ if (snapend <= cp + advance)
goto end;
nh = *cp;
+ fragmented = 1;
break;
+
+ case IPPROTO_MOBILITY:
+ /*
+ * XXX - we don't use "advance"; is this
+ * header always a final header?
+ */
+ advance = mobility_print(cp, (const u_char *)ip6);
+ nh = *cp;
+ goto end;
case IPPROTO_ROUTING:
- hlen = rt6_print(cp, (const u_char *)ip6);
+ advance = rt6_print(cp, (const u_char *)ip6);
nh = *cp;
break;
+ case IPPROTO_SCTP:
+ sctp_print(cp, (const u_char *)ip6,
+ len + sizeof(struct ip6_hdr) - (cp - bp));
+ goto end;
case IPPROTO_TCP:
tcp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),
- (const u_char *)ip6);
+ (const u_char *)ip6, fragmented);
goto end;
case IPPROTO_UDP:
udp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),
- (const u_char *)ip6);
+ (const u_char *)ip6, fragmented);
goto end;
case IPPROTO_ICMPV6:
- icmp6_print(cp, (const u_char *)ip6);
+ icmp6_print(cp, (const u_char *)ip6, fragmented);
goto end;
case IPPROTO_AH:
- hlen = ah_print(cp, (const u_char *)ip6);
+ advance = ah_print(cp);
nh = *cp;
break;
case IPPROTO_ESP:
{
- int enh;
- cp += esp_print(cp, (const u_char *)ip6, &enh);
+ int enh, padlen;
+ advance = esp_print(cp, (const u_char *)ip6, &enh, &padlen);
if (enh < 0)
goto end;
nh = enh & 0xff;
+ len -= padlen;
break;
}
-#ifndef IPPROTO_IPCOMP
-#define IPPROTO_IPCOMP 108
-#endif
case IPPROTO_IPCOMP:
{
int enh;
- cp += ipcomp_print(cp, (const u_char *)ip6, &enh);
+ advance = ipcomp_print(cp, &enh);
if (enh < 0)
goto end;
nh = enh & 0xff;
break;
}
-#ifndef IPPROTO_PIM
-#define IPPROTO_PIM 103
-#endif
case IPPROTO_PIM:
pim_print(cp, len);
goto end;
-#ifndef IPPROTO_OSPF
-#define IPPROTO_OSPF 89
-#endif
case IPPROTO_OSPF:
ospf6_print(cp, len);
goto end;
+
case IPPROTO_IPV6:
ip6_print(cp, len);
goto end;
-#ifndef IPPROTO_IPV4
-#define IPPROTO_IPV4 4
-#endif
+
case IPPROTO_IPV4:
ip_print(cp, len);
goto end;
+
case IPPROTO_NONE:
(void)printf("no next header");
goto end;
}
end:
-
- flow = ntohl(ip6->ip6_flow);
+
+ flow = EXTRACT_32BITS(&ip6->ip6_flow);
#if 0
/* rfc1883 */
if (flow & 0x0f000000)
(void)printf(", hlim %d", (int)ip6->ip6_hlim);
printf(")");
}
+ return;
+trunc:
+ (void)printf("[|ip6]");
}
#endif /* INET6 */
projects / tcpdump / blobdiff