diff options
| author | Uli Heilmeier <uh@heilmeier.eu> | 2019-04-08 21:39:45 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2019-04-10 22:39:22 +0000 |
| commit | 35799f488652d1c18133cac0f6726d4f82b3cc24 (patch) | |
| tree | deea58ad1d14bd86ede68e92a351707bc3d0e769 /epan/dissectors/packet-icap.c | |
| parent | 4591286d3a397c7890441ed7eea3b4384b6bd8fa (diff) | |
ICAP: Support ICAP over TLS
IANA hasn't assigned a port for ICAPS. Therefore we default to 0
to have the "Decode as" option available.
Bug: 15684
Change-Id: I69aa89e2b0e719f9abbd4b57a5c35723203623b1
Reviewed-on: https://code.wireshark.org/review/32790
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-icap.c')
| -rw-r--r-- | epan/dissectors/packet-icap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 063fc6782c..1bd4ea4d4f 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -16,6 +16,7 @@ #include <epan/packet.h> #include <epan/strutil.h> +#include "packet-tls.h" void proto_register_icap(void); void proto_reg_handoff_icap(void); @@ -310,8 +311,13 @@ proto_reg_handoff_icap(void) http_handle = find_dissector_add_dependency("http", proto_icap); - icap_handle = create_dissector_handle(dissect_icap, proto_icap); + icap_handle = register_dissector("icap", dissect_icap, proto_icap); dissector_add_uint_with_preference("tcp.port", TCP_PORT_ICAP, icap_handle); + + /* As ICAPS port is not officially assigned by IANA + * (de facto standard is 11344), we default to 0 + * to have "decode as" available */ + ssl_dissector_add(0, icap_handle); } /* |