osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

FSSO: Add support of multiple Range Port 

it is possible to have multiple range port for TSAgent

Change-Id: I7b45f30a1d1cf974ffcf62d2f19dbc30b621ec4e
Reviewed-on: https://code.wireshark.org/review/38186
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2020-08-18 09:13:04 +02:00 committed by Anders Broman
parent 95176cc52e
commit f915bc7523
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
epan/dissectors/packet-fortinet-sso.c
View File

@ -33,6 +33,7 @@ static int hf_fsso_domain = -1;
static int hf_fsso_user = -1;
static int hf_fsso_host = -1;
static int hf_fsso_version = -1;
static int hf_fsso_tsagent_number_port_range = -1;
static int hf_fsso_tsagent_port_range_min = -1;
static int hf_fsso_tsagent_port_range_max = -1;
static int hf_fsso_unknown = -1;
@ -105,21 +106,32 @@ dissect_fortinet_sso(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
offset += (string_length);
}
if(tvb_reported_length_remaining(tvb, offset)){
if(tvb_reported_length_remaining(tvb, offset)) {
guint32 number_port_range;
proto_tree_add_item(fsso_tree, hf_fsso_unknown, tvb, offset, 15, ENC_NA);
offset += 15;
proto_tree_add_item(fsso_tree, hf_fsso_unknown, tvb, offset, 5, ENC_NA);
offset += 5;
proto_tree_add_item(fsso_tree, hf_fsso_unknown, tvb, offset, 8, ENC_NA);
offset += 8;
proto_tree_add_item(fsso_tree, hf_fsso_unknown, tvb, offset, 6, ENC_NA);
offset += 6;
proto_tree_add_item(fsso_tree, hf_fsso_tsagent_port_range_min, tvb, offset, 2, ENC_BIG_ENDIAN);
/* Port Range assigned to user for TS Agent (RDP/Citrix) */
proto_tree_add_item_ret_uint(fsso_tree, hf_fsso_tsagent_number_port_range, tvb, offset, 2, ENC_BIG_ENDIAN, &number_port_range);
offset += 2;
proto_tree_add_item(fsso_tree, hf_fsso_tsagent_port_range_max, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
while (number_port_range) {
proto_tree_add_item(fsso_tree, hf_fsso_tsagent_port_range_min, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(fsso_tree, hf_fsso_tsagent_port_range_max, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
number_port_range --;
}
}
return offset;
@ -192,6 +204,10 @@ proto_register_fortinet_sso(void)
{ "Version", "fortinet_sso.version", FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL}},
{ &hf_fsso_tsagent_number_port_range,
{ "Number of Port Range", "fortinet_sso.tsagent.port_range.number", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
{ &hf_fsso_tsagent_port_range_min,
{ "Port Range (Min)", "fortinet_sso.tsagent.port_range.min", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL}},