diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-04-16 19:31:22 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-04-17 02:32:04 +0000 |
| commit | 8c3b36deb8d3c6aa2c7ba03a4dc72cbb5602d821 (patch) | |
| tree | 2b8ca5a34f9da3003b3702c1d7567161e6706438 /epan/dissectors/packet-cmp.c | |
| parent | 173ccf7a4664de8001ce92966ae0c68e7805e9b4 (diff) | |
Don't assume the HTTP dissector is being called from the TCP dissector.
It's not - it could be called from the SSL dissector or the SCTP
dissector. Create separate dissectors for all of them; they can, if
passed appropriate metadata in the "data" argument, process it
appropriately for the type of metadata the calling tissector supplies.
Bug: 12344
Change-Id: I8d9a2f3173e6de42b31993bbb6c81d161f68bf8c
Reviewed-on: https://code.wireshark.org/review/14944
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-cmp.c')
| -rw-r--r-- | epan/dissectors/packet-cmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 91fe979703..8e0bc7b492 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -2538,7 +2538,7 @@ void proto_reg_handoff_cmp(void) { dissector_delete_uint("http.port", cmp_alternate_http_port_prev, NULL); } if (cmp_alternate_http_port != 0) - http_dissector_add( cmp_alternate_http_port, cmp_http_handle); + http_tcp_dissector_add( cmp_alternate_http_port, cmp_http_handle); cmp_alternate_http_port_prev = cmp_alternate_http_port; } @@ -2549,7 +2549,7 @@ void proto_reg_handoff_cmp(void) { dissector_delete_uint("http.port", cmp_alternate_tcp_style_http_port_prev, NULL); } if (cmp_alternate_tcp_style_http_port != 0) - http_dissector_add( cmp_alternate_tcp_style_http_port, cmp_tcp_style_http_handle); + http_tcp_dissector_add( cmp_alternate_tcp_style_http_port, cmp_tcp_style_http_handle); cmp_alternate_tcp_style_http_port_prev = cmp_alternate_tcp_style_http_port; } |