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:
parent
b63de9ed9e
commit
7aa547ff09
1
CREDITS
1
CREDITS
|
@ -30,6 +30,7 @@ Additional people who have contributed patches:
|
||||||
Lorenzo Cavallaro <sullivan@sikurezza.org>
|
Lorenzo Cavallaro <sullivan@sikurezza.org>
|
||||||
Love Hörnquist-Åstrand <lha@stacken.kth.se>
|
Love Hörnquist-Åstrand <lha@stacken.kth.se>
|
||||||
Marcus Felipe Pereira <marcus@task.com.br>
|
Marcus Felipe Pereira <marcus@task.com.br>
|
||||||
|
Martin Husemann <martin@netbsd.org>
|
||||||
Monroe Williams <monroe@pobox.com>
|
Monroe Williams <monroe@pobox.com>
|
||||||
Olaf Kirch <okir@caldera.de>
|
Olaf Kirch <okir@caldera.de>
|
||||||
Onno van der Linden <onno@simplex.nl>
|
Onno van der Linden <onno@simplex.nl>
|
||||||
|
|
14
gencode.c
14
gencode.c
|
@ -21,7 +21,7 @@
|
||||||
*/
|
*/
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] =
|
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
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -592,14 +592,13 @@ init_linktype(type)
|
||||||
off_nl = 4;
|
off_nl = 4;
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case DLT_PPP_ETHER: /* NetBSD PPP over Ethernet */
|
case DLT_PPP_ETHER:
|
||||||
/*
|
/*
|
||||||
* This includes the Ethernet header (since we need
|
* This does no include the Ethernet header, and
|
||||||
* the ethertype to dispatch Session vs. Discovery)
|
* only covers session state.
|
||||||
* and the PPPoE (RFC 2516) header.
|
|
||||||
*/
|
*/
|
||||||
off_linktype = 20;
|
off_linktype = 6;
|
||||||
off_nl = 22;
|
off_nl = 8;
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case DLT_PPP_BSDOS:
|
case DLT_PPP_BSDOS:
|
||||||
|
@ -1188,6 +1187,7 @@ gen_linktype(proto)
|
||||||
|
|
||||||
case DLT_PPP:
|
case DLT_PPP:
|
||||||
case DLT_PPP_SERIAL:
|
case DLT_PPP_SERIAL:
|
||||||
|
case DLT_PPP_ETHER:
|
||||||
/*
|
/*
|
||||||
* We use Ethernet protocol types inside libpcap;
|
* We use Ethernet protocol types inside libpcap;
|
||||||
* map them to the corresponding PPP protocol types.
|
* map them to the corresponding PPP protocol types.
|
||||||
|
|
Reference in New Issue