diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2005-07-11 03:54:22 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2005-07-11 03:54:22 +0000 |
| commit | f4d0c64a1ddc84cf60d453e0f1ea0a70bea248e3 (patch) | |
| tree | 87e350d89f0c352cd41839a49086d78bf700350e /contrib/tcpdump/print-pppoe.c | |
| parent | cc157742d16ed3507376178a603a01aaab58e0e6 (diff) | |
| download | src-f4d0c64a1ddc84cf60d453e0f1ea0a70bea248e3.tar.gz src-f4d0c64a1ddc84cf60d453e0f1ea0a70bea248e3.zip | |
Virgin import of tcpdump v3.9.1 (release) from tcpdump.org
Approved by: re (scottl)
Notes
Notes:
svn path=/vendor/tcpdump/dist/; revision=147899
Diffstat (limited to 'contrib/tcpdump/print-pppoe.c')
| -rw-r--r-- | contrib/tcpdump/print-pppoe.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/contrib/tcpdump/print-pppoe.c b/contrib/tcpdump/print-pppoe.c index 8835e1e9d8dc..229b5eef60af 100644 --- a/contrib/tcpdump/print-pppoe.c +++ b/contrib/tcpdump/print-pppoe.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = -"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.30 2004/08/27 03:57:41 guy Exp $ (LBL)"; +"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.30.2.1 2005/04/26 19:48:56 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -138,21 +138,6 @@ pppoe_print(register const u_char *bp, u_int length) printf(" [ses 0x%x]", pppoe_sessionid); } - if (pppoe_length < length && length + ETHER_HDRLEN > 60) { - /* (small packets are probably just padded up to the ethernet - minimum of 60 bytes of data + 4 bytes of CRC) */ - printf(" [length %u (%u extra bytes)]", - pppoe_length, length - pppoe_length); -#if RESPECT_PAYLOAD_LENGTH - if (snaplend > pppoe_payload+pppoe_length) - snapend = pppoe_payload+pppoe_length; -#else - /* Actual PPPoE implementations appear to ignore the payload - length and use the full ethernet frame anyways */ - pppoe_length = length; -#endif - } - if (pppoe_code) { /* PPP session packets don't contain tags */ u_short tag_type = 0xffff, tag_len; |