guy 2001/11/27 01:13:30 CST
Modified files:
. Makefile.am packet-arp.c packet-dsi.c
packet-fr.c packet-ftp.c packet-ipp.c
packet-msproxy.c packet-quake.c
packet-quake2.c packet-quakeworld.c
packet-rpc.c packet-rtcp.c packet-rtcp.h
packet-rtp.c packet-rtp.h packet-rtsp.c
packet-snmp.c packet-socks.c
packet-tftp.c packet-wcp.c packet-wsp.c
Removed files:
. packet-fr.h
Log:
Change "conversation_set_dissector()" to take a dissector handle, rather
than a pointer to a dissector function, as an argument.
This means that the conversation dissector is called through
"call_dissector()", so the dissector itself doesn't have to worry about
checking whether the protocol is enabled or setting
"pinfo->current_proto", so get rid of the code that does that in
conversation dissectors. Also, make the conversation dissectors static.
Get rid of some direct calls to dissectors; replace them with calls
through handles, and, again, get rid of code to check whether a protocol
is enabled and set "pinfo->current_proto" where that code isn't needed.
Make those dissectors static if they aren't already static.
Add a routine "create_dissector_handle()" to create a dissector handle
without registering it by name, if the dissector isn't used outside the
module in which it's defined.
Revision Changes Path
1.385 +1 -2 ethereal/Makefile.am
1.46 +6 -12 ethereal/packet-arp.c
1.5 +5 -2 ethereal/packet-dsi.c
1.21 +6 -8 ethereal/packet-fr.c
1.37 +6 -2 ethereal/packet-ftp.c
1.25 +2 -7 ethereal/packet-ipp.c
1.23 +9 -4 ethereal/packet-msproxy.c
1.21 +5 -12 ethereal/packet-quake.c
1.5 +2 -11 ethereal/packet-quake2.c
1.7 +2 -11 ethereal/packet-quakeworld.c
1.76 +7 -3 ethereal/packet-rpc.c
1.24 +4 -12 ethereal/packet-rtcp.c
1.7 +1 -2 ethereal/packet-rtcp.h
1.28 +8 -10 ethereal/packet-rtp.c
1.6 +1 -3 ethereal/packet-rtp.h
1.43 +3 -3 ethereal/packet-rtsp.c
1.74 +4 -11 ethereal/packet-snmp.c
1.29 +12 -3 ethereal/packet-socks.c
1.32 +5 -8 ethereal/packet-tftp.c
1.15 +9 -3 ethereal/packet-wcp.c
1.45 +20 -9 ethereal/packet-wsp.c