diff options
-rw-r--r-- | debian/libwireshark0.symbols | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-acn.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-ceph.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-dtpt.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-glusterfs.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-mbim.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-smb2.c | 2 | ||||
-rw-r--r-- | epan/guid-utils.h | 4 | ||||
-rw-r--r-- | epan/proto.c | 12 | ||||
-rw-r--r-- | epan/to_str.c | 4 | ||||
-rw-r--r-- | epan/to_str.h | 2 | ||||
-rw-r--r-- | plugins/profinet/packet-dcerpc-pn-io.c | 19 | ||||
-rw-r--r-- | ui/gtk/voip_calls_dlg.c | 6 | ||||
-rw-r--r-- | ui/qt/voip_calls_dialog.cpp | 6 |
15 files changed, 52 insertions, 41 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index 424a4fbc0b..0e0707a58b 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -694,7 +694,7 @@ libwireshark.so.0 libwireshark0 #MINVER# gsm_a_rr_short_pd_msg_strings@Base 1.9.1 gsm_map_opr_code_strings@Base 1.9.1 gtcap_StatSRT@Base 1.9.1 - guid_to_ep_str@Base 1.12.0~rc1 + guid_to_str@Base 1.99.2 guids_add_guid@Base 1.9.1 guids_get_guid_name@Base 1.9.1 guids_init@Base 1.9.1 diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index 8f90d9af06..4b3cb753b7 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -2626,10 +2626,10 @@ dissect_acn_root_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of /* get Header (CID) 16 bytes */ tvb_get_guid(tvb, header_offset, &guid, ENC_BIG_ENDIAN); - proto_item_append_text(ti, ", Src: %s", guid_to_ep_str(&guid)); + proto_item_append_text(ti, ", Src: %s", guid_to_str(wmem_packet_scope(), &guid)); /* add cid to info */ - col_add_fstr(pinfo->cinfo,COL_INFO, "CID %s", guid_to_ep_str(&guid)); + col_add_fstr(pinfo->cinfo,COL_INFO, "CID %s", guid_to_str(wmem_packet_scope(), &guid)); proto_tree_add_item(pdu_tree, hf_acn_cid, tvb, header_offset, 16, ENC_BIG_ENDIAN); /*header_offset += 16;*/ @@ -2675,7 +2675,7 @@ dissect_acn_root_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of /* get Header (CID) 16 bytes */ tvb_get_guid(tvb, header_offset, &guid, ENC_BIG_ENDIAN); - proto_item_append_text(ti, ", Src: %s", guid_to_ep_str(&guid)); + proto_item_append_text(ti, ", Src: %s", guid_to_str(wmem_packet_scope(), &guid)); proto_tree_add_item(pdu_tree, hf_acn_cid, tvb, header_offset, 16, ENC_BIG_ENDIAN); /*header_offset += 16;*/ diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 40a85f2008..ec8cb33a5f 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -1664,7 +1664,7 @@ char *c_format_uuid(tvbuff_t *tvb, guint off) { e_guid_t uuid; tvb_get_guid(tvb, off, &uuid, ENC_BIG_ENDIAN); - return guid_to_ep_str(&uuid); + return guid_to_str(wmem_packet_scope(), &uuid); } enum c_ressembly { diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 8af5dae0f2..dbc695c200 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -3287,7 +3287,7 @@ dissect_dcerpc_cn_bind(tvbuff_t *tvb, gint offset, packet_info *pinfo, iface_item = proto_tree_add_item(ctx_tree, hf_dcerpc_cn_bind_abstract_syntax, tvb, offset, 0, ENC_NA); iface_tree = proto_item_add_subtree(iface_item, ett_dcerpc_cn_iface); - uuid_str = guid_to_ep_str((e_guid_t*)&if_id); + uuid_str = guid_to_str(wmem_packet_scope(), (e_guid_t*)&if_id); uuid_name = guids_get_uuid_name(&if_id); if (uuid_name) { proto_tree_add_guid_format(iface_tree, hf_dcerpc_cn_bind_if_id, tvb, @@ -3332,7 +3332,7 @@ dissect_dcerpc_cn_bind(tvbuff_t *tvb, gint offset, packet_info *pinfo, trans_item = proto_tree_add_item(ctx_tree, hf_dcerpc_cn_bind_trans_syntax, tvb, offset, 0, ENC_NA); trans_tree = proto_item_add_subtree(trans_item, ett_dcerpc_cn_trans_syntax); - uuid_str = guid_to_ep_str((e_guid_t *) &trans_id); + uuid_str = guid_to_str(wmem_packet_scope(), (e_guid_t *) &trans_id); uuid_name = guids_get_uuid_name(&trans_id); if (uuid_name) { @@ -3486,7 +3486,7 @@ dissect_dcerpc_cn_bind_ack(tvbuff_t *tvb, gint offset, packet_info *pinfo, dcerpc_tvb_get_uuid(tvb, offset, hdr->drep, &trans_id); uuid_name = guids_get_uuid_name(&trans_id); if (! uuid_name) { - uuid_name = guid_to_ep_str((e_guid_t *) &trans_id); + uuid_name = guid_to_str(wmem_packet_scope(), (e_guid_t *) &trans_id); } proto_tree_add_guid_format(ctx_tree, hf_dcerpc_cn_ack_trans_id, tvb, offset, 16, (e_guid_t *) &trans_id, "Transfer Syntax: %s", @@ -3836,7 +3836,7 @@ dissect_dcerpc_cn_rqst(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (dcerpc_tree) { proto_tree_add_guid_format(dcerpc_tree, hf_dcerpc_obj_id, tvb, offset, 16, (e_guid_t *) &obj_id, "Object UUID: %s", - guid_to_ep_str((e_guid_t *) &obj_id)); + guid_to_str(wmem_packet_scope(), (e_guid_t *) &obj_id)); } offset += 16; } @@ -4068,7 +4068,7 @@ dissect_dcerpc_cn_resp(tvbuff_t *tvb, gint offset, packet_info *pinfo, if (dcerpc_tree && (memcmp(&value->object_uuid, &obj_id_null, sizeof(obj_id_null)) != 0)) { pi = proto_tree_add_guid_format(dcerpc_tree, hf_dcerpc_obj_id, tvb, offset, 0, (e_guid_t *) &value->object_uuid, "Object UUID: %s", - guid_to_ep_str((e_guid_t *) &value->object_uuid)); + guid_to_str(wmem_packet_scope(), (e_guid_t *) &value->object_uuid)); PROTO_ITEM_SET_GENERATED(pi); } @@ -5763,12 +5763,12 @@ dissect_dcerpc_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (tree) { proto_tree_add_guid_format(dcerpc_tree, hf_dcerpc_obj_id, tvb, offset, 16, (e_guid_t *) &hdr.obj_id, "Object UUID: %s", - guid_to_ep_str((e_guid_t *) &hdr.obj_id)); + guid_to_str(wmem_packet_scope(), (e_guid_t *) &hdr.obj_id)); } offset += 16; if (tree) { - uuid_str = guid_to_ep_str((e_guid_t*)&hdr.if_id); + uuid_str = guid_to_str(wmem_packet_scope(), (e_guid_t*)&hdr.if_id); uuid_name = guids_get_uuid_name(&hdr.if_id); if (uuid_name) { proto_tree_add_guid_format(dcerpc_tree, hf_dcerpc_dg_if_id, tvb, @@ -5783,7 +5783,7 @@ dissect_dcerpc_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (tree) { proto_tree_add_guid_format(dcerpc_tree, hf_dcerpc_dg_act_id, tvb, offset, 16, (e_guid_t *) &hdr.act_id, "Activity: %s", - guid_to_ep_str((e_guid_t *) &hdr.act_id)); + guid_to_str(wmem_packet_scope(), (e_guid_t *) &hdr.act_id)); } offset += 16; diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index 2e245fb8a2..533dac60a0 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -282,7 +282,7 @@ dissect_dtpt_guid(tvbuff_t *tvb, guint offset, proto_tree *tree, int hfindex) guid_name = guids_get_guid_name(&guid); if (guid_name != NULL) proto_item_set_text(dtpt_guid_item, "%s: %s (%s)", - proto_registrar_get_name(hfindex), guid_name, guid_to_ep_str(&guid)); + proto_registrar_get_name(hfindex), guid_name, guid_to_str(wmem_packet_scope(), &guid)); dtpt_guid_tree = proto_item_add_subtree(dtpt_guid_item, ett_dtpt_guid); } if (dtpt_guid_tree) { @@ -296,7 +296,7 @@ dissect_dtpt_guid(tvbuff_t *tvb, guint offset, proto_tree *tree, int hfindex) if (guid_name != NULL && dtpt_guid_data_item != NULL) { proto_item_set_text(dtpt_guid_data_item, "%s: %s (%s)", proto_registrar_get_name(hf_dtpt_guid_data), - guid_name, guid_to_ep_str(&guid)); + guid_name, guid_to_str(wmem_packet_scope(), &guid)); } } } diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c index 9d14bc1784..f2c74a35fe 100644 --- a/epan/dissectors/packet-glusterfs.c +++ b/epan/dissectors/packet-glusterfs.c @@ -538,7 +538,7 @@ gluster_rpc_dissect_dict(proto_tree *tree, tvbuff_t *tvb, int hfindex, int offse tvb_get_ntohguid(tvb, offset, &gfid); - gfid_s = guid_to_ep_str(&gfid); + gfid_s = guid_to_str(wmem_packet_scope(), &gfid); dict_item = proto_tree_add_guid_format(subtree, hf_glusterfs_gfid, tvb, offset, 16, &gfid, "%s: %s", key, gfid_s); diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index aa361fbb7f..66db5dee36 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -1780,14 +1780,14 @@ mbim_dissect_service_id_uuid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * *uuid_ext_info = (struct mbim_uuid_ext *)wmem_map_lookup(mbim_uuid_ext_hash, uuid_ext); if (*uuid_ext_info) { proto_tree_add_guid_format_value(tree, hf, tvb, *offset, 16, &uuid, "%s (%s)", - (*uuid_ext_info)->uuid_name, guid_to_ep_str(&uuid)); + (*uuid_ext_info)->uuid_name, guid_to_str(wmem_packet_scope(), &uuid)); *offset += 16; return UUID_EXT_IDX; } } proto_tree_add_guid_format_value(tree, hf, tvb, *offset, 16, &uuid, "%s (%s)", - val_to_str_const(i, mbim_service_id_vals, "Unknown"), guid_to_ep_str(&uuid)); + val_to_str_const(i, mbim_service_id_vals, "Unknown"), guid_to_str(wmem_packet_scope(), &uuid)); *offset += 16; return i; @@ -2298,7 +2298,7 @@ mbim_dissect_context_type_uuid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree } } proto_tree_add_guid_format_value(tree, hf_mbim_context_type, tvb, *offset, 16, &uuid, "%s (%s)", - val_to_str_const(i, mbim_context_type_vals, "Unknown"), guid_to_ep_str(&uuid)); + val_to_str_const(i, mbim_context_type_vals, "Unknown"), guid_to_str(wmem_packet_scope(), &uuid)); *offset += 16; return i; diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 76a5ca4d9f..a83a9562c1 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -5615,7 +5615,7 @@ dissect_smb2_create_extra_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa proto_tree *tag_tree; tvb_get_letohguid(tvb, tag_olb.off, &tag_guid); - tag = guid_to_ep_str(&tag_guid); + tag = guid_to_str(wmem_packet_scope(), &tag_guid); tag_item = proto_tree_add_string(sub_tree, tag_olb.hfindex, tvb, tag_olb.off, tag_olb.len, tag); tag_tree = proto_item_add_subtree(tag_item, ett_smb2_olb); diff --git a/epan/guid-utils.h b/epan/guid-utils.h index 8415336506..bc4f88ada9 100644 --- a/epan/guid-utils.h +++ b/epan/guid-utils.h @@ -47,7 +47,7 @@ WS_DLL_PUBLIC void guids_add_guid(const e_guid_t *guid, const gchar *name); WS_DLL_PUBLIC const gchar *guids_get_guid_name(const e_guid_t *guid); /* resolve GUID to name (or if unknown to hex string) */ -/* (if you need hex string only, use guid_to_ep_str instead) */ +/* (if you need hex string only, use guid_to_str instead) */ WS_DLL_PUBLIC const gchar* guids_resolve_guid_to_str(const e_guid_t *guid); /* add a UUID (dcerpc_init_uuid() will call this too) */ @@ -57,7 +57,7 @@ WS_DLL_PUBLIC const gchar* guids_resolve_guid_to_str(const e_guid_t *guid); #define guids_get_uuid_name(uuid) guids_get_guid_name((e_guid_t *) (uuid)) /* resolve UUID to name (or if unknown to hex string) */ -/* (if you need hex string only, use guid_to_ep_str instead) */ +/* (if you need hex string only, use guid_to_str instead) */ #define guids_resolve_uuid_to_str(uuid) guids_resolve_guid_to_str((e_guid_t *) (uuid)) #endif /* __GUID_UTILS_H__ */ diff --git a/epan/proto.c b/epan/proto.c index c8d8a338dc..6449803477 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -4438,9 +4438,11 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, break; case FT_GUID: - offset_r += protoo_strlcpy(result+offset_r, - guid_to_ep_str((e_guid_t *)fvalue_get(&finfo->value)), - size-offset_r); + { + char* str = guid_to_str(NULL, (e_guid_t *)fvalue_get(&finfo->value)); + offset_r += protoo_strlcpy(result+offset_r, str, size-offset_r); + wmem_free(NULL, str); + } break; case FT_REL_OID: @@ -6216,7 +6218,9 @@ proto_item_fill_label(field_info *fi, gchar *label_str) case FT_GUID: guid = (e_guid_t *)fvalue_get(&fi->value); - label_fill(label_str, 0, hfinfo, guid_to_ep_str(guid)); + tmp = guid_to_str(NULL, guid); + label_fill(label_str, 0, hfinfo, tmp); + wmem_free(NULL, tmp); break; case FT_OID: diff --git a/epan/to_str.c b/epan/to_str.c index 6c4cecb249..e3be688c84 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -1025,11 +1025,11 @@ ip_to_str_buf(const guint8 *ad, gchar *buf, const int buf_len) } gchar * -guid_to_ep_str(const e_guid_t *guid) +guid_to_str(wmem_allocator_t *scope, const e_guid_t *guid) { gchar *buf; - buf=(gchar *)ep_alloc(GUID_STR_LEN); + buf=(gchar *)wmem_alloc(scope, GUID_STR_LEN); return guid_to_str_buf(guid, buf, GUID_STR_LEN); } diff --git a/epan/to_str.h b/epan/to_str.h index 2adaa65a67..3e1edeb0bc 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -82,7 +82,7 @@ extern void guint32_to_str_buf(guint32 u, gchar *buf, int buf_len); WS_DLL_PUBLIC gchar* rel_time_to_str(wmem_allocator_t *scope, const nstime_t*); WS_DLL_PUBLIC gchar* rel_time_to_secs_str(wmem_allocator_t *scope, const nstime_t*); -WS_DLL_PUBLIC gchar* guid_to_ep_str(const e_guid_t*); +WS_DLL_PUBLIC gchar* guid_to_str(wmem_allocator_t *scope, const e_guid_t*); gchar* guid_to_str_buf(const e_guid_t*, gchar*, int); WS_DLL_PUBLIC char *decode_bits_in_field(const guint bit_offset, const gint no_of_bits, const guint64 value); diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index 1c95189995..a2c450b58a 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -2673,7 +2673,7 @@ pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar) sub_tree = proto_tree_add_subtree_format(tree, tvb, 0, 0, ett_pn_io_ar_info, &sub_item, "ARUUID:%s ContrMAC:%s ContrAlRef:0x%x DevMAC:%s DevAlRef:0x%x InCR:0x%x OutCR=0x%x", - guid_to_ep_str((const e_guid_t*) &ar->aruuid), + guid_to_str(wmem_packet_scope(), (const e_guid_t*) &ar->aruuid), address_to_str(wmem_packet_scope(), &controllermac_addr), ar->controlleralarmref, address_to_str(wmem_packet_scope(), &devicemac_addr), ar->devicealarmref, ar->inputframeid, ar->outputframeid); @@ -6364,7 +6364,7 @@ dissect_ARData_block(tvbuff_t *tvb, int offset, u32ARDataStart = offset; offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, ar_tree, drep, hf_pn_io_ar_uuid, &aruuid); - proto_item_append_text(ar_item, "ARUUID:%s", guid_to_ep_str((const e_guid_t*) &aruuid)); + proto_item_append_text(ar_item, "ARUUID:%s", guid_to_str(wmem_packet_scope(), (const e_guid_t*) &aruuid)); offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep, hf_pn_io_ar_type, &u16ARType); offset = dissect_ARProperties(tvb, offset, pinfo, ar_tree, item, drep); @@ -6482,7 +6482,7 @@ dissect_ARData_block(tvbuff_t *tvb, int offset, u32ARDataStart = offset; /*ARUUID */ offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, ar_tree, drep, hf_pn_io_ar_uuid, &aruuid); - proto_item_append_text(ar_item, "ARUUID:%s", guid_to_ep_str((const e_guid_t*) &aruuid)); + proto_item_append_text(ar_item, "ARUUID:%s", guid_to_str(wmem_packet_scope(), (const e_guid_t*) &aruuid)); /* CMInitiatorObjectUUID */ offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, ar_tree, drep, hf_pn_io_cminitiator_objectuuid, &uuid); /* ParameterServerObjectUUID */ @@ -9506,7 +9506,7 @@ pn_io_ar_conv_filter(packet_info *pinfo) { pnio_ar_t *ar = (pnio_ar_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_pn_io, 0); void* profinet_type = p_get_proto_data(pinfo->pool, pinfo, proto_pn_io, 0); - char *buf; + char *buf, *guid_str; address controllermac_addr, devicemac_addr; if ((profinet_type == NULL) || (GPOINTER_TO_UINT(profinet_type) != 10) || (ar == NULL)) { @@ -9516,13 +9516,15 @@ pn_io_ar_conv_filter(packet_info *pinfo) SET_ADDRESS(&controllermac_addr, AT_ETHER, 6, ar->controllermac); SET_ADDRESS(&devicemac_addr, AT_ETHER, 6, ar->devicemac); + guid_str = guid_to_str(wmem_packet_scope(), (const e_guid_t*) &ar->aruuid); buf = g_strdup_printf( "pn_io.ar_uuid == %s || " /* ARUUID */ "(pn_io.alarm_src_endpoint == 0x%x && eth.src == %s) || " /* Alarm CR (contr -> dev) */ "(pn_io.alarm_src_endpoint == 0x%x && eth.src == %s)", /* Alarm CR (dev -> contr) */ - guid_to_ep_str((const e_guid_t*) &ar->aruuid), + guid_str, ar->controlleralarmref, address_to_str(wmem_packet_scope(), &controllermac_addr), ar->devicealarmref, address_to_str(wmem_packet_scope(), &devicemac_addr)); + wmem_free(NULL, guid_str); return buf; } @@ -9531,7 +9533,7 @@ pn_io_ar_conv_data_filter(packet_info *pinfo) { pnio_ar_t *ar = (pnio_ar_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_pn_io, 0); void* profinet_type = p_get_proto_data(pinfo->pool, pinfo, proto_pn_io, 0); - char *buf, *controllermac_str, *devicemac_str; + char *buf, *controllermac_str, *devicemac_str, *guid_str; address controllermac_addr, devicemac_addr; if ((profinet_type == NULL) || (GPOINTER_TO_UINT(profinet_type) != 10) || (ar == NULL)) { @@ -9543,6 +9545,7 @@ pn_io_ar_conv_data_filter(packet_info *pinfo) controllermac_str = address_to_str(wmem_packet_scope(), &controllermac_addr); devicemac_str = address_to_str(wmem_packet_scope(), &devicemac_addr); + guid_str = guid_to_str(wmem_packet_scope(), (const e_guid_t*) &ar->aruuid); if (ar->arType == 0x0010) /* IOCARSingle using RT_CLASS_3 */ { buf = g_strdup_printf( @@ -9550,7 +9553,7 @@ pn_io_ar_conv_data_filter(packet_info *pinfo) "(pn_rt.frame_id == 0x%x) || (pn_rt.frame_id == 0x%x) || " "(pn_io.alarm_src_endpoint == 0x%x && eth.src == %s) || " /* Alarm CR (contr -> dev) */ "(pn_io.alarm_src_endpoint == 0x%x && eth.src == %s)", /* Alarm CR (dev -> contr) */ - guid_to_ep_str((const e_guid_t*) &ar->aruuid), + guid_str, ar->inputframeid, ar->outputframeid, ar->controlleralarmref, controllermac_str, ar->devicealarmref, devicemac_str); @@ -9563,7 +9566,7 @@ pn_io_ar_conv_data_filter(packet_info *pinfo) "(pn_rt.frame_id == 0x%x && eth.src == %s && eth.dst == %s) || " /* Output CR && contr MAC -> dev MAC */ "(pn_io.alarm_src_endpoint == 0x%x && eth.src == %s) || " /* Alarm CR (contr -> dev) */ "(pn_io.alarm_src_endpoint == 0x%x && eth.src == %s)", /* Alarm CR (dev -> contr) */ - guid_to_ep_str((const e_guid_t*) &ar->aruuid), + guid_str, ar->inputframeid, devicemac_str, controllermac_str, ar->outputframeid, controllermac_str, devicemac_str, ar->controlleralarmref, controllermac_str, diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 8fbff7aa20..1acd9bd38c 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -198,7 +198,7 @@ voip_calls_on_filter(GtkButton *button _U_, gpointer user_data _U_) size_t filter_length; size_t max_filter_length = 2048; /* What's this based on ? */ int pos; - char* addr_str; + char *addr_str, *guid_str; const sip_calls_info_t *sipinfo; const isup_calls_info_t *isupinfo; @@ -278,14 +278,16 @@ voip_calls_on_filter(GtkButton *button _U_, gpointer user_data _U_) break; case VOIP_H323: h323info = (h323_calls_info_t *)listinfo->prot_info; + guid_str = guid_to_str(NULL, &h323info->guid[0]); g_string_append_printf(filter_string_fwd, "((h225.guid == %s || q931.call_ref == %x:%x || q931.call_ref == %x:%x)", - guid_to_ep_str(&h323info->guid[0]), + guid_str, (guint8) (h323info->q931_crv & 0x00ff), (guint8)((h323info->q931_crv & 0xff00)>>8), (guint8) (h323info->q931_crv2 & 0x00ff), (guint8)((h323info->q931_crv2 & 0xff00)>>8)); listb = g_list_first(h323info->h245_list); + wmem_free(NULL, guid_str); while (listb) { h245_add = (h245_address_t *)listb->data; addr_str = (char*)address_to_str(NULL, &h245_add->h245_address); diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp index d194f5bfa0..6059beb25e 100644 --- a/ui/qt/voip_calls_dialog.cpp +++ b/ui/qt/voip_calls_dialog.cpp @@ -352,7 +352,7 @@ void VoipCallsDialog::prepareFilter() const h323_calls_info_t *h323info; const h245_address_t *h245_add = NULL; const gcp_ctx_t* ctx; - char* addr_str; + char* addr_str, *guid_str; if (filter_length < max_filter_length) { gtk_editable_insert_text(GTK_EDITABLE(main_display_filter_widget), filter_string_fwd->str, -1, &pos); @@ -389,14 +389,16 @@ void VoipCallsDialog::prepareFilter() break; case VOIP_H323: h323info = (h323_calls_info_t *)listinfo->prot_info; + guid_str = guid_to_str(NULL, &h323info->guid[0]); g_string_append_printf(filter_string_fwd, "((h225.guid == %s || q931.call_ref == %x:%x || q931.call_ref == %x:%x)", - guid_to_ep_str(&h323info->guid[0]), + guid_str, (guint8) (h323info->q931_crv & 0x00ff), (guint8)((h323info->q931_crv & 0xff00)>>8), (guint8) (h323info->q931_crv2 & 0x00ff), (guint8)((h323info->q931_crv2 & 0xff00)>>8)); listb = g_list_first(h323info->h245_list); + wmem_free(NULL, guid_str); while (listb) { h245_add = (h245_address_t *)listb->data; addr_str = (char*)address_to_str(NULL, &h245_add->h245_address); |