Ethereal-cvs: [ethereal-cvs] cvs commit: ethereal conversation.c conversation.h packet-aarp.c
Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.
From: Guy Harris <guy@xxxxxxxxxxxx>
Date: Sun, 6 Aug 2000 22:22:33 -0500 (CDT)
guy 2000/08/06 22:22:30 CDT Modified files: . conversation.c conversation.h packet-aarp.c packet-arp.c packet-atalk.c packet-atm.c packet-auto_rp.c packet-bgp.c packet-bootp.c packet-bpdu.c packet-cdp.c packet-clnp.c packet-cops.c packet-data.c packet-ddtp.c packet-diameter.c packet-dns.c packet-eigrp.c packet-esis.c packet-eth.c packet-ethertype.c packet-fddi.c packet-ftp.c packet-giop.c packet-gre.c packet-h1.c packet-hsrp.c packet-http.c packet-icmpv6.c packet-icp.c packet-icq.c packet-imap.c packet-ip.c packet-ipp.c packet-ipsec.c packet-ipv6.c packet-ipx.c packet-ipx.h packet-irc.c packet-isakmp.c packet-isis.c packet-isl.c packet-l2tp.c packet-lapd.c packet-ldap.c packet-llc.c packet-lpd.c packet-mapi.c packet-mip.c packet-mpls.c packet-msproxy.c packet-nbipx.c packet-nbns.c packet-ncp.c packet-netbios.c packet-nntp.c packet-ntp.c packet-null.c packet-osi.c packet-ospf.c packet-pim.c packet-pop.c packet-ppp.c packet-pppoe.c packet-pptp.c packet-quake.c packet-radius.c packet-rip.c packet-ripng.c packet-rlogin.c packet-rpc.c packet-rsvp.c packet-rtsp.c packet-rx.c packet-sap.c packet-sctp.c packet-sna.c packet-snmp.c packet-socks.c packet-srvloc.c packet-sscop.c packet-syslog.c packet-tacacs.c packet-tcp.c packet-telnet.c packet-time.c packet-tns.c packet-tr.c packet-udp.c packet-v120.c packet-vines.c packet-vlan.c packet-vrrp.c packet-wccp.c packet-who.c packet-x11.c packet-x25.c packet-yhoo.c packet.c packet.h Log: Allow either old-style (pre-tvbuff) or new-style (tvbuffified) dissectors to be registered as dissectors for particular ports, registered as heuristic dissectors, and registered as dissectors for conversations, and have routines to be used both by old-style and new-style dissectors to call registered dissectors. Have the code that calls those dissectors translate the arguments as necessary. (For conversation dissectors, replace "find_conversation_dissector()", which just returns a pointer to the dissector, with "old_try_conversation_dissector()" and "try_conversation_dissector()", which actually call the dissector, so that there's a single place at which we can do that translation. Also make "dissector_lookup()" static and, instead of calling it and, if it returns a non-null pointer, calling that dissector, just use "old_dissector_try_port()" or "dissector_try_port()", for the same reason.) This allows some dissectors that took old-style arguments and immediately translated them to new-style arguments to just take new-style arguments; make them do so. It also allows some new-style dissectors not to have to translate arguments before calling routines to look up and call dissectors; make them not do so. Get rid of checks for too-short frames in new-style dissectors - the tvbuff code does those checks for you. Give the routines to register old-style dissectors, and to call dissectors from old-style dissectors, names beginning with "old_", with the routines for new-style dissectors not having the "old_". Update the dissectors that use those routines appropriately. Rename "dissect_data()" to "old_dissect_data()", and "dissect_data_tvb()" to "dissect_data()". Revision Changes Path 1.8 +58 -8 ethereal/conversation.c 1.6 +14 -5 ethereal/conversation.h 1.21 +4 -4 ethereal/packet-aarp.c 1.31 +7 -7 ethereal/packet-arp.c 1.39 +17 -17 ethereal/packet-atalk.c 1.23 +4 -4 ethereal/packet-atm.c 1.7 +4 -4 ethereal/packet-auto_rp.c 1.24 +2 -2 ethereal/packet-bgp.c 1.38 +2 -2 ethereal/packet-bootp.c 1.12 +3 -3 ethereal/packet-bpdu.c 1.24 +2 -2 ethereal/packet-cdp.c 1.12 +19 -19 ethereal/packet-clnp.c 1.3 +1 -10 ethereal/packet-cops.c 1.19 +4 -4 ethereal/packet-data.c 1.9 +2 -17 ethereal/packet-ddtp.c 1.4 +9 -9 ethereal/packet-diameter.c 1.49 +3 -3 ethereal/packet-dns.c 1.5 +4 -4 ethereal/packet-eigrp.c 1.5 +2 -2 ethereal/packet-esis.c 1.43 +7 -7 ethereal/packet-eth.c 1.6 +17 -24 ethereal/packet-ethertype.c 1.37 +2 -2 ethereal/packet-fddi.c 1.17 +3 -3 ethereal/packet-ftp.c 1.16 +9 -9 ethereal/packet-giop.c 1.24 +6 -4 ethereal/packet-gre.c 1.11 +14 -21 ethereal/packet-h1.c 1.6 +3 -3 ethereal/packet-hsrp.c 1.20 +6 -6 ethereal/packet-http.c 1.18 +9 -9 ethereal/packet-icmpv6.c 1.10 +2 -2 ethereal/packet-icp.c 1.19 +2 -2 ethereal/packet-icq.c 1.8 +2 -2 ethereal/packet-imap.c 1.100 +15 -22 ethereal/packet-ip.c 1.11 +3 -3 ethereal/packet-ipp.c 1.19 +8 -8 ethereal/packet-ipsec.c 1.40 +8 -8 ethereal/packet-ipv6.c 1.63 +13 -54 ethereal/packet-ipx.c 1.9 +2 -2 ethereal/packet-ipx.h 1.7 +2 -2 ethereal/packet-irc.c 1.24 +17 -17 ethereal/packet-isakmp.c 1.12 +2 -2 ethereal/packet-isis.c 1.14 +3 -3 ethereal/packet-isl.c 1.14 +2 -2 ethereal/packet-l2tp.c 1.12 +3 -3 ethereal/packet-lapd.c 1.13 +2 -2 ethereal/packet-ldap.c 1.66 +8 -9 ethereal/packet-llc.c 1.21 +5 -5 ethereal/packet-lpd.c 1.8 +2 -2 ethereal/packet-mapi.c 1.6 +2 -2 ethereal/packet-mip.c 1.8 +3 -3 ethereal/packet-mpls.c 1.7 +5 -4 ethereal/packet-msproxy.c 1.22 +3 -3 ethereal/packet-nbipx.c 1.44 +6 -6 ethereal/packet-nbns.c 1.39 +2 -10 ethereal/packet-ncp.c 1.21 +3 -3 ethereal/packet-netbios.c 1.11 +2 -2 ethereal/packet-nntp.c 1.14 +3 -3 ethereal/packet-ntp.c 1.26 +3 -3 ethereal/packet-null.c 1.34 +6 -6 ethereal/packet-osi.c 1.26 +3 -3 ethereal/packet-ospf.c 1.15 +2 -2 ethereal/packet-pim.c 1.16 +3 -3 ethereal/packet-pop.c 1.38 +3 -3 ethereal/packet-ppp.c 1.9 +3 -3 ethereal/packet-pppoe.c 1.11 +4 -4 ethereal/packet-pptp.c 1.3 +5 -17 ethereal/packet-quake.c 1.16 +5 -5 ethereal/packet-radius.c 1.17 +5 -5 ethereal/packet-rip.c 1.13 +2 -2 ethereal/packet-ripng.c 1.7 +2 -2 ethereal/packet-rlogin.c 1.34 +4 -4 ethereal/packet-rpc.c 1.25 +2 -2 ethereal/packet-rsvp.c 1.15 +6 -4 ethereal/packet-rtsp.c 1.13 +3 -3 ethereal/packet-rx.c 1.9 +2 -2 ethereal/packet-sap.c 1.3 +6 -15 ethereal/packet-sctp.c 1.17 +4 -4 ethereal/packet-sna.c 1.46 +9 -9 ethereal/packet-snmp.c 1.8 +4 -3 ethereal/packet-socks.c 1.12 +3 -3 ethereal/packet-srvloc.c 1.9 +2 -2 ethereal/packet-sscop.c 1.5 +1 -15 ethereal/packet-syslog.c 1.6 +3 -3 ethereal/packet-tacacs.c 1.79 +11 -15 ethereal/packet-tcp.c 1.14 +2 -2 ethereal/packet-telnet.c 1.7 +2 -2 ethereal/packet-time.c 1.8 +8 -8 ethereal/packet-tns.c 1.45 +2 -2 ethereal/packet-tr.c 1.74 +13 -17 ethereal/packet-udp.c 1.11 +2 -2 ethereal/packet-v120.c 1.17 +6 -6 ethereal/packet-vines.c 1.18 +4 -4 ethereal/packet-vlan.c 1.7 +4 -4 ethereal/packet-vrrp.c 1.9 +3 -3 ethereal/packet-wccp.c 1.8 +2 -2 ethereal/packet-who.c 1.10 +6 -6 ethereal/packet-x11.c 1.34 +2 -2 ethereal/packet-x25.c 1.9 +2 -2 ethereal/packet-yhoo.c 1.97 +230 -23 ethereal/packet.c 1.191 +18 -11 ethereal/packet.h
- Prev by Date: [ethereal-cvs] cvs commit: ethereal packet-clnp.c
- Next by Date: [ethereal-cvs] cvs commit: ethereal conversation.c
- Previous by thread: [ethereal-cvs] cvs commit: ethereal packet-clnp.c
- Next by thread: [ethereal-cvs] cvs commit: ethereal conversation.c
- Index(es):