aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1/nbap/nbap.cnf
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/asn1/nbap/nbap.cnf')
-rw-r--r--epan/dissectors/asn1/nbap/nbap.cnf48
1 files changed, 21 insertions, 27 deletions
diff --git a/epan/dissectors/asn1/nbap/nbap.cnf b/epan/dissectors/asn1/nbap/nbap.cnf
index 1068af2767..2dc1e80655 100644
--- a/epan/dissectors/asn1/nbap/nbap.cnf
+++ b/epan/dissectors/asn1/nbap/nbap.cnf
@@ -836,7 +836,7 @@ private_data_set_transport_format_set_type(actx->pinfo, NBAP_CPCH);
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
- conversation = conversation_new(actx->pinfo->num, &dst_addr, &null_addr, PT_UDP, bindingID, 0, NO_ADDR2|NO_PORT2);
+ conversation = conversation_new(actx->pinfo->num, &dst_addr, &null_addr, ENDPOINT_UDP, bindingID, 0, NO_ADDR2|NO_PORT2);
conversation_set_dissector(conversation, fp_handle);
@@ -938,7 +938,7 @@ private_data_set_num_items(actx->pinfo, 1);
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
- conversation = conversation_new(actx->pinfo->num, &dst_addr, &null_addr, PT_UDP, bindingID, 0, NO_ADDR2|NO_PORT2);
+ conversation = conversation_new(actx->pinfo->num, &dst_addr, &null_addr, ENDPOINT_UDP, bindingID, 0, NO_ADDR2|NO_PORT2);
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
@@ -1048,7 +1048,7 @@ private_data_set_transport_format_set_type(actx->pinfo, NBAP_CPCH);
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
- conversation = conversation_new(actx->pinfo->num, &dst_addr, &null_addr, PT_UDP, bindingID, 0, NO_ADDR2|NO_PORT2);
+ conversation = conversation_new(actx->pinfo->num, &dst_addr, &null_addr, ENDPOINT_UDP, bindingID, 0, NO_ADDR2|NO_PORT2);
/* Set dissector */
conversation_set_dissector(conversation, fp_handle);
@@ -1290,14 +1290,14 @@ private_data_set_dch_id(actx->pinfo, 0xFFFFFFFF);
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
- conversation = find_conversation(actx->pinfo->num,&dst_addr,
- &null_addr, PT_UDP,private_data_get_binding_id_port(actx->pinfo),
+ conversation = find_conversation(actx->pinfo->num, &dst_addr,
+ &null_addr, ENDPOINT_UDP, private_data_get_binding_id_port(actx->pinfo),
0, NO_ADDR_B|NO_PORT_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->num, &dst_addr,
- &null_addr, PT_UDP,private_data_get_binding_id_port(actx->pinfo),
+ &null_addr, ENDPOINT_UDP, private_data_get_binding_id_port(actx->pinfo),
0, NO_ADDR2|NO_PORT2);
/* Set dissector */
@@ -1407,8 +1407,8 @@ private_data_set_binding_id_port(actx->pinfo, 0);
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
- conversation = find_conversation(actx->pinfo->num,&dst_addr,
- &null_addr, PT_UDP, bindingID,
+ conversation = find_conversation(actx->pinfo->num, &dst_addr,
+ &null_addr, ENDPOINT_UDP, bindingID,
0, NO_ADDR_B|NO_PORT_B);
if (conversation) {
umts_fp_conversation_info = (umts_fp_conversation_info_t*)conversation_get_proto_data(conversation, proto_fp);
@@ -1423,7 +1423,7 @@ private_data_set_binding_id_port(actx->pinfo, 0);
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->num, &dst_addr,
- &null_addr, PT_UDP, bindingID,
+ &null_addr, ENDPOINT_UDP, bindingID,
0, NO_ADDR2|NO_PORT2);
/* Set dissector */
@@ -1518,8 +1518,7 @@ nbap_edch_channel_info = private_data_get_nbap_edch_channel_info(actx->pinfo);
e_dch_macdflow_id = private_data_get_e_dch_macdflow_id(actx->pinfo);
clear_address(&null_addr);
p_conv = find_conversation(actx->pinfo->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
- PT_UDP,
- nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B);
+ ENDPOINT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B);
if(!p_conv)
return offset;
@@ -1585,8 +1584,8 @@ private_data_set_binding_id_port(actx->pinfo, 0);
set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4);
- old_conversation = find_conversation(actx->pinfo->num,&dst_addr,
- &null_addr, PT_UDP, bindingID,
+ old_conversation = find_conversation(actx->pinfo->num, &dst_addr,
+ &null_addr, ENDPOINT_UDP, bindingID,
0, NO_ADDR_B|NO_PORT_B);
if(old_conversation){
@@ -1601,7 +1600,7 @@ private_data_set_binding_id_port(actx->pinfo, 0);
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(actx->pinfo->num, &dst_addr,
- &null_addr, PT_UDP, bindingID,
+ &null_addr, ENDPOINT_UDP, bindingID,
0, NO_ADDR2|NO_PORT2);
/* Set dissector */
@@ -1710,8 +1709,7 @@ private_data_set_num_items(actx->pinfo, 1);
/* Check if we have conversation info */
clear_address(&null_addr);
p_conv = find_conversation(actx->pinfo->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr,
- PT_UDP,
- nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B);
+ ENDPOINT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B);
if(!p_conv)
return offset;
@@ -1987,15 +1985,14 @@ nbap_hsdsch_channel_info = private_data_get_nbap_hsdsch_channel_info(actx->pinfo
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->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
- PT_UDP,
- nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
+ ENDPOINT_UDP, nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
nbap_debug("Frame %%u HSDSCH-MACdFlows-Information: Set up conv on Port %%u", actx->pinfo->num, nbap_hsdsch_channel_info[i].crnc_port);
conversation = conversation_new(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address),
- &null_addr, PT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
+ &null_addr, ENDPOINT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
0, NO_ADDR2|NO_PORT2);
/* Set dissector */
@@ -2117,8 +2114,7 @@ nbap_hsdsch_channel_info = private_data_get_nbap_hsdsch_channel_info(actx->pinfo
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->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
- PT_UDP,
- nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
+ ENDPOINT_UDP, nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
if (conversation == NULL) {
@@ -2126,7 +2122,7 @@ nbap_hsdsch_channel_info = private_data_get_nbap_hsdsch_channel_info(actx->pinfo
nbap_debug(" Set up conv on Port %%u", nbap_hsdsch_channel_info[i].crnc_port);
conversation = conversation_new(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address),
- &null_addr, PT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
+ &null_addr, ENDPOINT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
0, NO_ADDR2|NO_PORT2);
/* Set dissector */
@@ -2261,12 +2257,11 @@ int i;
if (nbap_common_channel_info[i].crnc_port != 0){
conversation = find_conversation(actx->pinfo->num, &(nbap_common_channel_info[i].crnc_address), &null_addr,
- PT_UDP,
- nbap_common_channel_info[i].crnc_port, 0, NO_ADDR_B);
+ ENDPOINT_UDP, nbap_common_channel_info[i].crnc_port, 0, NO_ADDR_B);
if (conversation == NULL) {
conversation = conversation_new(actx->pinfo->num, &(nbap_common_channel_info[i].crnc_address),
- &null_addr, PT_UDP, nbap_common_channel_info[i].crnc_port,
+ &null_addr, ENDPOINT_UDP, nbap_common_channel_info[i].crnc_port,
0, NO_ADDR2|NO_PORT2);
/* Set dissector */
@@ -2365,8 +2360,7 @@ nbap_hsdsch_channel_info = private_data_get_nbap_hsdsch_channel_info(actx->pinfo
for (i = 0; i < maxNrOfMACdFlows; i++) {
if (nbap_hsdsch_channel_info[i].crnc_port != 0){
conversation = find_conversation(actx->pinfo->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr,
- PT_UDP,
- nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
+ ENDPOINT_UDP, nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B);
if(conversation != NULL){
umts_fp_conversation_info = (umts_fp_conversation_info_t *)conversation_get_proto_data(conversation, proto_fp);
DISSECTOR_ASSERT(umts_fp_conversation_info != NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 10:29:12 +0000