diff options
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ansi_map/packet-ansi_map-template.c | 8 | ||||
-rw-r--r-- | asn1/ansi_tcap/packet-ansi_tcap-template.c | 27 | ||||
-rw-r--r-- | asn1/h245/packet-h245-template.c | 5 | ||||
-rw-r--r-- | asn1/nbap/nbap.cnf | 12 |
4 files changed, 28 insertions, 24 deletions
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index 7f048ba62c..e94a3f9892 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -409,8 +409,8 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat guint8 *dst_str; const char *buf = NULL; - src_str = ep_address_to_str(src); - dst_str = ep_address_to_str(dst); + src_str = address_to_str(wmem_packet_scope(), src); + dst_str = address_to_str(wmem_packet_scope(), dst); /* Data from the TCAP dissector */ if ((!pinfo->fd->flags.visited)&&(p_private_tcap->TransactionID_str)){ @@ -4337,8 +4337,8 @@ find_saved_invokedata(asn1_ctx_t *actx, struct ansi_tcap_private_t *p_private_tc /* Data from the TCAP dissector */ /* The hash string needs to contain src and dest to distiguish differnt flows */ - src_str = ep_address_to_str(src); - dst_str = ep_address_to_str(dst); + src_str = address_to_str(wmem_packet_scope(), src); + dst_str = address_to_str(wmem_packet_scope(), dst); /* Reverse order to invoke */ switch(ansi_map_response_matching_type){ case ANSI_MAP_TID_ONLY: diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c index ac4ff7b17e..3153afffee 100644 --- a/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -187,10 +187,12 @@ ansi_tcap_init_protocol(void) static void save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ struct ansi_tcap_invokedata_t *ansi_tcap_saved_invokedata; - address* src = &(pinfo->src); - address* dst = &(pinfo->dst); + gchar *src, *dst; char *buf; + src = address_to_str(wmem_packet_scope(), &(pinfo->src)); + dst = address_to_str(wmem_packet_scope(), &(pinfo->dst)); + if ((!pinfo->fd->flags.visited)&&(ansi_tcap_private.TransactionID_str)){ /* Only do this once XXX I hope its the right thing to do */ @@ -200,10 +202,10 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ buf = wmem_strdup(wmem_packet_scope(), ansi_tcap_private.TransactionID_str); break; case 1: - buf = wmem_strdup_printf(wmem_packet_scope(), "%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src)); + buf = wmem_strdup_printf(wmem_packet_scope(), "%s%s",ansi_tcap_private.TransactionID_str,src); break; default: - buf = wmem_strdup_printf(wmem_packet_scope(), "%s%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src),ep_address_to_str(dst)); + buf = wmem_strdup_printf(wmem_packet_scope(), "%s%s%s",ansi_tcap_private.TransactionID_str,src,dst); break; } @@ -229,32 +231,31 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ static gboolean find_saved_invokedata(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ struct ansi_tcap_invokedata_t *ansi_tcap_saved_invokedata; - address* src = &(pinfo->src); - address* dst = &(pinfo->dst); + gchar *src, *dst; char *buf; if (!ansi_tcap_private.TransactionID_str) { return FALSE; } + src = address_to_str(wmem_packet_scope(), &(pinfo->src)); + dst = address_to_str(wmem_packet_scope(), &(pinfo->dst)); + /* The hash string needs to contain src and dest to distiguish differnt flows */ buf = (char *)wmem_alloc(wmem_packet_scope(), MAX_TID_STR_LEN); buf[0] = '\0'; /* Reverse order to invoke */ - g_snprintf(buf, MAX_TID_STR_LEN, "%s%s%s", - ansi_tcap_private.TransactionID_str, ep_address_to_str(dst), - ep_address_to_str(src)); switch(ansi_tcap_response_matching_type){ case 0: g_snprintf(buf,MAX_TID_STR_LEN,"%s",ansi_tcap_private.TransactionID_str); break; case 1: - g_snprintf(buf,MAX_TID_STR_LEN,"%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(dst)); + g_snprintf(buf,MAX_TID_STR_LEN,"%s%s",ansi_tcap_private.TransactionID_str,dst); break; default: - g_snprintf(buf,MAX_TID_STR_LEN,"%s%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(dst),ep_address_to_str(src)); - break; - } + g_snprintf(buf,MAX_TID_STR_LEN,"%s%s%s",ansi_tcap_private.TransactionID_str,dst,src); + break; + } ansi_tcap_saved_invokedata = (struct ansi_tcap_invokedata_t *)g_hash_table_lookup(TransactionId_table, buf); if(ansi_tcap_saved_invokedata){ diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index e791a4f007..d95292c683 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -323,7 +323,10 @@ void h245_set_h223_add_lc_handle( h223_add_lc_handle_t handle ) static const gchar *gen_olc_key(guint16 lc_num, address *dst_addr, address *src_addr) { - return wmem_strdup_printf(wmem_packet_scope(), "%s/%s/%u", ep_address_to_str(dst_addr), ep_address_to_str(src_addr), lc_num); + return wmem_strdup_printf(wmem_packet_scope(), "%s/%s/%u", + address_to_str(wmem_packet_scope(), dst_addr), + address_to_str(wmem_packet_scope(), src_addr), + lc_num); } static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_addr) diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index ee041e4407..16e021c611 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -1323,7 +1323,7 @@ BindingID_port = 0; nbap_debug4(" g_tree_insert(edch_flow_port_map) com_context_id %%u e_dch_macdflow_id %%u IP %%s Port %%u", umts_fp_conversation_info->com_context_id, e_dch_macdflow_id, - ep_address_to_str(&dst_addr), + address_to_str(wmem_packet_scope(), &dst_addr), BindingID_port); /* Set address for collection of DDI entries */ @@ -1336,7 +1336,7 @@ BindingID_port = 0; nbap_debug4(" Insert in existing edch_flow_port_map com_context_id %%u e_dch_macdflow_id %%u IP %%s Port %%u", umts_fp_conversation_info->com_context_id, e_dch_macdflow_id, - ep_address_to_str(&dst_addr), + address_to_str(wmem_packet_scope(), &dst_addr), BindingID_port); /* Must be same ADDRESS */ @@ -1434,12 +1434,12 @@ BindingID_port = 0; if(old_conversation){ nbap_debug3("Frame %%u E-DCH-FDD-Information-to-Modify: found old conv on IP %%s Port %%u", actx->pinfo->fd->num, - ep_address_to_str(&dst_addr), + address_to_str(wmem_packet_scope(), &dst_addr), BindingID_port); }else{ nbap_debug3("Frame %%u E-DCH-FDD-Information-to-Modify: Did not find old conv on IP %%s Port %%u", actx->pinfo->fd->num, - ep_address_to_str(&dst_addr), + address_to_str(wmem_packet_scope(), &dst_addr), BindingID_port); } @@ -1778,7 +1778,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; nbap_debug4("Frame %%u HSDSCH-MACdFlows-Information:hsdsch_macdflow_id %%u Look for conv on IP %%s Port %%u", actx->pinfo->fd->num, i, - ep_address_to_str (&(nbap_hsdsch_channel_info[i].crnc_address)), + address_to_str (wmem_packet_scope(), &(nbap_hsdsch_channel_info[i].crnc_address)), nbap_hsdsch_channel_info[i].crnc_port); conversation = find_conversation(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, PT_UDP, @@ -1894,7 +1894,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; if (nbap_hsdsch_channel_info[i].crnc_port != 0){ nbap_debug3(" hsdsch_macdflow_id %%u Look for conv on IP %%s Port %%u", i, - ep_address_to_str (&(nbap_hsdsch_channel_info[i].crnc_address)), + address_to_str (wmem_packet_scope(), &(nbap_hsdsch_channel_info[i].crnc_address)), nbap_hsdsch_channel_info[i].crnc_port); conversation = find_conversation(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, PT_UDP, |