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-ip.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-ip.c')
-rw-r--r-- | contrib/tcpdump/print-ip.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c index 9773c29..9ea7141 100644 --- a/contrib/tcpdump/print-ip.c +++ b/contrib/tcpdump/print-ip.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.149.2.1 2005/05/20 21:15:46 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.149.2.2 2005/09/20 06:05:38 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -413,6 +413,10 @@ again: case IPPROTO_SCTP: sctp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len); break; + + case IPPROTO_DCCP: + dccp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len); + break; case IPPROTO_TCP: tcp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip, @@ -667,7 +671,7 @@ ip_print(netdissect_options *ndo, ipds->nh = ipds->ip->ip_p; if (ipds->nh != IPPROTO_TCP && ipds->nh != IPPROTO_UDP && - ipds->nh != IPPROTO_SCTP) { + ipds->nh != IPPROTO_SCTP && ipds->nh != IPPROTO_DCCP) { (void)printf("%s > %s: ", ipaddr_string(&ipds->ip->ip_src), ipaddr_string(&ipds->ip->ip_dst)); |