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

iscsi also has a system port (860) registered in addition to the more common 

port (3260).

add knowledge about the registered system port for iscsi to the heuristics
so we automatically detect when iscsi is transported over this optional port.


svn path=/trunk/; revision=32881
This commit is contained in:
Ronnie Sahlberg 2010-05-18 22:00:17 +00:00
parent 1eeb3442b2
commit 415f314c53
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
epan/dissectors/packet-iscsi.c
View File

@ -89,7 +89,8 @@ static int dataDigestIsCRC32 = TRUE;
static guint dataDigestSize = 4;
static guint iscsi_port = 3260;
static guint iscsi_port = 3260;
static guint iscsi_system_port = 860;
/* Initialize the protocol and registered fields */
static int proto_iscsi = -1;
@ -2251,12 +2252,25 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean chec
if(opcode_str == NULL) {
badPdu = TRUE;
}
else if(check_port && iscsi_port != 0 &&
(((opcode & TARGET_OPCODE_BIT) && pinfo->srcport != iscsi_port) ||
(!(opcode & TARGET_OPCODE_BIT) && pinfo->destport != iscsi_port))) {
if(!badPdu && check_port) {
badPdu = TRUE;
if ((opcode & TARGET_OPCODE_BIT) && pinfo->srcport == iscsi_port) {
badPdu = FALSE;
}
if (!(opcode & TARGET_OPCODE_BIT) && pinfo->destport == iscsi_port) {
badPdu = FALSE;
}
if ((opcode & TARGET_OPCODE_BIT) && pinfo->srcport == iscsi_system_port) {
badPdu = FALSE;
}
if (!(opcode & TARGET_OPCODE_BIT) && pinfo->destport == iscsi_system_port) {
badPdu = FALSE;
}
}
else if(enable_bogosity_filter) {
if(!badPdu && enable_bogosity_filter) {
/* try and distinguish between data and real headers */
if(data_segment_len > bogus_pdu_data_length_threshold) {
badPdu = TRUE;
@ -3075,6 +3089,13 @@ proto_register_iscsi(void)
10,
&iscsi_port);
prefs_register_uint_preference(iscsi_module,
"target_system_port",
"Target system port",
"System port number of iSCSI target",
10,
&iscsi_system_port);
prefs_register_bool_preference(iscsi_module,
"enable_data_digests",
"Enable data digests",