osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS 

Copy addresses with wmem-scope instead of (forced) seasonal scope.  All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes.

Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2
Reviewed-on: https://code.wireshark.org/review/6564
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2015-01-11 21:32:53 -05:00
parent 260b19e98d
commit ada1eec702
26 changed files with 117 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
asn1/nbap/nbap.cnf
View File

@ -764,7 +764,7 @@ transportFormatSet_type = NBAP_CPCH;
umts_fp_conversation_info->channel = CHANNEL_RACH_FDD;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -857,7 +857,7 @@ num_items = 1;
umts_fp_conversation_info->channel = CHANNEL_PCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->paging_indications = paging_indications;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -966,7 +966,7 @@ transportFormatSet_type = NBAP_CPCH;
umts_fp_conversation_info->channel = CHANNEL_FACH_FDD;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
/*Save unique UE-identifier */
@ -1173,7 +1173,7 @@ dch_id = 0xFFFFFFFF;
umts_fp_conversation_info->channel = CHANNEL_DCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -1286,7 +1286,7 @@ BindingID_port = 0;
umts_fp_conversation_info->channel = CHANNEL_EDCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
@ -1459,7 +1459,7 @@ BindingID_port = 0;
umts_fp_conversation_info->channel = CHANNEL_EDCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
@ -1807,7 +1807,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
/*Added june 3, normally just the iterator variable*/
@ -1924,7 +1924,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items;
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
/*Added june 3, normally just the iterator variable*/
@ -2047,7 +2047,7 @@ int i;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_common_channel_info[i].crnc_port;
/*umts_fp_conversation_info->hsdsch_macdflow_id = i ;*/ /*hsdsch_macdflow_ids[i];*/ /* hsdsch_macdflow_id;*/

2
asn1/nbap/packet-nbap-template.c
View File

@ -382,7 +382,7 @@ static void add_hsdsch_bind(packet_info *pinfo){
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
/*Added june 3, normally just the iterator variable*/

12
epan/address.h
View File

@ -228,18 +228,18 @@ copy_address_shallow(address *to, const address *from) {
#define COPY_ADDRESS_SHALLOW(to, from) copy_address_shallow((to), (from))
/** Copy an address, allocating a new buffer for the address data
* using seasonal memory.
* using wmem-scoped memory.
*
* @param to [in,out] The destination address.
* @param from [in] The source address.
*/
#define SE_COPY_ADDRESS(to, from) \
#define WMEM_COPY_ADDRESS(scope, to, from) \
do { \
void *SE_COPY_ADDRESS_data; \
void *WMEM_COPY_ADDRESS_data; \
copy_address_shallow((to), (from)); \
SE_COPY_ADDRESS_data = se_alloc((from)->len); \
memcpy(SE_COPY_ADDRESS_data, (from)->data, (from)->len); \
(to)->data = SE_COPY_ADDRESS_data; \
WMEM_COPY_ADDRESS_data = wmem_alloc(scope, (from)->len); \
memcpy(WMEM_COPY_ADDRESS_data, (from)->data, (from)->len); \
(to)->data = WMEM_COPY_ADDRESS_data; \
} while (0)

6
epan/conversation.c
View File

@ -698,8 +698,8 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
new_key = wmem_new(wmem_file_scope(), struct conversation_key);
new_key->next = conversation_keys;
conversation_keys = new_key;
SE_COPY_ADDRESS(&new_key->addr1, addr1);
SE_COPY_ADDRESS(&new_key->addr2, addr2);
WMEM_COPY_ADDRESS(wmem_file_scope(), &new_key->addr1, addr1);
WMEM_COPY_ADDRESS(wmem_file_scope(), &new_key->addr2, addr2);
new_key->ptype = ptype;
new_key->port1 = port1;
new_key->port2 = port2;
@ -789,7 +789,7 @@ conversation_set_addr2(conversation_t *conv, const address *addr)
conversation_remove_from_hashtable(conversation_hashtable_no_port2, conv);
}
conv->options &= ~NO_ADDR2;
SE_COPY_ADDRESS(&conv->key_ptr->addr2, addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &conv->key_ptr->addr2, addr);
if (conv->options & NO_PORT2) {
conversation_insert_into_hashtable(conversation_hashtable_no_port2, conv);
} else {

4
epan/dissectors/packet-ceph.c
View File

@ -1552,9 +1552,9 @@ c_pkt_data_init(c_pkt_data *d, packet_info *pinfo, guint off)
/* Note: Server sends banner first. */
SE_COPY_ADDRESS(&d->convd->server.addr, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &d->convd->server.addr, &pinfo->src);
d->convd->server.port = pinfo->srcport;
SE_COPY_ADDRESS(&d->convd->client.addr, &pinfo->dst);
WMEM_COPY_ADDRESS(wmem_file_scope(), &d->convd->client.addr, &pinfo->dst);
d->convd->client.port = pinfo->destport;
conversation_add_proto_data(d->conv, proto_ceph, d->convd);
}

12
epan/dissectors/packet-dmp.c
View File

@ -1400,8 +1400,8 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason)
{
/* Try to match corresponding message */
dmp_key->id = (guint) dmp.subj_id;
SE_COPY_ADDRESS(&dmp_key->src, &(pinfo->dst));
SE_COPY_ADDRESS(&dmp_key->dst, &(pinfo->src));
WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->dst));
WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->src));
dmp_data = (dmp_id_val *) g_hash_table_lookup (dmp_id_hash_table, dmp_key);
@ -1418,12 +1418,12 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason)
if (dmp.msg_type == ACK) {
dmp_key->id = (guint) dmp.subj_id;
SE_COPY_ADDRESS(&dmp_key->src, &(pinfo->dst));
SE_COPY_ADDRESS(&dmp_key->dst, &(pinfo->src));
WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->dst));
WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->src));
} else {
dmp_key->id = (guint) dmp.msg_id;
SE_COPY_ADDRESS(&dmp_key->src, &(pinfo->src));
SE_COPY_ADDRESS(&dmp_key->dst, &(pinfo->dst));
WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->src));
WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->dst));
}
dmp_data = (dmp_id_val *) g_hash_table_lookup (dmp_id_hash_table, dmp_key);

2
epan/dissectors/packet-http.c
View File

@ -1520,7 +1520,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo,
if (http_type == HTTP_RESPONSE && pinfo->desegment_offset<=0 && pinfo->desegment_len<=0) {
conv_data->upgrade = headers.upgrade;
conv_data->startframe = pinfo->fd->num + 1;
SE_COPY_ADDRESS(&conv_data->server_addr, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &conv_data->server_addr, &pinfo->src);
conv_data->server_port = pinfo->srcport;
}

2
epan/dissectors/packet-isakmp.c
View File

@ -2816,7 +2816,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
if (ADDRESSES_EQUAL(&decr->initiator, &null_addr)) {
/* XXX - We assume that we're seeing the second packet in an exchange here.
* Is there a way to verify this? */
SE_COPY_ADDRESS(&decr->initiator, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &decr->initiator, &pinfo->src);
}
decr_data = decr;

10
epan/dissectors/packet-jxta.c
View File

@ -581,7 +581,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
/* The initiator welcome frame */
tpt_conv_data->tpt_ptype = pinfo->ptype;
tpt_conv_data->initiator_welcome_frame = pinfo->fd->num;
SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src);
tpt_conv_data->initiator_tpt_port = pinfo->srcport;
welcome_addr = &tpt_conv_data->initiator_address;
@ -594,7 +594,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
tpt_conv_data->receiver_tpt_port = tpt_conv_data->initiator_tpt_port;
tpt_conv_data->receiver_address = tpt_conv_data->initiator_address;
tpt_conv_data->initiator_welcome_frame = pinfo->fd->num;
SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src);
tpt_conv_data->initiator_tpt_port = pinfo->srcport;
welcome_addr = &tpt_conv_data->initiator_address;
@ -603,7 +603,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree *
/* The receiver welcome frame */
tpt_conv_data->tpt_ptype = pinfo->ptype;
tpt_conv_data->receiver_welcome_frame = pinfo->fd->num;
SE_COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->src);
tpt_conv_data->receiver_tpt_port = pinfo->srcport;
welcome_addr = &tpt_conv_data->receiver_address;
@ -744,14 +744,14 @@ static jxta_stream_conversation_data *get_tpt_conversation(packet_info * pinfo)
tpt_conv_data = wmem_new(wmem_file_scope(), jxta_stream_conversation_data);
tpt_conv_data->tpt_ptype = pinfo->ptype;
SE_COPY_ADDRESS(&tpt_conv_data->initiator_tpt_address, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src);
tpt_conv_data->initiator_tpt_port = pinfo->srcport;
tpt_conv_data->initiator_welcome_frame = 0;
tpt_conv_data->initiator_address.type = AT_NONE;
tpt_conv_data->initiator_address.len = 0;
tpt_conv_data->initiator_address.data = NULL;
SE_COPY_ADDRESS(&tpt_conv_data->receiver_tpt_address, &pinfo->dst);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->dst);
tpt_conv_data->receiver_tpt_port = pinfo->destport;
tpt_conv_data->receiver_welcome_frame = 0;
tpt_conv_data->receiver_address.type = AT_NONE;

4
epan/dissectors/packet-l2tp.c
View File

@ -2415,8 +2415,8 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int
tunnel = &tmp_tunnel;
memset(tunnel, 0, sizeof(l2tpv3_tunnel_t));
tunnel->conv = l2tp_conv;
SE_COPY_ADDRESS(&tunnel->lcce1, &pinfo->src);
SE_COPY_ADDRESS(&tunnel->lcce2, &pinfo->dst);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tunnel->lcce1, &pinfo->src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tunnel->lcce2, &pinfo->dst);
}
}
}

14
epan/dissectors/packet-lbmc.c
View File

@ -279,9 +279,9 @@ static lbm_istream_substream_entry_t * lbm_stream_istream_substream_add(lbm_istr
return (entry);
}
entry = wmem_new(wmem_file_scope(), lbm_istream_substream_entry_t);
SE_COPY_ADDRESS(&(entry->src_addr), src_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->src_addr), src_addr);
entry->src_port = src_port;
SE_COPY_ADDRESS(&(entry->dst_addr), dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->dst_addr), dst_addr);
entry->dst_port = dst_port;
entry->lbm_stream_id = stream_id;
entry->parent = stream;
@ -418,10 +418,10 @@ static lbm_dstream_entry_t * lbm_stream_dstream_add(const lbm_uim_stream_destina
}
entry = wmem_new(wmem_file_scope(), lbm_dstream_entry_t);
entry->domain_1 = endpoint_a->domain;
SE_COPY_ADDRESS(&(entry->addr_1), &(endpoint_a->addr));
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr_1), &(endpoint_a->addr));
entry->port_1 = endpoint_a->port;
entry->domain_2 = endpoint_b->domain;
SE_COPY_ADDRESS(&(entry->addr_2), &(endpoint_b->addr));
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr_2), &(endpoint_b->addr));
entry->port_2 = endpoint_b->port;
lbm_stream_order_dstream_key(entry);
entry->channel = lbm_channel_assign(LBM_CHANNEL_STREAM_TCP);
@ -488,9 +488,9 @@ static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_add(lbm_dstr
return (entry);
}
entry = wmem_new(wmem_file_scope(), lbm_dstream_substream_entry_t);
SE_COPY_ADDRESS(&(entry->src_addr), src_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->src_addr), src_addr);
entry->src_port = src_port;
SE_COPY_ADDRESS(&(entry->dst_addr), dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->dst_addr), dst_addr);
entry->dst_port = dst_port;
entry->lbm_stream_id = stream_id;
entry->parent = stream;
@ -6156,7 +6156,7 @@ static lbmc_message_entry_t * lbmc_message_create(guint64 channel, const address
}
entry = wmem_new(wmem_file_scope(), lbmc_message_entry_t);
entry->channel = channel;
SE_COPY_ADDRESS(&(entry->addr), dest_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr), dest_address);
entry->port = port;
entry->first_sqn = info->first_sqn;
entry->fragment_count = 0;

4
epan/dissectors/packet-lbmpdmtcp.c
View File

@ -100,9 +100,9 @@ static lbmtcp_transport_t * lbmtcp_transport_add(const address * address1, guint
return (entry);
}
entry = wmem_new(wmem_file_scope(), lbmtcp_transport_t);
SE_COPY_ADDRESS(&(entry->addr1), address1);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr1), address1);
entry->port1 = port1;
SE_COPY_ADDRESS(&(entry->addr2), address2);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr2), address2);
entry->port2 = port2;
lbmtcp_order_key(entry);
entry->channel = lbm_channel_assign(LBM_CHANNEL_TCP);

2
epan/dissectors/packet-lbmr.c
View File

@ -264,7 +264,7 @@ static lbtrdma_transport_t * lbtrdma_transport_add(const address * source_addres
return (entry);
}
entry = wmem_new(wmem_file_scope(), lbtrdma_transport_t);
SE_COPY_ADDRESS(&(entry->source_address), source_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->source_address), source_address);
entry->session_id = session_id;
entry->port = port;
entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTRDMA);

4
epan/dissectors/packet-lbtrm.c
View File

@ -156,10 +156,10 @@ lbtrm_transport_t * lbtrm_transport_add(const address * source_address, guint16
return (entry);
}
entry = wmem_new(wmem_file_scope(), lbtrm_transport_t);
SE_COPY_ADDRESS(&(entry->source_address), source_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->source_address), source_address);
entry->source_port = source_port;
entry->session_id = session_id;
SE_COPY_ADDRESS(&(entry->multicast_group), multicast_group);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->multicast_group), multicast_group);
entry->dest_port = dest_port;
entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTRM);
entry->frame = wmem_tree_new(wmem_file_scope());

4
epan/dissectors/packet-lbtru.c
View File

@ -114,7 +114,7 @@ lbtru_transport_t * lbtru_transport_add(const address * source_address, guint16
return (entry);
}
entry = wmem_new(wmem_file_scope(), lbtru_transport_t);
SE_COPY_ADDRESS(&(entry->source_address), source_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->source_address), source_address);
entry->source_port = source_port;
entry->session_id = session_id;
entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTRU);
@ -163,7 +163,7 @@ static lbtru_client_transport_t * lbtru_client_transport_add(lbtru_transport_t *
return (entry);
}
entry = wmem_new0(wmem_file_scope(), lbtru_client_transport_t);
SE_COPY_ADDRESS(&(entry->receiver_address), receiver_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->receiver_address), receiver_address);
entry->receiver_port = receiver_port;
entry->transport = transport;
entry->id = transport->next_client_id++;

4
epan/dissectors/packet-lbttcp.c
View File

@ -76,7 +76,7 @@ static lbttcp_transport_t * lbttcp_transport_create(const address * source_addre
lbttcp_transport_t * transport = NULL;
transport = wmem_new(wmem_file_scope(), lbttcp_transport_t);
SE_COPY_ADDRESS(&(transport->source_address), source_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(transport->source_address), source_address);
transport->source_port = source_port;
transport->session_id = session_id;
transport->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTTCP);
@ -154,7 +154,7 @@ static lbttcp_client_transport_t * lbttcp_client_transport_add(lbttcp_transport_
return (entry);
}
entry = wmem_new(wmem_file_scope(), lbttcp_client_transport_t);
SE_COPY_ADDRESS(&(entry->receiver_address), receiver_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->receiver_address), receiver_address);
entry->receiver_port = receiver_port;
entry->id = transport->next_client_id++;

84
epan/dissectors/packet-nbap.c
View File

@ -10035,7 +10035,7 @@ dissect_nbap_AddorDeleteIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
static int
dissect_nbap_CFN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 2144 "../../asn1/nbap/nbap.cnf"
#line 2143 "../../asn1/nbap/nbap.cnf"
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, &cfn, FALSE);
@ -10288,7 +10288,7 @@ dissect_nbap_AvailabilityStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a
static int
dissect_nbap_HSDSCH_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 2109 "../../asn1/nbap/nbap.cnf"
#line 2108 "../../asn1/nbap/nbap.cnf"
umts_fp_conversation_info_t *umts_fp_conversation_info = NULL;
address null_addr;
conversation_t *conversation = NULL;
@ -11510,7 +11510,7 @@ dissect_nbap_Common_E_DCH_Resource_Combination_InfoList(tvbuff_t *tvb _U_, int o
static int
dissect_nbap_Common_MACFlow_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1968 "../../asn1/nbap/nbap.cnf"
#line 1967 "../../asn1/nbap/nbap.cnf"
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, maxNrOfCommonMACFlows_1, &common_macdflow_id, FALSE);
@ -11644,7 +11644,7 @@ dissect_nbap_E_DCH_MACdFlow_Multiplexing_List(tvbuff_t *tvb _U_, int offset _U_,
static int
dissect_nbap_LogicalChannelID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1621 "../../asn1/nbap/nbap.cnf"
#line 1620 "../../asn1/nbap/nbap.cnf"
/* Set logical channel id for this entry*/
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
1U, 15U, &logical_channel_id, FALSE);
@ -11663,7 +11663,7 @@ dissect_nbap_LogicalChannelID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
static int
dissect_nbap_MAC_PDU_SizeExtended(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1724 "../../asn1/nbap/nbap.cnf"
#line 1723 "../../asn1/nbap/nbap.cnf"
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
1U, 1504U, NULL, TRUE);
@ -12086,7 +12086,7 @@ static const per_sequence_t CommonMACFlow_Specific_InfoItem_sequence[] = {
static int
dissect_nbap_CommonMACFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1975 "../../asn1/nbap/nbap.cnf"
#line 1974 "../../asn1/nbap/nbap.cnf"
address dst_addr;
transportLayerAddress_ipv4 = 0;
BindingID_port = 0;
@ -12131,7 +12131,7 @@ dissect_nbap_CommonMACFlow_Specific_InfoList(tvbuff_t *tvb _U_, int offset _U_,
static int
dissect_nbap_MACdPDU_Size(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1612 "../../asn1/nbap/nbap.cnf"
#line 1611 "../../asn1/nbap/nbap.cnf"
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
1U, 5000U, &MACdPDU_Size, TRUE);
@ -13351,7 +13351,7 @@ dissect_nbap_CriticalityDiagnostics(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
static int
dissect_nbap_CRNC_CommunicationContextID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 2083 "../../asn1/nbap/nbap.cnf"
#line 2082 "../../asn1/nbap/nbap.cnf"
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 1048575U, &com_context_id, FALSE);
@ -18035,7 +18035,7 @@ dissect_nbap_E_DCH_HARQ_Combining_Capability(tvbuff_t *tvb _U_, int offset _U_,
static int
dissect_nbap_E_DCH_DDI_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1602 "../../asn1/nbap/nbap.cnf"
#line 1601 "../../asn1/nbap/nbap.cnf"
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 62U, &e_dch_ddi_value, FALSE);
@ -18169,7 +18169,7 @@ static const per_sequence_t E_DCH_LogicalChannelInformationItem_sequence[] = {
static int
dissect_nbap_E_DCH_LogicalChannelInformationItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1599 "../../asn1/nbap/nbap.cnf"
#line 1598 "../../asn1/nbap/nbap.cnf"
num_items++;
@ -18186,7 +18186,7 @@ static const per_sequence_t E_DCH_LogicalChannelInformation_sequence_of[1] = {
static int
dissect_nbap_E_DCH_LogicalChannelInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1592 "../../asn1/nbap/nbap.cnf"
#line 1591 "../../asn1/nbap/nbap.cnf"
num_items = 0;
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
@ -18219,7 +18219,7 @@ static const per_sequence_t E_DCH_MACdFlow_Specific_InfoItem_sequence[] = {
static int
dissect_nbap_E_DCH_MACdFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1354 "../../asn1/nbap/nbap.cnf"
#line 1353 "../../asn1/nbap/nbap.cnf"
umts_fp_conversation_info_t *p_conv_data = NULL;
address null_addr;
conversation_t *p_conv;
@ -18402,7 +18402,7 @@ static const per_sequence_t E_DCH_LogicalChannelToModifyItem_sequence[] = {
static int
dissect_nbap_E_DCH_LogicalChannelToModifyItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1587 "../../asn1/nbap/nbap.cnf"
#line 1586 "../../asn1/nbap/nbap.cnf"
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_nbap_E_DCH_LogicalChannelToModifyItem, E_DCH_LogicalChannelToModifyItem_sequence);
@ -18477,7 +18477,7 @@ static const per_sequence_t E_DCH_MACdFlow_Specific_InfoItem_to_Modify_sequence[
static int
dissect_nbap_E_DCH_MACdFlow_Specific_InfoItem_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1495 "../../asn1/nbap/nbap.cnf"
#line 1494 "../../asn1/nbap/nbap.cnf"
guint32 no_ddi_entries, i;
address null_addr;
nbap_edch_port_info_t *old_info;
@ -18619,7 +18619,7 @@ static const per_sequence_t E_DCH_FDD_Information_to_Modify_sequence[] = {
static int
dissect_nbap_E_DCH_FDD_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1407 "../../asn1/nbap/nbap.cnf"
#line 1406 "../../asn1/nbap/nbap.cnf"
address dst_addr, null_addr;
conversation_t *conversation,*old_conversation = NULL;
@ -18678,7 +18678,7 @@ BindingID_port = 0;
umts_fp_conversation_info->channel = CHANNEL_EDCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
@ -23311,7 +23311,7 @@ static const per_sequence_t HSDSCH_Common_System_InformationFDD_sequence[] = {
static int
dissect_nbap_HSDSCH_Common_System_InformationFDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1995 "../../asn1/nbap/nbap.cnf"
#line 1994 "../../asn1/nbap/nbap.cnf"
/*
* 5.1.6 High Speed Downlink Shared Channels
* The Data Transfer procedure is used to transfer a HS-DSCH DATA FRAME (TYPE 1, TYPE 2 [FDD and 1.28Mcps
@ -23370,7 +23370,7 @@ int i;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_common_channel_info[i].crnc_port;
/*umts_fp_conversation_info->hsdsch_macdflow_id = i ;*/ /*hsdsch_macdflow_ids[i];*/ /* hsdsch_macdflow_id;*/
@ -23472,7 +23472,7 @@ static const per_sequence_t HSDSCH_MACdFlow_Specific_InfoItem_sequence[] = {
static int
dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1702 "../../asn1/nbap/nbap.cnf"
#line 1701 "../../asn1/nbap/nbap.cnf"
address dst_addr;
@ -23575,7 +23575,7 @@ static const value_string nbap_RLC_Mode_vals[] = {
static int
dissect_nbap_RLC_Mode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1629 "../../asn1/nbap/nbap.cnf"
#line 1628 "../../asn1/nbap/nbap.cnf"
guint32 rlc_mode;
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
@ -23616,7 +23616,7 @@ static const per_sequence_t PriorityQueue_InfoItem_sequence[] = {
static int
dissect_nbap_PriorityQueue_InfoItem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1693 "../../asn1/nbap/nbap.cnf"
#line 1692 "../../asn1/nbap/nbap.cnf"
num_items++;
@ -23650,7 +23650,7 @@ static const per_sequence_t HSDSCH_MACdFlows_Information_sequence[] = {
static int
dissect_nbap_HSDSCH_MACdFlows_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1653 "../../asn1/nbap/nbap.cnf"
#line 1652 "../../asn1/nbap/nbap.cnf"
int protocol_ie_id;
guint32 i;
@ -23694,7 +23694,7 @@ dissect_nbap_HSDSCH_MACdFlows_Information(tvbuff_t *tvb _U_, int offset _U_, asn
static int
dissect_nbap_T_hSDSCH_Physical_Layer_Category(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1646 "../../asn1/nbap/nbap.cnf"
#line 1645 "../../asn1/nbap/nbap.cnf"
guint32 hsdsch_physical_layer_category;
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
@ -23762,7 +23762,7 @@ static const per_sequence_t HSDSCH_FDD_Information_sequence[] = {
static int
dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1754 "../../asn1/nbap/nbap.cnf"
#line 1753 "../../asn1/nbap/nbap.cnf"
/*
* Collect the information about the HSDSCH MACdFlows set up conversation(s) and set the conversation data.
*/
@ -23822,7 +23822,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
/*Added june 3, normally just the iterator variable*/
@ -23899,7 +23899,7 @@ static const per_sequence_t HSDSCH_MACdFlow_Specific_InfoItem_to_Modify_sequence
static int
dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1843 "../../asn1/nbap/nbap.cnf"
#line 1842 "../../asn1/nbap/nbap.cnf"
address dst_addr;
transportLayerAddress_ipv4 = 0;
BindingID_port = 0;
@ -23957,7 +23957,7 @@ static const per_sequence_t PriorityQueue_InfoItem_to_Add_sequence[] = {
static int
dissect_nbap_PriorityQueue_InfoItem_to_Add(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1696 "../../asn1/nbap/nbap.cnf"
#line 1695 "../../asn1/nbap/nbap.cnf"
num_items = 1;
@ -24092,7 +24092,7 @@ static const per_sequence_t HSDSCH_Information_to_Modify_sequence[] = {
static int
dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1863 "../../asn1/nbap/nbap.cnf"
#line 1862 "../../asn1/nbap/nbap.cnf"
/*
* This is pretty much the same like if we setup a previous flow
*/
@ -24160,7 +24160,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
/*Added june 3, normally just the iterator variable*/
@ -24214,7 +24214,7 @@ static const value_string nbap_HSDSCH_MACdPDUSizeFormat_vals[] = {
static int
dissect_nbap_HSDSCH_MACdPDUSizeFormat(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1731 "../../asn1/nbap/nbap.cnf"
#line 1730 "../../asn1/nbap/nbap.cnf"
/*
* Removed 10 Aug. 2012, I'm not sure if this was right, it wrongfully
* set some packets as type 2 for HSDHCH modified items.
@ -24325,7 +24325,7 @@ static const per_sequence_t HSDSCH_MACdFlow_Specific_InformationResp_Item_sequen
static int
dissect_nbap_HSDSCH_MACdFlow_Specific_InformationResp_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1699 "../../asn1/nbap/nbap.cnf"
#line 1698 "../../asn1/nbap/nbap.cnf"
num_items++;
@ -24741,7 +24741,7 @@ static const per_sequence_t HSDSCH_Paging_System_InformationFDD_sequence[] = {
static int
dissect_nbap_HSDSCH_Paging_System_InformationFDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 2073 "../../asn1/nbap/nbap.cnf"
#line 2072 "../../asn1/nbap/nbap.cnf"
/*
g_warning("HS-DSCH Type 3 NOT Implemented!");
*/
@ -24935,7 +24935,7 @@ static const per_sequence_t HSDSCH_MACdFlows_to_Delete_Item_sequence[] = {
static int
dissect_nbap_HSDSCH_MACdFlows_to_Delete_Item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1690 "../../asn1/nbap/nbap.cnf"
#line 1689 "../../asn1/nbap/nbap.cnf"
num_items++;
@ -24952,7 +24952,7 @@ static const per_sequence_t HSDSCH_MACdFlows_to_Delete_sequence_of[1] = {
static int
dissect_nbap_HSDSCH_MACdFlows_to_Delete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 1685 "../../asn1/nbap/nbap.cnf"
#line 1684 "../../asn1/nbap/nbap.cnf"
num_items = 0;
@ -28054,7 +28054,7 @@ dissect_nbap_NI_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static int
dissect_nbap_NodeB_CommunicationContextID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 2087 "../../asn1/nbap/nbap.cnf"
#line 2086 "../../asn1/nbap/nbap.cnf"
/*Set up and map that maps Node-B ids to CRNC ids, since often you only have one of them present in nbap*/
nbap_com_context_id_t *cur_val;
@ -28690,7 +28690,7 @@ dch_id = 0xFFFFFFFF;
umts_fp_conversation_info->channel = CHANNEL_DCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -28833,7 +28833,7 @@ BindingID_port = 0;
umts_fp_conversation_info->channel = CHANNEL_EDCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
@ -32393,7 +32393,7 @@ transportFormatSet_type = NBAP_CPCH;
umts_fp_conversation_info->channel = CHANNEL_FACH_FDD;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
/*Save unique UE-identifier */
@ -32558,7 +32558,7 @@ num_items = 1;
umts_fp_conversation_info->channel = CHANNEL_PCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->paging_indications = paging_indications;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -32701,7 +32701,7 @@ transportFormatSet_type = NBAP_CPCH;
umts_fp_conversation_info->channel = CHANNEL_RACH_FDD;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &dst_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr);
umts_fp_conversation_info->crnc_port = BindingID_port;
umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN;
@ -41068,7 +41068,7 @@ col_set_str(actx->pinfo->cinfo, COL_INFO,"RadioLinkReconfigurationCommit ");
actx->pinfo->link_dir=P2P_DIR_DL;
#line 2136 "../../asn1/nbap/nbap.cnf"
#line 2135 "../../asn1/nbap/nbap.cnf"
/*
* Here we need to signal the CFN value, down to FP so
* that lowert layers know when a reconfiguration becomes active
@ -55233,7 +55233,7 @@ static void add_hsdsch_bind(packet_info *pinfo){
umts_fp_conversation_info->channel = CHANNEL_HSDSCH;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = pinfo->fd->num;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address);
umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port;
/*Added june 3, normally just the iterator variable*/

8
epan/dissectors/packet-netflow.c
View File

@ -6350,8 +6350,8 @@ dissect_v9_v10_options_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p
if ((tmplt_p == NULL) && (tmplt.fields_p[TF_SCOPES] || tmplt.fields_p[TF_ENTRIES])) {
/* create permanent template copy for storage in template table */
tmplt_p = (v9_v10_tmplt_t *)wmem_memdup(wmem_file_scope(), &tmplt, sizeof(tmplt));
SE_COPY_ADDRESS(&tmplt_p->src_addr, &pinfo->net_src);
SE_COPY_ADDRESS(&tmplt_p->dst_addr, &pinfo->net_dst);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst);
/* Remember when we saw this template */
tmplt_p->template_frame_number = pinfo->fd->num;
/* Add completed entry into table */
@ -6450,8 +6450,8 @@ dissect_v9_v10_data_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdut
/* create permanent template copy for storage in template table */
tmplt_p = (v9_v10_tmplt_t *)wmem_memdup(wmem_file_scope(), &tmplt, sizeof(tmplt));
SE_COPY_ADDRESS(&tmplt_p->src_addr, &pinfo->net_src);
SE_COPY_ADDRESS(&tmplt_p->dst_addr, &pinfo->net_dst);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst);
/* Remember when we saw this template */
tmplt_p->template_frame_number = pinfo->fd->num;
g_hash_table_insert(v9_v10_tmplt_table, tmplt_p, tmplt_p);

6
epan/dissectors/packet-p_mul.c
View File

@ -331,7 +331,7 @@ static p_mul_seq_val *lookup_seq_val (guint32 message_id, guint16 seq_no,
p_mul_key->id = message_id;
p_mul_key->seq = seq_no;
SE_COPY_ADDRESS(&p_mul_key->addr, addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr);
pkg_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key);
@ -391,7 +391,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin
/* Try to match corresponding address PDU */
p_mul_key->id = message_id;
p_mul_key->seq = 0;
SE_COPY_ADDRESS(&p_mul_key->addr, addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr);
need_set_address = TRUE;
p_mul_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key);
@ -445,7 +445,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin
p_mul_key->id = message_id;
p_mul_key->seq = seq_no;
if (!need_set_address) {
SE_COPY_ADDRESS(&p_mul_key->addr, addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr);
}
p_mul_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key);

2
epan/dissectors/packet-rsvp.c
View File

@ -7593,7 +7593,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea
break;
}
SE_COPY_ADDRESS(&request_key.source_info.source, &rsvph->source);
WMEM_COPY_ADDRESS(wmem_file_scope(), &request_key.source_info.source, &rsvph->source);
request_key.source_info.udp_source_port = rsvph->udp_source_port;
/* See if a request with this key already exists */

4
epan/dissectors/packet-sip.c
View File

@ -4279,8 +4279,8 @@ guint sip_is_packet_resend(packet_info *pinfo,
/* Fill in key and value details */
g_snprintf(p_key->call_id, MAX_CALL_ID_SIZE, "%s", call_id);
SE_COPY_ADDRESS(&(p_key->dest_address), &pinfo->net_dst);
SE_COPY_ADDRESS(&(p_key->source_address), &pinfo->net_src);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(p_key->dest_address), &pinfo->net_dst);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(p_key->source_address), &pinfo->net_src);
p_key->dest_port = pinfo->destport;
if (sip_retrans_the_same_sport) {
p_key->source_port = pinfo->srcport;

6
epan/dissectors/packet-socks.c
View File

@ -296,7 +296,7 @@ static int get_address_v5(tvbuff_t *tvb, int offset,
case 1: /* IPv4 address */
if ( hash_info) {
TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4);
SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr);
}
offset += 4;
break;
@ -304,7 +304,7 @@ static int get_address_v5(tvbuff_t *tvb, int offset,
case 4: /* IPv6 address */
if ( hash_info) {
TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16);
SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr);
}
offset += 16;
break;
@ -699,7 +699,7 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb,
/* get remote address */
TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4);
SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr);
hash_info->clientState = clientDone;
}

2
epan/dissectors/packet-ssl-utils.c
View File

@ -3989,7 +3989,7 @@ ssl_session_init(SslDecryptSession* ssl_session)
void
ssl_set_server(SslDecryptSession* ssl, address *addr, port_type ptype, guint32 port)
{
SE_COPY_ADDRESS(&ssl->srv_addr, addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &ssl->srv_addr, addr);
ssl->srv_ptype = ptype;
ssl->srv_port = port;
}

4
epan/dissectors/packet-tn5250.c
View File

@ -5180,9 +5180,9 @@ add_tn5250_conversation(packet_info *pinfo, int tn5250e)
* it to the list of information structures.
*/
tn5250_info = wmem_new(wmem_file_scope(), tn5250_conv_info_t);
SE_COPY_ADDRESS(&(tn5250_info->outbound_addr),&(pinfo->dst));
WMEM_COPY_ADDRESS(wmem_file_scope(), &(tn5250_info->outbound_addr),&(pinfo->dst));
tn5250_info->outbound_port = pinfo->destport;
SE_COPY_ADDRESS(&(tn5250_info->inbound_addr),&(pinfo->src));
WMEM_COPY_ADDRESS(wmem_file_scope(), &(tn5250_info->inbound_addr),&(pinfo->src));
tn5250_info->inbound_port = pinfo->srcport;
conversation_add_proto_data(conversation, proto_tn5250, tn5250_info);
tn5250_info->next = tn5250_info_items;

2
epan/dissectors/packet-umts_fp.c
View File

@ -4531,7 +4531,7 @@ umts_fp_init_protocol(void)
umts_fp_conversation_info->channel = uat_umts_fp_ep_and_ch_records[i].channel_type;
umts_fp_conversation_info->dl_frame_number = 0;
umts_fp_conversation_info->ul_frame_number = 1;
SE_COPY_ADDRESS(&(umts_fp_conversation_info->crnc_address), &src_addr);
WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &src_addr);
umts_fp_conversation_info->crnc_port = uat_umts_fp_ep_and_ch_records[i].src_port;
umts_fp_conversation_info->rlc_mode = (enum fp_rlc_mode) uat_umts_fp_ep_and_ch_records[i].rlc_mode;
/*Save unique UE-identifier */

9
ui/gtk/wlan_stat_dlg.c
View File

@ -147,6 +147,7 @@ dealloc_wlan_details_ep (wlan_details_ep_t *details)
while (details) {
tmp = details;
details = details->next;
g_free ((void*)tmp->addr.data);
g_free (tmp);
}
}
@ -206,6 +207,7 @@ wlanstat_reset (void *phs)
tmp = list;
dealloc_wlan_details_ep(tmp->details);
list = tmp->next;
g_free((void*)tmp->bssid.data);
g_free(tmp);
}
@ -239,7 +241,7 @@ alloc_wlan_ep (const struct _wlan_hdr *si, const packet_info *pinfo _U_)
ep = (wlan_ep_t *)g_malloc (sizeof(wlan_ep_t));
SE_COPY_ADDRESS (&ep->bssid, &si->bssid);
COPY_ADDRESS (&ep->bssid, &si->bssid);
ep->stats.channel = si->stats.channel;
memcpy (ep->stats.ssid, si->stats.ssid, MAX_SSID_LEN);
ep->stats.ssid_len = si->stats.ssid_len;
@ -266,7 +268,7 @@ alloc_wlan_details_ep (const address *addr)
if (!(d_ep = (wlan_details_ep_t *)g_malloc (sizeof(wlan_details_ep_t))))
return NULL;
SE_COPY_ADDRESS (&d_ep->addr, addr);
COPY_ADDRESS (&d_ep->addr, addr);
d_ep->probe_req = 0;
d_ep->probe_rsp = 0;
d_ep->auth = 0;
@ -454,7 +456,8 @@ wlanstat_packet (void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const v
if (tmp->iter_valid) {
gtk_list_store_remove(store, &tmp->iter);
}
g_free (tmp);
g_free((void*)tmp->bssid.data);
g_free(tmp);
break;
}
prev = tmp;