osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Ensure http_tcp_range gets initialized through preference callback. 

Bug: 13016
Change-Id: I814c901898790045be0e2003ebe5a8000704b8af
Reviewed-on: https://code.wireshark.org/review/18273
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-10-18 08:57:54 -04:00
parent 4a4698259c
commit 7a906dc877
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-http.c
View File

@ -34,6 +34,7 @@
#include <epan/packet.h>
#include <epan/prefs.h>
#include <epan/prefs-int.h>
#include <epan/expert.h>
#include <epan/follow.h>
#include <epan/addr_resolv.h>
@ -3266,6 +3267,9 @@ range_add_http_ssl_callback(guint32 port) {
}
static void reinit_http(void) {
pref_t *http_tcp_ports = prefs_find_preference(prefs_find_module("http"), "tcp.port");
http_tcp_range = range_copy(*http_tcp_ports->varp.range);
dissector_delete_uint_range("sctp.port", http_sctp_range, http_sctp_handle);
g_free(http_sctp_range);
http_sctp_range = range_copy(global_http_sctp_range);