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

rsync: Fix port pref 

The port pref value is used in a callback, so convert that to
retrieving a range. Also, remove the old preference (it was
converted to use an auto preference some time ago but the
duplicate preference wasn't removed.)

Ping #14319
This commit is contained in:
John Thacker 2022-08-04 07:50:27 -04:00
parent 452b5e3e0f
commit baf61478e4
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-rsync.c
View File

@ -78,7 +78,7 @@ static dissector_handle_t rsync_handle;
#define TCP_PORT_RSYNC 873
static guint glb_rsync_tcp_port = TCP_PORT_RSYNC;
static range_t *glb_rsync_tcp_range = NULL;
#define VERSION_LEN 4 /* 2 digits for main version; '.'; 1 digit for sub version */
@ -121,7 +121,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
col_clear(pinfo->cinfo, COL_INFO);
me = pinfo->srcport == glb_rsync_tcp_port ? SERVER : CLIENT;
me = value_is_in_range(glb_rsync_tcp_range, pinfo->srcport) ? SERVER : CLIENT;
conversation = find_or_create_conversation(pinfo);
@ -271,7 +271,7 @@ static void
apply_rsync_prefs(void)
{
/* Rsync uses the port preference to determine client/server */
glb_rsync_tcp_port = prefs_get_uint_value("rsync", "tcp.port");
glb_rsync_tcp_range = prefs_get_range_value("rsync", "tcp.port");
}
/* Register protocol with Wireshark. */
@ -332,11 +332,6 @@ proto_register_rsync(void)
proto_register_subtree_array(ett, array_length(ett));
rsync_module = prefs_register_protocol(proto_rsync, apply_rsync_prefs);
prefs_register_uint_preference(rsync_module, "tcp_port",
"rsync TCP Port",
"Set the TCP port for RSYNC messages",
10,
&glb_rsync_tcp_port);
prefs_register_bool_preference(rsync_module, "desegment",
"Reassemble RSYNC messages spanning multiple TCP segments",
"Whether the RSYNC dissector should reassemble messages spanning multiple TCP segments."