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

ldap: remove dead increment (found by clang). 

Small indentation fixes while here.

Change-Id: Id1d0a0e9556e5910f5cddfc442549eb2f5fc8a3c
Reviewed-on: https://code.wireshark.org/review/33721
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2019-06-23 23:59:32 +02:00 committed by Anders Broman
parent 266e4bafb6
commit 3ae9831cb1
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/asn1/ldap/packet-ldap-template.c
View File

@ -1569,7 +1569,7 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
old_offset = offset + 4;
item = proto_tree_add_item(tree, hf_mscldap_netlogon_ipaddress, tvb, old_offset, 4, ENC_BIG_ENDIAN);
if (tree){
if (tree) {
proto_tree *subtree;
subtree = proto_item_add_subtree(item, ett_mscldap_ipdetails);
@ -1584,21 +1584,16 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
/* get IP address */
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
offset +=4;
/* skip the 8 bytes of zeros in the sockaddr structure */
offset += 8;
}
}
break;
}
/* complete the decode with the version and token details */
/* complete the decode with the version and token details */
offset = len-8;
offset = len - 8;
/* NETLOGON_NT_VERISON Options (MS-ADTS 7.3.1.1) */
offset = dissect_mscldap_ntver_flags(tree, tvb, offset);

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

@ -4479,7 +4479,7 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
old_offset = offset + 4;
item = proto_tree_add_item(tree, hf_mscldap_netlogon_ipaddress, tvb, old_offset, 4, ENC_BIG_ENDIAN);
if (tree){
if (tree) {
proto_tree *subtree;
subtree = proto_item_add_subtree(item, ett_mscldap_ipdetails);
@ -4494,21 +4494,16 @@ static int dissect_NetLogon_PDU(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
/* get IP address */
proto_tree_add_item(subtree, hf_mscldap_netlogon_ipaddress_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN);
offset +=4;
/* skip the 8 bytes of zeros in the sockaddr structure */
offset += 8;
}
}
break;
}
/* complete the decode with the version and token details */
/* complete the decode with the version and token details */
offset = len-8;
offset = len - 8;
/* NETLOGON_NT_VERISON Options (MS-ADTS 7.3.1.1) */
offset = dissect_mscldap_ntver_flags(tree, tvb, offset);