diff options
| author | sam <sam@FreeBSD.org> | 2006-09-04 20:25:04 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-09-04 20:25:04 +0000 |
| commit | a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d (patch) | |
| tree | f2c7f7e1286aabfb28d9294895c2ffe8abac34a0 /contrib/tcpdump/print-ip6.c | |
| parent | 6bf6a28af37230c5ca61c232f2749a46397da00a (diff) | |
| download | FreeBSD-src-a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d.zip FreeBSD-src-a8bc04a53e80c5d3caf667ed73ed30a17f5bd59d.tar.gz | |
resolve merge conflicts
MFC after: 1 month
Diffstat (limited to 'contrib/tcpdump/print-ip6.c')
| -rw-r--r-- | contrib/tcpdump/print-ip6.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c index cdf2f2a..5e6902d 100644 --- a/contrib/tcpdump/print-ip6.c +++ b/contrib/tcpdump/print-ip6.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47.2.2 2005/07/03 20:36:33 hannes 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 @@ -118,7 +118,7 @@ ip6_print(register const u_char *bp, register u_int length) 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)); } @@ -162,6 +162,9 @@ ip6_print(register const u_char *bp, register u_int length) case IPPROTO_SCTP: 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, len, (const u_char *)ip6, fragmented); return; |
