diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-09 06:32:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-09 06:32:10 +0000 |
| commit | 43ccfd8054ae2b3313ce16d0e96f65183a8062e6 (patch) | |
| tree | 64e405774b7cf4b6cc4f247aea0c3c3651aeef53 /packet-clnp.c | |
| parent | 925ce160144e354b91b25f6b28f60e0df689f043 (diff) | |
| download | wireshark-43ccfd8054ae2b3313ce16d0e96f65183a8062e6.tar.gz wireshark-43ccfd8054ae2b3313ce16d0e96f65183a8062e6.tar.bz2 wireshark-43ccfd8054ae2b3313ce16d0e96f65183a8062e6.zip | |
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....)
svn path=/trunk/; revision=2849
Diffstat (limited to 'packet-clnp.c')
| -rw-r--r-- | packet-clnp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/packet-clnp.c b/packet-clnp.c index 62a58f5189..5bd4e90ff9 100644 --- a/packet-clnp.c +++ b/packet-clnp.c @@ -1,7 +1,7 @@ /* packet-clnp.c * Routines for ISO/OSI network and transport protocol packet disassembly * - * $Id: packet-clnp.c,v 1.21 2001/01/03 07:53:43 guy Exp $ + * $Id: packet-clnp.c,v 1.22 2001/01/09 06:31:34 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -1906,7 +1906,8 @@ void proto_register_cotp(void) /* subdissector code */ register_heur_dissector_list("cotp_is", &cotp_is_heur_subdissector_list); - register_dissector("ositp", dissect_ositp); + /* XXX - what about CLTP? */ + register_dissector("ositp", dissect_ositp, proto_cotp); } void proto_register_cltp(void) @@ -1927,6 +1928,8 @@ void proto_register_cltp(void) void proto_reg_handoff_clnp(void) { - dissector_add("osinl", NLPID_ISO8473_CLNP, dissect_clnp); - dissector_add("osinl", NLPID_NULL, dissect_clnp); /* Inactive subset */ + dissector_add("osinl", NLPID_ISO8473_CLNP, dissect_clnp, + proto_clnp); + dissector_add("osinl", NLPID_NULL, dissect_clnp, + proto_clnp); /* Inactive subset */ } |