diff options
| author | Bill Fenner <fenner@FreeBSD.org> | 2000-01-30 00:45:58 +0000 |
|---|---|---|
| committer | Bill Fenner <fenner@FreeBSD.org> | 2000-01-30 00:45:58 +0000 |
| commit | b0453382235492c8e30b09659b52d784128ca7d0 (patch) | |
| tree | 9c40886f8f7e92c317d967bb4c225b058e84e006 /contrib/tcpdump/print-gre.c | |
| parent | 4644f044b29b71b385396356b7cbf92b09e67628 (diff) | |
| download | src-b0453382235492c8e30b09659b52d784128ca7d0.tar.gz src-b0453382235492c8e30b09659b52d784128ca7d0.zip | |
Virgin import of tcpdump.org tcpdump v3.5
Notes
Notes:
svn path=/vendor/tcpdump/dist/; revision=56893
Diffstat (limited to 'contrib/tcpdump/print-gre.c')
| -rw-r--r-- | contrib/tcpdump/print-gre.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/contrib/tcpdump/print-gre.c b/contrib/tcpdump/print-gre.c index dd1ac83163fd..858459568850 100644 --- a/contrib/tcpdump/print-gre.c +++ b/contrib/tcpdump/print-gre.c @@ -24,7 +24,11 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: print-gre.c,v 1.4 96/12/10 23:28:23 leres Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.6 1999/11/21 09:36:52 fenner Exp $"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include <sys/param.h> @@ -76,9 +80,6 @@ struct gre { #define GRE_SP 0x1000 /* Sequence Present */ -#define GREPROTO_IP 0x0800 - - /* * Deencapsulate and print a GRE-tunneled IP datagram */ @@ -123,16 +124,9 @@ gre_print(const u_char *bp, u_int length) if (flags & GRE_SP) cp += 4; - switch (proto) { - - case GREPROTO_IP: - ip_print(cp, length - ((cp - bp) / sizeof(u_char))); - break; - - default: - printf("gre-proto-0x%04X", proto); - break; - } + length -= cp - bp; + if (ether_encap_print(proto, cp, length, length) == 0) + printf("gre-proto-0x%04X", proto); return; trunc: |