wireshark/epan
Michael Mann 268841f3e0 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>
2016-10-08 02:44:53 +00:00
..
compress Remove Makefile.common files 2016-06-30 11:04:17 +00:00
crypt cmake: make WERROR_COMMON_FLAGS a normal string 2016-09-30 20:08:02 +00:00
dfilter cmake: make WERROR_COMMON_FLAGS a normal string 2016-09-30 20:08:02 +00:00
dissectors Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
ftypes cmake: make WERROR_COMMON_FLAGS a normal string 2016-09-30 20:08:02 +00:00
nghttp2 cmake: make WERROR_COMMON_FLAGS a normal string 2016-09-30 20:08:02 +00:00
wmem cmake: make WERROR_COMMON_FLAGS a normal string 2016-09-30 20:08:02 +00:00
wslua wslua: fix wslua file test failure 2016-10-02 16:47:54 +00:00
.editorconfig Add EditorConfig settings for epan/*.[ch] 2016-03-14 13:22:30 +00:00
CMakeLists.txt cmake: make WERROR_COMMON_FLAGS a normal string 2016-09-30 20:08:02 +00:00
Makefile.am Pass an HTTP message type to all HTTP subdissectors. 2016-08-22 06:34:06 +00:00
addr_and_mask.c
addr_and_mask.h
addr_resolv.c addr_resolv: use ws_strtou8 function. 2016-09-13 08:55:46 +00:00
addr_resolv.h addr_resolv: change g_hash to wmem_map. 2016-06-14 19:33:04 +00:00
address.h Add address_to_bytes API. 2016-06-22 07:47:39 +00:00
address_types.c Properly end address type search by name (CID-1362742) 2016-08-26 16:49:57 +00:00
address_types.h Add address_to_bytes API. 2016-06-22 07:47:39 +00:00
afn.c
afn.h
aftypes.c
aftypes.h
app_mem_usage.c app_mem_usage: rename shadow variable 2016-06-26 06:04:09 +00:00
app_mem_usage.h app_mem_usage: rename shadow variable 2016-06-26 06:04:09 +00:00
arcnet_pids.h
arptypes.h
asm_utils.c
asm_utils.h
asm_utils_win32_x86.asm
asn1.c Fix checkAPI.pl warnings about printf 2016-07-25 04:26:50 +00:00
asn1.h
ax25_pids.h
bridged_pids.h
capture_dissectors.c The C standard requires <stdlib.h> for getenv() and abort(). 2016-06-21 23:34:45 +00:00
capture_dissectors.h
charsets.c
charsets.h
chdlctypes.h
circuit.c circuit: rename shadow variable 2016-06-26 06:05:51 +00:00
circuit.h circuit(.h): fix indent (and add modelines) 2016-06-27 01:20:56 +00:00
color_filters.c Color filters: Initialize a variable. 2016-10-04 16:11:14 +00:00
color_filters.h Qt: Color _ANY and _TCP sequence analysis items. 2016-06-01 04:27:13 +00:00
column-info.h Allow control of individual columns to be (un)writable. 2016-06-15 06:03:57 +00:00
column-utils.c Use ws_printf routines everywhere in column-utils.c. 2016-07-22 21:57:13 +00:00
column-utils.h Allow control of individual columns to be (un)writable. 2016-06-15 06:03:57 +00:00
column.c Qt: Conversation time column updates. 2016-09-02 23:53:37 +00:00
column.h
conv_id.h
conversation.c conversation: rename shadow variable 2016-06-26 06:03:14 +00:00
conversation.h conversation: rename shadow variable 2016-06-26 06:03:14 +00:00
conversation_debug.h
conversation_table.c Move AT_USB to inside USB dissector. 2016-06-22 04:57:43 +00:00
conversation_table.h
crc6-tvb.c
crc6-tvb.h
crc8-tvb.c
crc8-tvb.h
crc10-tvb.c
crc10-tvb.h
crc16-tvb.c add functions to calculate the CRC of an ISO14443-A message 2016-02-08 06:01:05 +00:00
crc16-tvb.h add functions to calculate the CRC of an ISO14443-A message 2016-02-08 06:01:05 +00:00
crc32-tvb.c
crc32-tvb.h
decode_as.c Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
decode_as.h Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
diam_dict.h
diam_dict.l diam_dict.l: remove use of strdup 2016-08-31 16:52:27 +00:00
disabled_protos.c Fix some of the checkAPIs.pl warnings for g_warning. 2016-07-26 04:08:50 +00:00
disabled_protos.h
dissector_filters.c
dissector_filters.h Qt: Make conversation menu items static. 2016-03-28 16:27:41 +00:00
doxygen.cfg.in
dtd.h
dtd_grammar.lemon
dtd_parse.h Make the Flex scanners and YACC parser in libraries reentrant. 2016-04-03 22:21:29 +00:00
dtd_parse.l Make the Flex scanners and YACC parser in libraries reentrant. 2016-04-03 22:21:29 +00:00
dtd_preparse.l Make the Flex scanners and YACC parser in libraries reentrant. 2016-04-03 22:21:29 +00:00
dvb_chartbl.c
dvb_chartbl.h
dwarf.c
dwarf.h
eap.h
eapol_keydes_types.h
enterprise-numbers [Automatic update for 2016-10-02] 2016-10-02 15:10:47 +00:00
epan-int.h
epan.c Display Lua release version in about dialog 2016-08-09 19:00:12 +00:00
epan.h
epan_dissect.h
etypes.h etypes: Add ETHERTYPE_LINK_CTL 2016-08-18 20:47:32 +00:00
ex-opt.c ex-opt: rename shadow variable 2016-06-26 06:02:45 +00:00
ex-opt.h ex-opt: rename shadow variable 2016-06-26 06:02:45 +00:00
except.c Fix checkAPI.pl warnings about printf 2016-07-25 04:26:50 +00:00
except.h Use a single WS_NORETURN macro 2016-04-08 17:34:10 +00:00
exceptions.h Fix test-programs to build with -Werror 2016-02-11 13:53:12 +00:00
exntest.c exntest.c: Create local functions to handle "nesting" TRY/CATCH macros to fix shadow warnings. 2016-07-15 01:48:49 +00:00
expert.c Add PI_DEPRECATED expert info group 2016-08-05 13:59:25 +00:00
expert.h
exported_pdu.c Add OSI Layer 4 to exported PDU to handle TCP and UDP payloads. 2016-08-01 15:19:59 +00:00
exported_pdu.h Add OSI Layer 4 to exported PDU to handle TCP and UDP payloads. 2016-08-01 15:19:59 +00:00
filter_expressions.c filter: rename shadow var 2016-06-26 06:02:09 +00:00
filter_expressions.h filter: rename shadow var 2016-06-26 06:02:09 +00:00
follow.c Bring back packet_num in "Follow Stream" 2016-02-10 10:09:39 +00:00
follow.h Qt: Add UTF-16 output to Follow Stream. 2016-06-03 16:20:57 +00:00
frame_data.c
frame_data.h Include ws_diag_control.h in config.h 2016-04-04 23:05:31 +00:00
frame_data_sequence.c
frame_data_sequence.h
funnel.c
funnel.h
garrayfix.h
geoip_db.c Add GeoIP database UN*X system path 2016-07-30 12:23:50 +00:00
geoip_db.h
golay.c
golay.h
guid-utils.c Don't use _snwprintf (use StringCchPrintf instead). 2016-04-12 04:11:21 +00:00
guid-utils.h
iana_charsets.c Remove the MIBenum stuff from the WAP code. 2016-05-08 21:15:43 +00:00
iana_charsets.h Get rid of extra blank line. 2016-05-08 21:17:30 +00:00
iax2_codec_type.h
in_cksum.c Bump GLib minimum required version to 2.22.0 2016-08-04 16:13:41 +00:00
in_cksum.h
ip_opts.h
ipproto.c Remove synchronous DNS name resolution 2016-04-04 06:49:55 +00:00
ipproto.h
ipv4.c
ipv4.h
ipv6.h Move a declaration to wsutil 2016-04-09 23:36:30 +00:00
lapd_sapi.h
llcsaps.h
media_params.c See if *this* convinces the compiler that valuelen and value will be set. 2016-08-23 03:36:55 +00:00
media_params.h Handle quoted-pairs in quoted-strings correctly. 2016-08-23 00:53:46 +00:00
next_tvb.c
next_tvb.h
nlpid.h
oids.c Fix checkAPI warning for printf. 2016-08-02 01:54:37 +00:00
oids.h
oids_test.c
osi-utils.c Add address_to_bytes API. 2016-06-22 07:47:39 +00:00
osi-utils.h
oui.c LLDP: Add Avaya IP Phone OUI Subtypes 2016-08-13 23:01:56 +00:00
oui.h LLDP: Add Avaya IP Phone OUI Subtypes 2016-08-13 23:01:56 +00:00
packet-range.c
packet-range.h
packet.c Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
packet.h Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
packet_info.h
params.h
plugin_if.c Add some casts to void * to fix (pedantic) argument mismatch notes 2016-02-15 00:00:34 +00:00
plugin_if.h
ppptypes.h
prefs-int.h Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
prefs.c Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
prefs.h Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
print.c set PDML and PSML encoding to UTF-8. replace fputs() with fprintf() in writing PSML and PDML preambles for more consistent code formatting. 2016-09-29 01:20:05 +00:00
print.h tshark fields filter added for other outputs 2016-06-29 08:29:16 +00:00
print.ps
print_stream.c Speed up print_line_text. 2016-06-30 19:21:04 +00:00
print_stream.h Speed up print_line_text. 2016-06-30 19:21:04 +00:00
proto.c proto.c use g_list_prepend when adding heuristic dissectors and plugins. 2016-09-29 12:55:21 +00:00
proto.h proto_tree_add_item_ret_(u)int/proto_tree_add_bitmask_with_flags_ret_uint64: return real value 2016-09-28 06:07:01 +00:00
proto_data.c p_XXX_proto_data: only allow the use of pinfo and file scopes 2016-09-17 15:46:36 +00:00
proto_data.h p_XXX_proto_data: only allow the use of pinfo and file scopes 2016-09-17 15:46:36 +00:00
ps.h
ptvcursor.h
radius_dict.l Don't double-close the input. 2016-04-04 01:28:06 +00:00
range.c Add range_add_value and range_remove_value. 2016-09-22 13:49:42 +00:00
range.h Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
reassemble.c reassemble: remove special treatment for truncated data 2016-04-03 16:22:46 +00:00
reassemble.h reassemble: remove special treatment for truncated data 2016-04-03 16:22:46 +00:00
reassemble_test.c Another attempt to squash warnings from printf use in reassemble_test.c 2016-07-16 03:58:34 +00:00
reedsolomon.c Cleanup some checkAPI warnings that were missed in previous patches. 2016-07-26 17:15:38 +00:00
reedsolomon.h
req_resp_hdrs.c
req_resp_hdrs.h
rtd_table.c
rtd_table.h
rtp_pt.h
sctpppids.h
show_exception.c Fix some of the checkAPIs.pl warnings for g_warning. 2016-07-26 04:08:50 +00:00
show_exception.h
slow_protocol_subtypes.h
sminmpec.c [Automatic update for 2016-10-02] 2016-10-02 15:10:47 +00:00
sminmpec.h Add define for vendor dacom 2016-09-20 11:46:21 +00:00
srt_table.c srt: rename shadow variable 2016-06-26 06:01:22 +00:00
srt_table.h srt: rename shadow variable 2016-06-26 06:01:22 +00:00
stat_groups.h
stat_tap_ui.c
stat_tap_ui.h qt: move free_stat_tables from SimpleStatisticsDialog::fillTree to ~SimpleStatisticsDialog. 2016-06-16 04:01:57 +00:00
stats_tree.c Cleanup indentation 2016-02-08 05:51:14 +00:00
stats_tree.h
stats_tree_priv.h stats_tree: rename shadow variable 2016-06-26 06:00:43 +00:00
stream.c
stream.h
strutil.c
strutil.h
t35.c
t35.h
tap-voip.h
tap.c When regestering taps, only loop trough the list of taps once when adding 2016-09-28 12:36:26 +00:00
tap.h Revert "tap: change glib functions to wmem." 2016-06-19 10:47:10 +00:00
tfs.c Adding a dissector for the Distributed Object Framework protocol. 2016-04-14 12:27:24 +00:00
tfs.h Adding a dissector for the Distributed Object Framework protocol. 2016-04-14 12:27:24 +00:00
time_fmt.h
timestamp.c
timestamp.h
timestats.c
timestats.h
to_str-int.h
to_str.c Improve support for single-character fields and filter expressions. 2016-09-19 02:51:13 +00:00
to_str.h Improve support for single-character fields and filter expressions. 2016-09-19 02:51:13 +00:00
tpg.c
tpg.h
tvbparse.c tvbparse: fix memleak 2016-08-28 22:07:22 +00:00
tvbparse.h tvbparse: change g_hash_table to wmem_map. 2016-06-14 19:34:12 +00:00
tvbtest.c tvbtest.c - Fix printf style argument types 2016-07-15 01:49:33 +00:00
tvbuff-int.h
tvbuff.c clean up some comments in tvb_find_line_end() 2016-06-02 08:31:01 +00:00
tvbuff.h
tvbuff_base64.c
tvbuff_composite.c Fix display of composite tvbs in GUI 2016-05-31 16:53:41 +00:00
tvbuff_real.c
tvbuff_subset.c
tvbuff_zlib.c tvbuff_zlib: Check if the given offset and compressed length are indeed valid before trying to allocate memory 2016-10-05 03:28:31 +00:00
uat-int.h uat: allow insertion of new record at arbitrary index 2016-10-01 12:08:02 +00:00
uat.c uat: allow insertion of new record at arbitrary index 2016-10-01 12:08:02 +00:00
uat.h uat: fix PT_TXTMOD_HEXBYTES/PT_TXTMOD_ENUM comments 2016-10-04 01:11:14 +00:00
uat_load.l uat: fix memleak after parsing and on errors 2016-09-01 21:11:51 +00:00
value_string.c Allow up to 64-bit values to use BASE_RANGE_STRING. 2016-08-07 07:39:12 +00:00
value_string.h Allow up to 64-bit values to use BASE_RANGE_STRING. 2016-08-07 07:39:12 +00:00
x264_prt_id.h
xdlc.c
xdlc.h