diff options
| author | fenner <fenner@FreeBSD.org> | 2001-04-03 07:45:48 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2001-04-03 07:45:48 +0000 |
| commit | f7d9a5e270bfcbb075a637a52416185441d33d8d (patch) | |
| tree | e79d9e6f58638911260708c956a0d44069782cda /contrib/tcpdump/print-gre.c | |
| parent | 04f715925eb0f85e1b7d21424cdbb3f6f1fa0b41 (diff) | |
| parent | ace14a2b50f2cc05c079d0b9137b49066dbb1206 (diff) | |
| download | FreeBSD-src-f7d9a5e270bfcbb075a637a52416185441d33d8d.zip FreeBSD-src-f7d9a5e270bfcbb075a637a52416185441d33d8d.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r75115,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/tcpdump/print-gre.c')
| -rw-r--r-- | contrib/tcpdump/print-gre.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/tcpdump/print-gre.c b/contrib/tcpdump/print-gre.c index 8584595..e79d300 100644 --- a/contrib/tcpdump/print-gre.c +++ b/contrib/tcpdump/print-gre.c @@ -24,7 +24,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.6 1999/11/21 09:36:52 fenner Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-gre.c,v 1.9 2000/12/18 05:41:59 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -37,8 +37,6 @@ static const char rcsid[] = #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <netdb.h> #include <stdio.h> @@ -88,7 +86,7 @@ gre_print(const u_char *bp, u_int length) { const u_char *cp = bp + 4; const struct gre *gre; - u_short flags, proto; + u_short flags, proto, extracted_ethertype; gre = (const struct gre *)bp; @@ -125,7 +123,8 @@ gre_print(const u_char *bp, u_int length) cp += 4; length -= cp - bp; - if (ether_encap_print(proto, cp, length, length) == 0) + if (ether_encap_print(proto, cp, length, length, + &extracted_ethertype) == 0) printf("gre-proto-0x%04X", proto); return; |
