diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-01-18 15:52:15 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-01-18 15:52:15 +0000 |
| commit | 02bc1028b59b53f0d687422ec0e813677ab202e0 (patch) | |
| tree | b95cb931600f9c2120ed387f2ab27f73b9d403fb /epan/dissectors/packet-stun.c | |
| parent | 46452171c9a3cb160913bccd10cdb67e1887be3a (diff) | |
Replace tvb_get_ipv4 / ip_to_str ... by tvb_ip_to_str
svn path=/trunk/; revision=47150
Diffstat (limited to 'epan/dissectors/packet-stun.c')
| -rw-r--r-- | epan/dissectors/packet-stun.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 153f437cb4..9b3af592a8 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -719,20 +719,14 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole if (att_length < 8) break; proto_tree_add_item(att_tree, stun_att_ipv4, tvb, offset+4, 4, ENC_BIG_ENDIAN); - { - const gchar *ipstr; - guint32 ip; - ip = tvb_get_ipv4(tvb,offset+4); - ipstr = ip_to_str((guint8*)&ip); - proto_item_append_text(att_tree, ": %s:%d", ipstr,tvb_get_ntohs(tvb,offset+2)); - col_append_fstr( - pinfo->cinfo, COL_INFO, - " %s: %s:%d", - val_to_str_const(att_type, attributes, "Unknown"), - ipstr, - tvb_get_ntohs(tvb,offset+2) - ); - } + proto_item_append_text(att_tree, ": %s:%d", tvb_ip_to_str(tvb,offset+4),tvb_get_ntohs(tvb,offset+2)); + col_append_fstr( + pinfo->cinfo, COL_INFO, + " %s: %s:%d", + val_to_str_const(att_type, attributes, "Unknown"), + tvb_ip_to_str(tvb,offset+4), + tvb_get_ntohs(tvb,offset+2) + ); break; case 2: |