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

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>
This commit is contained in:
Martin Kaiser 2015-06-01 07:53:45 +02:00
parent 6b65437f44
commit cd2e901fd9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-zvt.c
View File

@ -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)