diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2015-06-01 07:53:45 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2015-06-06 18:03:36 +0000 |
| commit | cd2e901fd9304dc456d89c54b8eed1505795d1f3 (patch) | |
| tree | 7c876e5a48121d7911a3616de7e0b43c28fd8df3 /epan/dissectors/packet-zvt.c | |
| parent | 6b65437f443a2321a8bc56652f280531e5eecfcb (diff) | |
ZVT: call zvt_set_addresses() for each apdu
the pinfo parameter is not unused btw
Change-Id: Id038979cb64e858aa0b7b44ca8c6e3d4b7d2d05e
Reviewed-on: https://code.wireshark.org/review/8798
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/packet-zvt.c')
| -rw-r--r-- | epan/dissectors/packet-zvt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index 6674e8bfa3..ecf10acad9 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -413,7 +413,7 @@ dissect_zvt_bitmap_apdu(tvbuff_t *tvb, gint offset, guint16 len, static void -zvt_set_addresses(packet_info *pinfo _U_, zvt_direction_t dir) +zvt_set_addresses(packet_info *pinfo, zvt_direction_t dir) { if (dir == DIRECTION_ECR_TO_PT) { SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_ECR)+1, ADDR_ECR); @@ -525,10 +525,8 @@ dissect_zvt_apdu(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tre ai = (apdu_info_t *)g_hash_table_lookup( apdu_table, GUINT_TO_POINTER((guint)ctrl)); - if (ai) { - zvt_set_addresses(pinfo, ai->direction); - /* XXX - check the minimum length */ - } + zvt_set_addresses(pinfo, ai ? ai->direction : DIRECTION_UNKNOWN); + /* XXX - check the minimum length */ if (len > 0) { if (ai && ai->dissect_payload) |