diff options
| author | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
| commit | 5d66575dd923625f5f8a569b19801db44c111619 (patch) | |
| tree | 14f508983141729f86ce893b1f31e0d11cf1b4db /contrib/tcpdump/print-ip6.c | |
| parent | fb0e3fc91b71a7c77c12753c471331fc4757d33c (diff) | |
| download | FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.zip FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.tar.gz | |
resolve merge conflicts
Approved by: re (scottl)
Diffstat (limited to 'contrib/tcpdump/print-ip6.c')
| -rw-r--r-- | contrib/tcpdump/print-ip6.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/contrib/tcpdump/print-ip6.c b/contrib/tcpdump/print-ip6.c index d51ecab..cdf2f2a 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 2005/04/06 21:32:40 mcr Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47.2.2 2005/07/03 20:36:33 hannes Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -194,6 +194,7 @@ ip6_print(register const u_char *bp, register u_int length) case IPPROTO_PIM: pim_print(cp, len); return; + case IPPROTO_OSPF: ospf6_print(cp, len); return; @@ -206,6 +207,18 @@ ip6_print(register const u_char *bp, register u_int length) 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"); return; |
