F1AP: remove default stream ID, we never use anything else but 0

openair2/COMMON/f1ap_messages_types.h

@@ -118,8 +118,6 @@ typedef struct f1ap_setup_req_s {
   uint16_t sctp_in_streams;
   uint16_t sctp_out_streams;
 
-  uint16_t default_sctp_stream_id;
-
   // F1_Setup_Req payload
   uint64_t gNB_DU_id;
   char *gNB_DU_name;

openair2/F1AP/f1ap_common.h

@@ -408,7 +408,6 @@ typedef struct f1ap_cudu_inst_s {
   f1ap_setup_req_t setupReq;
   uint16_t sctp_in_streams;
   uint16_t sctp_out_streams;
-  uint16_t default_sctp_stream_id;
   instance_t gtpInst;
   uint64_t gNB_DU_id;
   uint16_t num_ues;

openair2/F1AP/f1ap_cu_interface_management.c

@@ -366,7 +366,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
   }
 
   ASN_STRUCT_RESET(asn_DEF_F1AP_F1AP_PDU, &pdu);
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }
 
@@ -436,7 +436,7 @@ int CU_send_F1_SETUP_FAILURE(instance_t instance) {
   }
 
   ASN_STRUCT_RESET(asn_DEF_F1AP_F1AP_PDU, &pdu);
-  f1ap_itti_send_sctp_data_req(true,instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(true,instance, buffer, len);
   return 0;
 }
 
@@ -552,7 +552,7 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, f1ap_gnb_cu_configu
 
   LOG_DUMPMSG(F1AP, LOG_DUMP_CHAR, buffer, len, "F1AP gNB-CU CONFIGURATION UPDATE : ");
   ASN_STRUCT_RESET(asn_DEF_F1AP_F1AP_PDU, &pdu);
-  f1ap_itti_send_sctp_data_req(true,instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(true,instance, buffer, len);
   return 0;
 }
 

openair2/F1AP/f1ap_cu_paging.c

@@ -115,6 +115,6 @@ int CU_send_Paging(instance_t instance, f1ap_paging_ind_t *paging) {
     return -1;
   }
   ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_F1AP_F1AP_PDU, &pdu);
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -209,7 +209,7 @@ int CU_send_DL_RRC_MESSAGE_TRANSFER(instance_t                instance,
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0 /* BK: fix me*/);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }
 

openair2/F1AP/f1ap_cu_task.c

@@ -56,7 +56,6 @@ static void cu_task_handle_sctp_association_ind(instance_t instance, sctp_new_as
   f1ap_cu_data->assoc_id         = sctp_new_association_ind->assoc_id;
   f1ap_cu_data->sctp_in_streams  = sctp_new_association_ind->in_streams;
   f1ap_cu_data->sctp_out_streams = sctp_new_association_ind->out_streams;
-  f1ap_cu_data->default_sctp_stream_id = 0;
   if (RC.nrrrc[instance]->node_type != ngran_gNB_CUCP) {
     getCxt(CUtype, instance)->gtpInst = cu_task_create_gtpu_instance(IPaddrs);
     AssertFatal(getCxt(CUtype, instance)->gtpInst > 0, "Failed to create CU F1-U UDP listener");

openair2/F1AP/f1ap_cu_ue_context_management.c

@@ -628,7 +628,7 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(instance_t instance,
   //   return -1;
   // }
   LOG_D(F1AP,"F1AP UEContextSetupRequest Encoded %u bits\n", len);
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0 /* BK: fix me*/);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }
 
@@ -916,7 +916,7 @@ int CU_send_UE_CONTEXT_RELEASE_COMMAND(instance_t instance,
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }
 int CU_handle_UE_CONTEXT_RELEASE_COMPLETE(instance_t       instance,
@@ -1562,7 +1562,7 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, f1ap_ue_context
     LOG_E(F1AP, "Failed to encode F1 UE CONTEXT_MODIFICATION REQUEST\n");
     return -1;
   }
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0 /* BK: fix me*/);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }
 
@@ -1892,7 +1892,7 @@ int CU_send_UE_CONTEXT_MODIFICATION_CONFIRM(instance_t instance, f1ap_ue_context
     LOG_E(F1AP, "Failed to encode F1 UE Context Modification Confirm\n");
     return -1;
   }
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }
 
@@ -1959,6 +1959,6 @@ int CU_send_UE_CONTEXT_MODIFICATION_REFUSE(instance_t instance, f1ap_ue_context_
     LOG_E(F1AP, "Failed to encode F1 UE Context Modification Refuse\n");
     return -1;
   }
-  f1ap_itti_send_sctp_data_req(true, instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(true, instance, buffer, len);
   return 0;
 }

openair2/F1AP/f1ap_du_interface_management.c

@@ -348,7 +348,7 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
   }
 
   ASN_STRUCT_RESET(asn_DEF_F1AP_F1AP_PDU, &pdu);
-  f1ap_itti_send_sctp_data_req(false, instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }
 
@@ -985,7 +985,7 @@ int DU_send_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
   }
 
   ASN_STRUCT_RESET(asn_DEF_F1AP_F1AP_PDU, &pdu);
-  f1ap_itti_send_sctp_data_req(false, instance, buffer, len, 0);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }
 

openair2/F1AP/f1ap_du_rrc_message_transfer.c

@@ -213,7 +213,7 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t instanceP, const f1ap_ini
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(false, instanceP, buffer, len, getCxt(DUtype, instanceP)->default_sctp_stream_id);
+  f1ap_itti_send_sctp_data_req(false, instanceP, buffer, len);
   return 0;
 }
 
@@ -279,6 +279,6 @@ int DU_send_UL_NR_RRC_MESSAGE_TRANSFER(instance_t instance, const f1ap_ul_rrc_me
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(false, instance, buffer, len, getCxt(DUtype, instance)->default_sctp_stream_id);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }

openair2/F1AP/f1ap_du_task.c

@@ -82,7 +82,6 @@ void du_task_handle_sctp_association_resp(instance_t instance, sctp_new_associat
   f1ap_du_data->assoc_id         = sctp_new_association_resp->assoc_id;
   f1ap_du_data->sctp_in_streams  = sctp_new_association_resp->in_streams;
   f1ap_du_data->sctp_out_streams = sctp_new_association_resp->out_streams;
-  f1ap_du_data->default_sctp_stream_id = 0;
   /* setup parameters for F1U and start the server */
   DU_send_F1_SETUP_REQUEST(instance);
 }

openair2/F1AP/f1ap_du_ue_context_management.c

@@ -544,10 +544,7 @@ int DU_send_UE_CONTEXT_SETUP_RESPONSE(instance_t instance, f1ap_ue_context_setup
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(false, instance,
-                               buffer,
-                               len,
-                               getCxt(false, instance)->default_sctp_stream_id);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }
 
@@ -622,10 +619,7 @@ int DU_send_UE_CONTEXT_RELEASE_REQUEST(instance_t instance,
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(false, instance,
-                               buffer,
-                               len,
-                               getCxt(false, instance)->default_sctp_stream_id);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }
 
@@ -772,10 +766,7 @@ int DU_send_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, f1ap_ue_context_rel
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(false, instance,
-                               buffer,
-                               len,
-                               getCxt(false, instance)->default_sctp_stream_id);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }
 
@@ -1278,7 +1269,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance, f1ap_ue_contex
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(false, instance, buffer, len, getCxt(false, instance)->default_sctp_stream_id);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }
 
@@ -1402,7 +1393,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_REQUIRED(instance_t instance, f1ap_ue_contex
     return -1;
   }
 
-  f1ap_itti_send_sctp_data_req(false, instance, buffer, len, getCxt(false, instance)->default_sctp_stream_id);
+  f1ap_itti_send_sctp_data_req(false, instance, buffer, len);
   return 0;
 }
 

openair2/F1AP/f1ap_itti_messaging.c

@@ -22,8 +22,8 @@
 #include "f1ap_common.h"
 #include "f1ap_itti_messaging.h"
 
-void f1ap_itti_send_sctp_data_req(bool isCu, instance_t instance, uint8_t *buffer,
-                                  uint32_t buffer_length, uint16_t stream) {
+void f1ap_itti_send_sctp_data_req(bool isCu, instance_t instance, uint8_t *buffer, uint32_t buffer_length)
+{
   MessageDef      *message_p;
   sctp_data_req_t *sctp_data_req;
   message_p = itti_alloc_new_message(isCu?TASK_CU_F1:TASK_DU_F1, 0, SCTP_DATA_REQ);
@@ -31,7 +31,7 @@ void f1ap_itti_send_sctp_data_req(bool isCu, instance_t instance, uint8_t *buffe
   sctp_data_req->assoc_id      =  f1ap_assoc_id(isCu,instance);
   sctp_data_req->buffer        = buffer;
   sctp_data_req->buffer_length = buffer_length;
-  sctp_data_req->stream = stream;
+  sctp_data_req->stream = 0;
   LOG_D(F1AP, "Sending ITTI message to SCTP Task\n");
   itti_send_msg_to_task(TASK_SCTP, instance, message_p);
 }

openair2/F1AP/f1ap_itti_messaging.h

@@ -22,7 +22,6 @@
 #ifndef F1AP_ITTI_MESSAGING_H_
 #define F1AP_ITTI_MESSAGING_H_
 
-void f1ap_itti_send_sctp_data_req(bool isCu,instance_t instance, uint8_t *buffer,
-                                  uint32_t buffer_length, uint16_t stream);
+void f1ap_itti_send_sctp_data_req(bool isCu,instance_t instance, uint8_t *buffer, uint32_t buffer_length);
 
 #endif /* F1AP_ITTI_MESSAGING_H_ */