Combine Decode As and port preferences for tcp.port dissector table.
authorMichael Mann <mmann78@netscape.net>
Fri, 7 Oct 2016 20:25:01 +0000 (16:25 -0400)
committerMichael Mann <mmann78@netscape.net>
Sat, 8 Oct 2016 02:44:53 +0000 (02:44 +0000)
commit268841f3e00b7cf0f16c81dd2b3b952172130b8b
tree359e01cf5eba83308760531888713fe0ff0bc10b
parent11d3224142c0531879fb8e415daf9639a4eace66
Combine Decode As and port preferences for tcp.port dissector table.

This patch introduces new APIs to allow dissectors to have a preference for
a (TCP) port, but the underlying data is actually part of Decode As functionality.
For now the APIs are intentionally separate from the regular APIs that register a
dissector within a dissector table.  It may be possible to eventually combine the
two so that all dissectors that register with a dissector table have an opportunity
to "automatically" have a preference to adjust the "table value" through the
preferences dialog.

The tcp.port dissector table was used as the guinea pig.  This will eventually be
expanded to other dissector tables as well (most notably UDP ports).  Some
dissectors that "shared" a TCP/UDP port preference were also converted. It also
removed the need for some preference callback functions (mostly when the callback
function was the proto_reg_handoff function) so there is cleanup around that.

Dissectors that has a port preference whose default was 0 were switched to using
the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference

Also added comments for TCP ports used that aren't IANA registered.

Change-Id: I99604f95d426ad345f4b494598d94178b886eb67
Reviewed-on: https://code.wireshark.org/review/17724
Reviewed-by: Michael Mann <mmann78@netscape.net>
309 files changed:
debian/libwireshark0.symbols
doc/README.dissector
doc/packet-PROTOABBREV.c
epan/decode_as.c
epan/decode_as.h
epan/dissectors/asn1/c1222/packet-c1222-template.c
epan/dissectors/asn1/cmp/packet-cmp-template.c
epan/dissectors/asn1/h245/packet-h245-template.c
epan/dissectors/asn1/h248/packet-h248-template.c
epan/dissectors/asn1/h501/packet-h501-template.c
epan/dissectors/asn1/idmp/packet-idmp-template.c
epan/dissectors/asn1/ilp/packet-ilp-template.c
epan/dissectors/asn1/kerberos/packet-kerberos-template.c
epan/dissectors/asn1/ldap/packet-ldap-template.c
epan/dissectors/asn1/sabp/packet-sabp-template.c
epan/dissectors/asn1/smrse/packet-smrse-template.c
epan/dissectors/asn1/snmp/packet-snmp-template.c
epan/dissectors/asn1/t38/packet-t38-template.c
epan/dissectors/asn1/ulp/packet-ulp-template.c
epan/dissectors/packet-3com-njack.c
epan/dissectors/packet-9p.c
epan/dissectors/packet-acap.c
epan/dissectors/packet-adb.c
epan/dissectors/packet-adb_cs.c
epan/dissectors/packet-agentx.c
epan/dissectors/packet-aim-oft.c
epan/dissectors/packet-aim.c
epan/dissectors/packet-ajp13.c
epan/dissectors/packet-alljoyn.c
epan/dissectors/packet-amqp.c
epan/dissectors/packet-ancp.c
epan/dissectors/packet-aol.c
epan/dissectors/packet-asap.c
epan/dissectors/packet-assa_r3.c
epan/dissectors/packet-atmtcp.c
epan/dissectors/packet-ax4000.c
epan/dissectors/packet-banana.c
epan/dissectors/packet-beep.c
epan/dissectors/packet-ber.c
epan/dissectors/packet-bfcp.c
epan/dissectors/packet-bgp.c
epan/dissectors/packet-bitcoin.c
epan/dissectors/packet-bittorrent.c
epan/dissectors/packet-bmp.c
epan/dissectors/packet-bzr.c
epan/dissectors/packet-c1222.c
epan/dissectors/packet-cast.c
epan/dissectors/packet-chargen.c
epan/dissectors/packet-cigi.c
epan/dissectors/packet-cimd.c
epan/dissectors/packet-classicstun.c
epan/dissectors/packet-cmp.c
epan/dissectors/packet-cmpp.c
epan/dissectors/packet-coap.c
epan/dissectors/packet-cops.c
epan/dissectors/packet-couchbase.c
epan/dissectors/packet-cp2179.c
epan/dissectors/packet-cql.c
epan/dissectors/packet-ctdb.c
epan/dissectors/packet-daytime.c
epan/dissectors/packet-db-lsp.c
epan/dissectors/packet-dbus.c
epan/dissectors/packet-dcm.c
epan/dissectors/packet-dhcp-failover.c
epan/dissectors/packet-dhcpv6.c
epan/dissectors/packet-diameter.c
epan/dissectors/packet-distcc.c
epan/dissectors/packet-dji-uav.c
epan/dissectors/packet-dlm3.c
epan/dissectors/packet-dlsw.c
epan/dissectors/packet-dnp.c
epan/dissectors/packet-dns.c
epan/dissectors/packet-dof.c
epan/dissectors/packet-dsi.c
epan/dissectors/packet-dtcp-ip.c
epan/dissectors/packet-dtn.c
epan/dissectors/packet-dtpt.c
epan/dissectors/packet-echo.c
epan/dissectors/packet-ecmp.c
epan/dissectors/packet-edonkey.c
epan/dissectors/packet-elasticsearch.c
epan/dissectors/packet-elcom.c
epan/dissectors/packet-enip.c
epan/dissectors/packet-enttec.c
epan/dissectors/packet-epmd.c
epan/dissectors/packet-erldp.c
epan/dissectors/packet-etch.c
epan/dissectors/packet-exec.c
epan/dissectors/packet-fcgi.c
epan/dissectors/packet-fcip.c
epan/dissectors/packet-ff.c
epan/dissectors/packet-finger.c
epan/dissectors/packet-fix.c
epan/dissectors/packet-forces.c
epan/dissectors/packet-ftp.c
epan/dissectors/packet-gadu-gadu.c
epan/dissectors/packet-gdb.c
epan/dissectors/packet-gdsdb.c
epan/dissectors/packet-gearman.c
epan/dissectors/packet-ged125.c
epan/dissectors/packet-gift.c
epan/dissectors/packet-giop.c
epan/dissectors/packet-git.c
epan/dissectors/packet-gnutella.c
epan/dissectors/packet-gopher.c
epan/dissectors/packet-gsm_ipa.c
epan/dissectors/packet-gtp.c
epan/dissectors/packet-h223.c
epan/dissectors/packet-h245.c
epan/dissectors/packet-h248.c
epan/dissectors/packet-h248_annex_c.c
epan/dissectors/packet-h501.c
epan/dissectors/packet-hartip.c
epan/dissectors/packet-hazelcast.c
epan/dissectors/packet-hcrt.c
epan/dissectors/packet-hdfs.c
epan/dissectors/packet-hdfsdata.c
epan/dissectors/packet-hiqnet.c
epan/dissectors/packet-hislip.c
epan/dissectors/packet-hpfeeds.c
epan/dissectors/packet-hsms.c
epan/dissectors/packet-http.c
epan/dissectors/packet-http.h
epan/dissectors/packet-http2.c
epan/dissectors/packet-icap.c
epan/dissectors/packet-icep.c
epan/dissectors/packet-idmp.c
epan/dissectors/packet-iec104.c
epan/dissectors/packet-ifcp.c
epan/dissectors/packet-ilp.c
epan/dissectors/packet-imap.c
epan/dissectors/packet-ipdc.c
epan/dissectors/packet-ipdr.c
epan/dissectors/packet-ipsec-tcp.c
epan/dissectors/packet-ipsi-ctl.c
epan/dissectors/packet-irc.c
epan/dissectors/packet-isakmp.c
epan/dissectors/packet-iscsi.c
epan/dissectors/packet-isns.c
epan/dissectors/packet-iso8583.c
epan/dissectors/packet-kafka.c
epan/dissectors/packet-kdsp.c
epan/dissectors/packet-kerberos.c
epan/dissectors/packet-kingfisher.c
epan/dissectors/packet-kismet.c
epan/dissectors/packet-knet.c
epan/dissectors/packet-kpasswd.c
epan/dissectors/packet-kt.c
epan/dissectors/packet-laplink.c
epan/dissectors/packet-lbmpdmtcp.c
epan/dissectors/packet-lbttcp.c
epan/dissectors/packet-ldap.c
epan/dissectors/packet-ldp.c
epan/dissectors/packet-lg8979.c
epan/dissectors/packet-linx.c
epan/dissectors/packet-lisp-tcp.c
epan/dissectors/packet-llrp.c
epan/dissectors/packet-logcat.c
epan/dissectors/packet-lpd.c
epan/dissectors/packet-lsc.c
epan/dissectors/packet-mausb.c
epan/dissectors/packet-mbtcp.c
epan/dissectors/packet-megaco.c
epan/dissectors/packet-memcache.c
epan/dissectors/packet-mgcp.c
epan/dissectors/packet-mih.c
epan/dissectors/packet-mikey.c
epan/dissectors/packet-mongo.c
epan/dissectors/packet-mp2t.c
epan/dissectors/packet-mpeg-dsmcc.c
epan/dissectors/packet-mq.c
epan/dissectors/packet-mqtt.c
epan/dissectors/packet-mrcpv2.c
epan/dissectors/packet-ms-mms.c
epan/dissectors/packet-msdp.c
epan/dissectors/packet-msn-messenger.c
epan/dissectors/packet-msrp.c
epan/dissectors/packet-mysql.c
epan/dissectors/packet-nasdaq-soup.c
epan/dissectors/packet-nbt.c
epan/dissectors/packet-ncp.c
epan/dissectors/packet-ndmp.c
epan/dissectors/packet-ndps.c
epan/dissectors/packet-ndps.h
epan/dissectors/packet-netflow.c
epan/dissectors/packet-netsync.c
epan/dissectors/packet-nntp.c
epan/dissectors/packet-ntp.c
epan/dissectors/packet-obex.c
epan/dissectors/packet-ocfs2.c
epan/dissectors/packet-omapi.c
epan/dissectors/packet-opa-fe.c
epan/dissectors/packet-openflow.c
epan/dissectors/packet-openvpn.c
epan/dissectors/packet-openwire.c
epan/dissectors/packet-opsi.c
epan/dissectors/packet-optommp.c
epan/dissectors/packet-osc.c
epan/dissectors/packet-osi.c
epan/dissectors/packet-ouch.c
epan/dissectors/packet-pcep.c
epan/dissectors/packet-pcp.c
epan/dissectors/packet-pdc.c
epan/dissectors/packet-pgsql.c
epan/dissectors/packet-pmproxy.c
epan/dissectors/packet-pop.c
epan/dissectors/packet-pptp.c
epan/dissectors/packet-ptpip.c
epan/dissectors/packet-pvfs2.c
epan/dissectors/packet-reload-framing.c
epan/dissectors/packet-riemann.c
epan/dissectors/packet-rlogin.c
epan/dissectors/packet-rmi.c
epan/dissectors/packet-rpc.c
epan/dissectors/packet-rpki-rtr.c
epan/dissectors/packet-rsh.c
epan/dissectors/packet-rsip.c
epan/dissectors/packet-rsync.c
epan/dissectors/packet-rtmpt.c
epan/dissectors/packet-rtpproxy.c
epan/dissectors/packet-rtsp.c
epan/dissectors/packet-s5066dts.c
epan/dissectors/packet-s5066sis.c
epan/dissectors/packet-sabp.c
epan/dissectors/packet-sametime.c
epan/dissectors/packet-sasp.c
epan/dissectors/packet-sccp.c
epan/dissectors/packet-scop.c
epan/dissectors/packet-selfm.c
epan/dissectors/packet-sigcomp.c
epan/dissectors/packet-simple.c
epan/dissectors/packet-simulcrypt.c
epan/dissectors/packet-sip.c
epan/dissectors/packet-skinny.c
epan/dissectors/packet-skinny.c.in
epan/dissectors/packet-skype.c
epan/dissectors/packet-slsk.c
epan/dissectors/packet-sml.c
epan/dissectors/packet-smpp.c
epan/dissectors/packet-smrse.c
epan/dissectors/packet-smtp.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-socks.c
epan/dissectors/packet-soupbintcp.c
epan/dissectors/packet-spdy.c
epan/dissectors/packet-spice.c
epan/dissectors/packet-srvloc.c
epan/dissectors/packet-ssh.c
epan/dissectors/packet-stun.c
epan/dissectors/packet-synergy.c
epan/dissectors/packet-synphasor.c
epan/dissectors/packet-syslog.c
epan/dissectors/packet-t38.c
epan/dissectors/packet-tacacs.c
epan/dissectors/packet-tcpros.c
epan/dissectors/packet-tds.c
epan/dissectors/packet-telnet.c
epan/dissectors/packet-tfp.c
epan/dissectors/packet-time.c
epan/dissectors/packet-tipc.c
epan/dissectors/packet-tivoconnect.c
epan/dissectors/packet-tns.c
epan/dissectors/packet-tpkt.c
epan/dissectors/packet-turnchannel.c
epan/dissectors/packet-tuxedo.c
epan/dissectors/packet-ucp.c
epan/dissectors/packet-ulp.c
epan/dissectors/packet-uma.c
epan/dissectors/packet-usbip.c
epan/dissectors/packet-vicp.c
epan/dissectors/packet-vnc.c
epan/dissectors/packet-vsip.c
epan/dissectors/packet-whois.c
epan/dissectors/packet-winsrepl.c
epan/dissectors/packet-wow.c
epan/dissectors/packet-x11.c
epan/dissectors/packet-xmcp.c
epan/dissectors/packet-xml.c
epan/dissectors/packet-xmpp.c
epan/dissectors/packet-xot.c
epan/dissectors/packet-yami.c
epan/dissectors/packet-zebra.c
epan/dissectors/packet-zvt.c
epan/packet.c
epan/packet.h
epan/prefs-int.h
epan/prefs.c
epan/prefs.h
epan/range.h
plugins/ethercat/packet-ams.c
plugins/ethercat/packet-ethercat-frame.c
plugins/gryphon/packet-gryphon.c
plugins/irda/packet-sir.c
plugins/opcua/opcua.c
plugins/tpg/packet-http.c
tools/pre-commit-ignore.conf
tshark.c
ui/decode_as_utils.c
ui/decode_as_utils.h
ui/gtk/decode_as_dlg.c
ui/gtk/main.c
ui/gtk/prefs_dlg.c
ui/preference_utils.c
ui/preference_utils.h
ui/qt/decode_as_dialog.cpp
ui/qt/module_preferences_scroll_area.cpp
ui/qt/preference_editor_frame.cpp
ui/qt/preferences_dialog.cpp
ui/qt/wireshark_application.cpp