diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-15 03:25:43 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-15 03:25:43 +0000 |
| commit | e11921d1929f4f262d6319273a1fa5488c14ad71 (patch) | |
| tree | 446025fc941c9045fa66dc95f5fcd7f492e0d093 /epan/dissectors/packet-xdmcp.c | |
| parent | 862e2d498cc7834f59e2e79bf0ad964a643aba9b (diff) | |
| download | wireshark-e11921d1929f4f262d6319273a1fa5488c14ad71.tar.gz | |
Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_to_str().
svn path=/trunk/; revision=35540
Diffstat (limited to 'epan/dissectors/packet-xdmcp.c')
| -rw-r--r-- | epan/dissectors/packet-xdmcp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index d751041a85..7b55f364e5 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -244,7 +244,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset += 2; if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, opcode_vals, "Unknown (0x%04x)")); } @@ -265,12 +265,12 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (alen == 4) { proto_tree_add_text(xdmcp_tree, tvb, offset, alen+2, "Client address: %s", - ip_to_str(tvb_get_ptr(tvb, offset+2, 4))); + tvb_ip_to_str(tvb, offset+2)); offset += 6; } else if (alen == 16) { proto_tree_add_text(xdmcp_tree, tvb, offset, alen+2, "Client address: %s", - ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset+2, 16))); + tvb_ip6_to_str(tvb, offset+2)); offset += 18; } else { offset += xdmcp_add_bytes(xdmcp_tree, "Client address", tvb, offset); @@ -353,9 +353,9 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) caddrs_offset += 2; if ((ctype == 0) && (alen == 4)) { - ip_string = ip_to_str(tvb_get_ptr(tvb, caddrs_offset, 4)); + ip_string = tvb_ip_to_str(tvb, caddrs_offset); } else if ((ctype == 6) && (alen == 16)) { - ip_string = ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, caddrs_offset, 16)); + ip_string = tvb_ip6_to_str(tvb, caddrs_offset); } else { ip_string = NULL; } |