dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

Change from NetBSD, by Martin Husemann <martin@netbsd.org>: 

Adapt to (temporary) DLT_PPP_ETHER useage by the pppoe code in tree
	now. This needs to be fixed when a generic PPP sheme is implemented.
This commit is contained in:
guy 2001-06-20 07:12:38 +00:00
parent b63de9ed9e
commit 7aa547ff09
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS
View File

@ -30,6 +30,7 @@ Additional people who have contributed patches:
Lorenzo Cavallaro <sullivan@sikurezza.org>
Love Hörnquist-Åstrand <lha@stacken.kth.se>
Marcus Felipe Pereira <marcus@task.com.br>
Martin Husemann <martin@netbsd.org>
Monroe Williams <monroe@pobox.com>
Olaf Kirch <okir@caldera.de>
Onno van der Linden <onno@simplex.nl>

14
gencode.c
View File

@ -21,7 +21,7 @@
*/
#ifndef lint
static const char rcsid[] =
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.155 2001-06-18 08:46:29 guy Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.156 2001-06-20 07:12:38 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -592,14 +592,13 @@ init_linktype(type)
off_nl = 4;
return;
case DLT_PPP_ETHER: /* NetBSD PPP over Ethernet */
case DLT_PPP_ETHER:
/*
* This includes the Ethernet header (since we need
* the ethertype to dispatch Session vs. Discovery)
* and the PPPoE (RFC 2516) header.
* This does no include the Ethernet header, and
* only covers session state.
*/
off_linktype = 20;
off_nl = 22;
off_linktype = 6;
off_nl = 8;
return;
case DLT_PPP_BSDOS:
@ -1188,6 +1187,7 @@ gen_linktype(proto)
case DLT_PPP:
case DLT_PPP_SERIAL:
case DLT_PPP_ETHER:
/*
* We use Ethernet protocol types inside libpcap;
* map them to the corresponding PPP protocol types.