diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-03-30 06:10:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-03-30 06:10:54 +0000 |
| commit | 949888c04a7a85b847da144d14bf51eedb5bad94 (patch) | |
| tree | 7b517fc86bf7ab944a63d61eb54f9c9c8c11df1c /packet-pppoe.c | |
| parent | e30bc52b6af6cd5975885c4bcd7221d9d9a50650 (diff) | |
| download | wireshark-949888c04a7a85b847da144d14bf51eedb5bad94.tar.gz wireshark-949888c04a7a85b847da144d14bf51eedb5bad94.tar.bz2 wireshark-949888c04a7a85b847da144d14bf51eedb5bad94.zip | |
Call the dissector for PPP-in-HDLC-like-framing (RFC 1662) the
"ppp_hdlc" dissector, and call the dissector for "raw" PPP (just RFC
1661, no HDLC encapsulation) the "ppp" dissector.
Have the common routine used by both those dissectors take the offset in
the tvbuff of the PPP protocol field as an argument, rather than
assuming that the protocol field begins at the beginning of the tvbuff,
so we don't have to construct a new tvbuff in the
PPP-in-HDLC-like-framing dissector.
Use the PPP dissector, not the PPP-in-HDLC-like-framing dissector, for
PPP over Frame Relay - there's no HDLC header in PPP over Frame Relay,
at least according to
http://www.cisco.com/univercd/cc/td/doc/product/software/ios120/120newft/120t/120t1/pppframe.htm
svn path=/trunk/; revision=3208
Diffstat (limited to 'packet-pppoe.c')
| -rw-r--r-- | packet-pppoe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-pppoe.c b/packet-pppoe.c index 58230d5050..d4958926a8 100644 --- a/packet-pppoe.c +++ b/packet-pppoe.c @@ -1,7 +1,7 @@ /* packet-pppoe.c * Routines for PPP Over Ethernet (PPPoE) packet disassembly (RFC2516) * - * $Id: packet-pppoe.c,v 1.16 2001/01/21 22:51:46 guy Exp $ + * $Id: packet-pppoe.c,v 1.17 2001/03/30 06:10:54 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -43,7 +43,7 @@ static gint ett_pppoed_tags = -1; static int proto_pppoes = -1; -static dissector_handle_t payload_ppp_handle; +static dissector_handle_t ppp_handle; /* For lack of a better source, I made up the following defines. -jsj */ @@ -277,7 +277,7 @@ dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { * Im gonna try fudging it. */ next_tvb = tvb_new_subset(tvb,6,-1,-1); - call_dissector(payload_ppp_handle,next_tvb,pinfo,tree); + call_dissector(ppp_handle,next_tvb,pinfo,tree); } void proto_register_pppoes(void) @@ -293,7 +293,7 @@ proto_reg_handoff_pppoes(void) proto_pppoes); /* - * Get a handle for the PPP payload dissector. + * Get a handle for the PPP dissector. */ - payload_ppp_handle = find_dissector("payload_ppp"); + ppp_handle = find_dissector("ppp"); } |