aboutsummaryrefslogtreecommitdiffstats
path: root/packet-pppoe.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-01-09 06:32:10 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-01-09 06:32:10 +0000
commita2e2dd78a3bfe730f3ffbcee258923f45bd5c27c (patch)
tree64e405774b7cf4b6cc4f247aea0c3c3651aeef53 /packet-pppoe.c
parenta1f75fe99c63add12c6dca8d8c0bc31435568dfa (diff)
Add an additional "protocol index" argument to "{old_}dissector_add()",
"{old_}heur_dissector_add()", "{old_}conv_dissector_add()", and "register_dissector()", so that an entry in those tables has associated with it the protocol index of the protocol the dissector handles (or -1, if there is no protocol index for it). This is for future use in a number of places. (Arguably, "proto_register_protocol()" should take a dissector pointer as an argument, but 1) it'd have to handle both regular and heuristic dissectors; 2) making it take either a "dissector_t" or a union of that and a "heur_dissector_t" introduces some painful header-file interdependencies so I'm punting on that for now. As with other Ethereal internal APIs, these APIs are subject to change in the future, at least until Ethereal 1.0 comes out....) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2849 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-pppoe.c')
-rw-r--r--packet-pppoe.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-pppoe.c b/packet-pppoe.c
index 21207bdebb..64a78430d2 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.14 2001/01/04 04:15:30 guy Exp $
+ * $Id: packet-pppoe.c,v 1.15 2001/01/09 06:31:40 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -222,7 +222,8 @@ proto_register_pppoed(void)
void
proto_reg_handoff_pppoed(void)
{
- dissector_add("ethertype", ETHERTYPE_PPPOED, dissect_pppoed);
+ dissector_add("ethertype", ETHERTYPE_PPPOED, dissect_pppoed,
+ proto_pppoed);
}
static void
@@ -296,7 +297,8 @@ proto_register_pppoes(void)
void
proto_reg_handoff_pppoes(void)
{
- dissector_add("ethertype", ETHERTYPE_PPPOES, dissect_pppoes);
+ dissector_add("ethertype", ETHERTYPE_PPPOES, dissect_pppoes,
+ proto_pppoes);
/*
* Get a handle for the PPP payload dissector.