continue 5G SA

ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf

@@ -199,7 +199,7 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+    mme_ip_address      = ( { ipv4       = "127.0.0.20";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -211,7 +211,7 @@ gNBs =
     t_reloc_prep      = 1000;      /* unit: millisecond */
     tx2_reloc_overall = 2000;      /* unit: millisecond */
     target_enb_x2_ip_address      = (
-                                     { ipv4       = "CI_FR1_CTL_ENB_IP_ADDR";
+                                     { ipv4       = "127.0.0.10";
                                        ipv6       = "192:168:30::17";
                                        preference = "ipv4";
                                      }
@@ -221,11 +221,11 @@ gNBs =
     {
 
         GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "CI_GNB_IP_ADDR";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "127.0.0.10";
         GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "CI_GNB_IP_ADDR";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.10";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        GNB_IPV4_ADDRESS_FOR_X2C                 = "CI_GNB_IP_ADDR";
+        GNB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.10";
         GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
@@ -257,7 +257,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 114;
          eNB_instances  = [0];
-         clock_src = "external";
+         clock_src = "internal";
     }
 );  
 

cmake_targets/CMakeLists.txt

@@ -377,6 +377,7 @@ add_custom_target (
 
 add_library(NR_RRC_LIB ${nr_rrc_h} ${nr_rrc_source} 
     ${OPENAIR2_DIR}/RRC/NR/MESSAGES/asn1_msg.c
+    ${OPENAIR2_DIR}/RRC/NR/nr_rrc_gNB.c
     )
 add_dependencies(NR_RRC_LIB nr_rrc_flag)
 include_directories ("${NR_RRC_FULL_DIR}")

executables/ocp-gnb.c

@@ -436,7 +436,7 @@ void OCPconfig_RU(RU_t *ru) {
 
   if (strcmp(*(RUParamList.paramarray[j][RU_LOCAL_RF_IDX].strptr), "yes") == 0) {
     if ( !(config_isparamset(RUParamList.paramarray[j],RU_LOCAL_IF_NAME_IDX)) ) {
-      ru->if_south                        = LOCAL_RF;
+      ru->if_south                        = REMOTE_IF5; //TBD: max value to avoid to call "ru" functions
       ru->function                        = gNodeB_3GPP;
       printf("Setting function for RU %d to gNodeB_3GPP\n",j);
     } else {
@@ -472,7 +472,7 @@ void OCPconfig_RU(RU_t *ru) {
 // this is for RU with local RF unit
 void fill_rf_config(RU_t *ru, char *rf_config_file) {
   int i;
-  NR_DL_FRAME_PARMS *fp   = ru->nr_frame_parms;
+  NR_DL_FRAME_PARMS *fp   = ru->nr_frame_parms; 
   nfapi_nr_config_request_scf_t *gNB_config = &ru->gNB_list[0]->gNB_config; //tmp index
   openair0_config_t *cfg   = &ru->openair0_cfg;
   int mu = gNB_config->ssb_config.scs_common.value;

openair1/PHY/TOOLS/lte_enb_scope.c

@@ -97,7 +97,7 @@ static void *scope_thread_eNB(void *arg) {
       }
     }
 
-    sleep(1);
+    usleep(100*1000);
   }
 
   //  printf("%s",stats_buffer);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -442,7 +442,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_gNB_DLSCH_ULSCH_SCHEDULER,VCD_FUNCTION_IN);
 
   pdcp_run(&ctxt);
-  //rrc_rx_tx(&ctxt, CC_id);
+  nr_rrc_rx_tx(); //&ctxt, CC_id);
   /* send tick to RLC every ms */
   if ((slot & ((1 << *scc->ssbSubcarrierSpacing) - 1)) == 0) {
     void nr_rlc_tick(int frame, int subframe);

openair2/RRC/NR/nr_rrc_gNB.c

@@ -20,18 +20,13 @@
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
  */
+#include <openair2/RRC/LTE/MESSAGES/asn1_msg.h>
+#include <openair2/RRC/NR/nr_rrc_proto.h>
 
-rrc_gNB_send_NGAP_NAS_FIRST_REQ() {
-   // We are noCore only now
-   // create message that should come from 5GC
-  
-   // send it dow
-   rrc_gNB_process_NGAP_DOWNLINK_NAS()
-}
-
-rrc_gNB_process_NGAP_DOWNLINK_NAS () {
-   do_DLInformationTransfer();
+void rrc_gNB_process_NGAP_DOWNLINK_NAS (void ) {
+   do_DLInformationTransfer(0,NULL,0,0,NULL);
    // send it as DL data
+/*
     rrc_data_req (
       &ctxt,
       srb_id,
@@ -40,9 +35,23 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS () {
       length,
       buffer,
       PDCP_TRANSMISSION_MODE_CONTROL);
+*/
 
 }
 
+void rrc_gNB_send_NGAP_NAS_FIRST_REQ(void ) {
+   // We are noCore only now
+   // create message that should come from 5GC
+  
+   // send it dow
+   rrc_gNB_process_NGAP_DOWNLINK_NAS();
+}
 
-:q
+void nr_rrc_rx_tx() {
+  // check timers 
 
+  // check if UEs are lost, to remove them from upper layers
+
+  //
+
+}

openair2/RRC/NR/nr_rrc_proto.h

@@ -91,7 +91,7 @@ int generate_CG_Config(gNB_RRC_INST *rrc,
 
 int parse_CG_ConfigInfo(gNB_RRC_INST *rrc, NR_CG_ConfigInfo_t *CG_ConfigInfo, x2ap_ENDC_sgnb_addition_req_t *m);
 
-
+void nr_rrc_rx_tx(void);
 
 /**\brief RRC eNB task.
    \param void *args_p Pointer on arguments to start the task. */

openair2/UTIL/OPT/probe.c

@@ -457,7 +457,7 @@ void trace_pdu_implementation(int direction, uint8_t *pdu_buffer, unsigned int p
 }
 
 /*---------------------------------------------------*/
-int init_opt(void) {
+int init_opt(void) { 
   in_type=malloc(200);
   in_ip=malloc(200);
   in_path=malloc(200);
@@ -476,11 +476,9 @@ int init_opt(void) {
   } else if (tmptype == OPT_PCAP && strlen(in_path) > 0) {
     opt_type = OPT_PCAP;
     opt_enabled=1;
-    LOG_I(OPT,"Enabling OPT for PCAP  with the following file %s \n",in_path);
   } else if (tmptype == OPT_WIRESHARK && strlen(in_ip) > 0) {
     opt_enabled=1;
     opt_type = OPT_WIRESHARK;
-    LOG_I(OPT,"Enabling OPT for wireshark for local interface %s\n",in_ip);
   } else {
     LOG_E(OPT,"Invalid OPT configuration\n");
     config_printhelp(opt_params,sizeof(opt_params)/sizeof(paramdef_t),OPT_CONFIGPREFIX);
@@ -489,9 +487,9 @@ int init_opt(void) {
   // trace_mode
   switch (opt_type) {
     case OPT_WIRESHARK:
-
+      LOG_I(OPT,"mode Wireshark: ip %s port %d\n", in_ip, PACKET_MAC_LTE_DEFAULT_UDP_PORT);
       /* Create local server socket only if using localhost address */
-      if (strcmp(in_ip, "127.0.0.1") == 0) {
+      if (strncmp(in_ip, "127.0.0.1", 4) == 0) {
         opt_create_listener_socket(in_ip, PACKET_MAC_LTE_DEFAULT_UDP_PORT);
       }
 
@@ -510,6 +508,7 @@ int init_opt(void) {
       break;
 
     case OPT_PCAP:
+      LOG_I(OPT,"mode PCAB : path is %s \n",in_path);
       file_fd = fopen(in_path, "w");
 
       if (file_fd == NULL) {
@@ -528,19 +527,9 @@ int init_opt(void) {
 
     default:
       opt_type = OPT_NONE;
-      LOG_W(OPT, "supported Option\n");
+       LOG_E(OPT,"Unsupported or unknown mode %d \n", opt_type);
       break;
   }
-
-  if ( opt_type == OPT_WIRESHARK )
-    LOG_E(OPT,"mode Wireshark: ip %s port %d\n", in_ip, PACKET_MAC_LTE_DEFAULT_UDP_PORT);
-  else if (opt_type == OPT_PCAP)
-    LOG_E(OPT,"mode PCAB : path is %s \n",in_path);
-  else
-    LOG_E(OPT,"Unsupported or unknown mode %d \n", opt_type);
-
-  //  mac_info = (mac_info*)malloc16(sizeof(mac_lte_info));
-  // memset(mac_info, 0, sizeof(mac_lte_info)+pdu_buffer_size + 8);
   return (1);
 }
 

openair3/NAS/COMMON/NR_NAS_defs.h

@@ -310,7 +310,7 @@ typedef struct  __attribute__((packed)) {
 }
 authenticationrequestHeader_t;
 
-typedef struct  __attribute__((packed){
+typedef struct  __attribute__((packed)) {
   Extendedprotocoldiscriminator_t epd:8;
   Security_header_t sh:8;
   SGSmobilitymanagementmessages_t mt:8;