summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asn1/nbap/nbap.cnf7
-rw-r--r--epan/dissectors/packet-nbap.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf
index f642be19e9..670d4bdc96 100644
--- a/asn1/nbap/nbap.cnf
+++ b/asn1/nbap/nbap.cnf
@@ -1325,10 +1325,6 @@ BindingID_port = 0;
address_to_str(wmem_packet_scope(), &dst_addr),
BindingID_port);
- /* Set address for collection of DDI entries */
- COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
- nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port;
-
g_tree_insert(edch_flow_port_map, GINT_TO_POINTER((gint)umts_fp_conversation_info->com_context_id), nbap_edch_port_info);
}else{
@@ -1342,6 +1338,9 @@ BindingID_port = 0;
old_info->crnc_port[e_dch_macdflow_id] = BindingID_port;
}
+ /* Set address for collection of DDI entries */
+ COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
+ nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port;
set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 77f564411d..39d8c426ff 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -28872,10 +28872,6 @@ BindingID_port = 0;
address_to_str(wmem_packet_scope(), &dst_addr),
BindingID_port);
- /* Set address for collection of DDI entries */
- COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
- nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port;
-
g_tree_insert(edch_flow_port_map, GINT_TO_POINTER((gint)umts_fp_conversation_info->com_context_id), nbap_edch_port_info);
}else{
@@ -28889,6 +28885,9 @@ BindingID_port = 0;
old_info->crnc_port[e_dch_macdflow_id] = BindingID_port;
}
+ /* Set address for collection of DDI entries */
+ COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr);
+ nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port;
set_umts_fp_conv_data(conversation, umts_fp_conversation_info);