diff options
| author | Evan Huus <eapache@gmail.com> | 2021-10-07 10:25:12 -0400 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2021-10-07 10:25:12 -0400 |
| commit | 07f5472aa7327e23c3d21a81b0352d8a889112cc (patch) | |
| tree | ee1f530efe60cf9c2a7c3b7cb18b8631f6a17991 /epan/dissectors/packet-lmp.c | |
| parent | 4a2b18a9c04997183b2ff1b6e50843e6970b74f7 (diff) | |
to_str: scope tvb_ip_to_str
Diffstat (limited to 'epan/dissectors/packet-lmp.c')
| -rw-r--r-- | epan/dissectors/packet-lmp.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 1d1561b62e..21cbb00bfd 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -835,14 +835,14 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 1: l = LMPF_VAL_LOCAL_NODE_ID; - proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2)); + proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb, offset2, 4, ENC_BIG_ENDIAN); break; case 2: l = LMPF_VAL_REMOTE_NODE_ID; - proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2)); + proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb, offset2, 4, ENC_BIG_ENDIAN); break; @@ -861,7 +861,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 2: l = (type == 1)? LMPF_VAL_LOCAL_LINK_ID_IPV4: LMPF_VAL_REMOTE_LINK_ID_IPV4; - proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(tvb, offset2)); + proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset2)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb, offset2, 4, ENC_BIG_ENDIAN); break; @@ -898,7 +898,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 2: l = (type == 1)? LMPF_VAL_LOCAL_INTERFACE_ID_IPV4: LMPF_VAL_REMOTE_INTERFACE_ID_IPV4; - proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(tvb, offset2)); + proto_item_append_text(ti, ": IPv4 %s", tvb_ip_to_str(pinfo->pool, tvb, offset2)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[l], tvb, offset2, 4, ENC_BIG_ENDIAN); break; @@ -1085,8 +1085,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 1: proto_item_append_text(ti, ": IPv4: Local %s, Remote %s", - tvb_ip_to_str(tvb, offset2+4), - tvb_ip_to_str(tvb, offset2+8)); + tvb_ip_to_str(pinfo->pool, tvb, offset2+4), + tvb_ip_to_str(pinfo->pool, tvb, offset2+8)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_TE_LINK_LOCAL_IPV4], tvb, offset2+4, 4, ENC_BIG_ENDIAN); @@ -1144,8 +1144,8 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 1: proto_item_append_text(ti, ": IPv4: Local %s, Remote %s", - tvb_ip_to_str(tvb, offset2+4), - tvb_ip_to_str(tvb, offset2+8)); + tvb_ip_to_str(pinfo->pool, tvb, offset2+4), + tvb_ip_to_str(pinfo->pool, tvb, offset2+8)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_DATA_LINK_LOCAL_IPV4], @@ -1267,9 +1267,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) case 1: if (j < 4) proto_item_append_text(ti, ": [IPv4-%s", - tvb_ip_to_str(tvb, offset2+l)); + tvb_ip_to_str(pinfo->pool, tvb, offset2+l)); proto_item_append_text(ti2, ": IPv4 %s", - tvb_ip_to_str(tvb, offset2+l)); + tvb_ip_to_str(pinfo->pool, tvb, offset2+l)); proto_tree_add_item(lmp_subobj_tree, hf_lmp_interface_id_ipv4, tvb, offset2+l, 4, ENC_BIG_ENDIAN); l += 4; break; @@ -1628,7 +1628,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) /* Local interface ID */ proto_item_append_text(ti, ": Local Interface ID %s", - tvb_ip_to_str(tvb, offset2+12)); + tvb_ip_to_str(pinfo->pool, tvb, offset2+12)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_SERVICE_CONFIG_CPSA_INTERFACE_ID], @@ -1697,13 +1697,13 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) switch(type) { case 1: - proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2)); + proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_LOCAL_DA_DCN_ADDR], tvb, offset2, 4, ENC_BIG_ENDIAN); break; case 2: - proto_item_append_text(ti, ": %s", tvb_ip_to_str(tvb, offset2)); + proto_item_append_text(ti, ": %s", tvb_ip_to_str(pinfo->pool, tvb, offset2)); proto_tree_add_item(lmp_object_tree, hf_lmp_filter[LMPF_VAL_REMOTE_DA_DCN_ADDR], tvb, offset2, 4, ENC_BIG_ENDIAN); break; @@ -1761,9 +1761,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_item_set_text(ti2, "Primary Routing Controller: " "Area ID: %s, RC PC ID: %s, " "RC PC Addr: %s", - tvb_ip_to_str(tvb, offset2+l+4), - tvb_ip_to_str(tvb, offset2+l+8), - tvb_ip_to_str(tvb, offset2+l+12)); + tvb_ip_to_str(pinfo->pool, tvb, offset2+l+4), + tvb_ip_to_str(pinfo->pool, tvb, offset2+l+8), + tvb_ip_to_str(pinfo->pool, tvb, offset2+l+12)); proto_tree_add_item(lmp_subobj_tree, hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_PRI_AREA_ID], tvb, offset2+l+4, 4, ENC_BIG_ENDIAN); @@ -1779,9 +1779,9 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) proto_item_set_text(ti2, "Secondary Routing Controller: " "Area ID: %s, RC PC ID: %s, " "RC PC Addr: %s", - tvb_ip_to_str(tvb, offset2+l+4), - tvb_ip_to_str(tvb, offset2+l+8), - tvb_ip_to_str(tvb, offset2+l+12)); + tvb_ip_to_str(pinfo->pool, tvb, offset2+l+4), + tvb_ip_to_str(pinfo->pool, tvb, offset2+l+8), + tvb_ip_to_str(pinfo->pool, tvb, offset2+l+12)); proto_tree_add_item(lmp_subobj_tree, hf_lmp_filter[LMPF_VAL_LAD_INFO_SUBOBJ_SEC_AREA_ID], tvb, offset2+l+4, 4, ENC_BIG_ENDIAN); |