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

SET_ADDRESS should not be called with an address type of FT_IPv4 but rather AT_IPv4. 

svn path=/trunk/; revision=25642
This commit is contained in:
Jeff Morriss 2008-06-30 18:57:13 +00:00
parent 8980883a4e
commit 3a2848cf46
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-bat-batman.c
View File

@ -232,10 +232,10 @@ static void dissect_bat_batman_v5(tvbuff_t *tvb, packet_info *pinfo, proto_tree
batman_packeth->gwport = tvb_get_ntohs(tvb, 6);
orig_addr = tvb_get_ptr(tvb, 8, 4);
orig = tvb_get_ipv4(tvb, 8);
SET_ADDRESS(&batman_packeth->orig, FT_IPv4, 4, orig_addr);
SET_ADDRESS(&batman_packeth->orig, AT_IPv4, 4, orig_addr);
old_orig_addr = tvb_get_ptr(tvb, 12, 4);
old_orig = tvb_get_ipv4(tvb, 12);
SET_ADDRESS(&batman_packeth->old_orig, FT_IPv4, 4, old_orig_addr);
SET_ADDRESS(&batman_packeth->old_orig, AT_IPv4, 4, old_orig_addr);
batman_packeth->tq = tvb_get_guint8(tvb, 16);
batman_packeth->hna_len = tvb_get_guint8(tvb, 17);

8
epan/dissectors/packet-bat-vis.c
View File

@ -186,7 +186,7 @@ static void dissect_bat_vis_v22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
sender_ip_addr = tvb_get_ptr(tvb, 0, 4);
sender_ip = tvb_get_ipv4(tvb, 0);
SET_ADDRESS(&vis_packeth->sender_ip, FT_IPv4, 4, sender_ip_addr);
SET_ADDRESS(&vis_packeth->sender_ip, AT_IPv4, 4, sender_ip_addr);
vis_packeth->version = tvb_get_guint8(tvb, 4);
vis_packeth->gw_class = tvb_get_guint8(tvb, 5);
vis_packeth->tq_max = tvb_get_ntohs(tvb, 6);
@ -271,7 +271,7 @@ static void dissect_vis_entry_v22(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
vis_datah->data = tvb_get_ntohs(tvb, 1);
ip_addr = tvb_get_ptr(tvb, 3, 4);
ip = tvb_get_ipv4(tvb, 3);
SET_ADDRESS(&vis_datah->ip, FT_IPv4, 4, ip_addr);
SET_ADDRESS(&vis_datah->ip, AT_IPv4, 4, ip_addr);
/* Set tree info */
@ -321,7 +321,7 @@ static void dissect_bat_vis_v23(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
sender_ip_addr = tvb_get_ptr(tvb, 0, 4);
sender_ip = tvb_get_ipv4(tvb, 0);
SET_ADDRESS(&vis_packeth->sender_ip, FT_IPv4, 4, sender_ip_addr);
SET_ADDRESS(&vis_packeth->sender_ip, AT_IPv4, 4, sender_ip_addr);
vis_packeth->version = tvb_get_guint8(tvb, 4);
vis_packeth->gw_class = tvb_get_guint8(tvb, 5);
vis_packeth->tq_max = tvb_get_guint8(tvb, 6);
@ -406,7 +406,7 @@ static void dissect_vis_entry_v23(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
vis_datah->data = tvb_get_guint8(tvb, 1);
ip_addr = tvb_get_ptr(tvb, 2, 4);
ip = tvb_get_ipv4(tvb, 2);
SET_ADDRESS(&vis_datah->ip, FT_IPv4, 4, ip_addr);
SET_ADDRESS(&vis_datah->ip, AT_IPv4, 4, ip_addr);
/* Set tree info */