osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

LCP-over Ethernet and IPCP-over-Ethernet support, from Laurent Rabret. 

svn path=/trunk/; revision=3547
This commit is contained in:
Guy Harris 2001-06-14 20:05:13 +00:00
parent a077ae8a6f
commit 2d0a0be252
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -687,6 +687,10 @@ Francisco Javier Cabello <fjcabello@vtools.es> {
RFC 2250 MPEG1 support
}
Laurent Rabret <laurent.rabret@rd.francetelecom.fr> {
LCP-over Ethernet and IPCP-over-Ethernet support
}
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -1125,6 +1125,7 @@ B<http://www.ethereal.com>.
B. Johannessen <bob@havoq.com>
Thierry Stagiaire <thierry.pelle@rd.francetelecom.fr>
Francisco Javier Cabello <fjcabello@vtools.es>
Laurent Rabret <laurent.rabret@rd.francetelecom.fr>
Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

5
etypes.h
View File

@ -1,7 +1,7 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
* $Id: etypes.h,v 1.19 2001/05/28 20:18:08 guy Exp $
* $Id: etypes.h,v 1.20 2001/06/14 20:05:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -168,6 +168,9 @@
#define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
#endif
#ifndef ETHERTYPE_PAP
#define ETHERTYPE_PAP 0xC023 /* Quick & dirty. just to indicate the PAP protocol*/
#endif
extern const value_string etype_vals[];
#endif /* etypes.h */

3
packet-ethertype.c
View File

@ -1,7 +1,7 @@
/* ethertype.c
* Routines for calling the right protocol for the ethertype.
*
* $Id: packet-ethertype.c,v 1.14 2001/04/03 05:42:11 guy Exp $
* $Id: packet-ethertype.c,v 1.15 2001/06/14 20:05:12 guy Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@ -72,6 +72,7 @@ const value_string etype_vals[] = {
{ETHERTYPE_DEC_CUST, "DEC Customer use" },
{ETHERTYPE_DEC_SCA, "DEC LAVC/SCA" },
{ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{ETHERTYPE_PAP, "PPP Password Authentication Protocol" },
{0, NULL } };
static void add_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb,

4
packet-ppp.c
View File

@ -1,7 +1,7 @@
/* packet-ppp.c
* Routines for ppp packet disassembly
*
* $Id: packet-ppp.c,v 1.63 2001/04/23 18:19:03 guy Exp $
* $Id: packet-ppp.c,v 1.64 2001/06/14 20:05:12 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -1492,6 +1492,7 @@ void
proto_reg_handoff_lcp(void)
{
dissector_add("ppp.protocol", PPP_LCP, dissect_lcp, proto_lcp);
dissector_add("ethertype", PPP_LCP, dissect_lcp, proto_lcp);
}
void
@ -1513,4 +1514,5 @@ void
proto_reg_handoff_ipcp(void)
{
dissector_add("ppp.protocol", PPP_IPCP, dissect_ipcp, proto_ipcp);
dissector_add("ethertype", PPP_IPCP, dissect_ipcp, proto_ipcp);
}