diff options
| -rw-r--r-- | asn1/ldap/ldap.cnf | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-ldap.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index dfad13183f..d4729418a4 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -125,11 +125,12 @@ PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy" /* XXX: the count will not work if the results span multiple TCP packets */ - if(ldap_info && tree) { /* only count once - on tree pass */ + if(ldap_info) { /* only count once */ switch(ProtocolOp) { case LDAP_RES_SEARCH_ENTRY: - ldap_info->num_results++; + if (!actx->pinfo->fd->flags.visited) + ldap_info->num_results++; proto_item_append_text(tree, " [%d result%s]", ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s"); @@ -144,7 +145,6 @@ PasswordPolicyResponseValue B "1.3.6.1.4.1.42.2.27.8.5.1" "passwordPolicy" proto_item_append_text(tree, " [%d result%s]", ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s"); - ldap_info->num_results = 0; break; default: break; diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index c36b05095d..803a7efa4c 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -3183,11 +3183,12 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /* XXX: the count will not work if the results span multiple TCP packets */ - if(ldap_info && tree) { /* only count once - on tree pass */ + if(ldap_info) { /* only count once */ switch(ProtocolOp) { case LDAP_RES_SEARCH_ENTRY: - ldap_info->num_results++; + if (!actx->pinfo->fd->flags.visited) + ldap_info->num_results++; proto_item_append_text(tree, " [%d result%s]", ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s"); @@ -3202,7 +3203,6 @@ dissect_ldap_ProtocolOp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset proto_item_append_text(tree, " [%d result%s]", ldap_info->num_results, ldap_info->num_results == 1 ? "" : "s"); - ldap_info->num_results = 0; break; default: break; |