summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-http.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-03-13 07:51:45 -0400
committerMichael Mann <mmann78@netscape.net>2016-03-17 00:05:17 +0000
commite37275bfdee7a0ea4745def144d4a0e5c62e282d (patch)
treee556a0170b2a35bd4bf975823de4205f7d30ba09 /epan/dissectors/packet-http.c
parentb46fe7e95ae09c062ec066838f05b2c42a3b2726 (diff)
downloadwireshark-e37275bfdee7a0ea4745def144d4a0e5c62e282d.tar.gz
Associate dissector tables and heuristic subdissector lists with a protocol.
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-http.c')
-rw-r--r--epan/dissectors/packet-http.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index b7261eb8e4..7665b91f57 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -3506,7 +3506,7 @@ proto_register_http(void)
* HTTP on a specific non-HTTP port.
*/
port_subdissector_table = register_dissector_table("http.port",
- "TCP port for protocols using HTTP", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
+ "TCP port for protocols using HTTP", proto_http, FT_UINT16, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
/*
* Dissectors can register themselves in this table.
@@ -3515,14 +3515,14 @@ proto_register_http(void)
*/
media_type_subdissector_table =
register_dissector_table("media_type",
- "Internet media type", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
+ "Internet media type", proto_http, FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
/*
* Heuristic dissectors SHOULD register themselves in
* this table using the standard heur_dissector_add()
* function.
*/
- heur_subdissector_list = register_heur_dissector_list("http");
+ heur_subdissector_list = register_heur_dissector_list("http", proto_http);
/*
* Register for tapping