Merge branch 'episys/andrew/fixing_s1_mode+change_to_shutdown' into 'episys/master'

This commit includes:

See merge request aburger/openairinterface5g!7

ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf

@@ -13,9 +13,9 @@ eNBs =
     eNB_name  =  "eNB-Eurecom-LTEBox";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code = 1;
+    tracking_area_code = 5;
 
-    plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
+    plmn_list = ( { mcc = 320; mnc = 230; mnc_length = 3; } );
 
     tr_s_preference     = "local_mac"
 
@@ -172,7 +172,7 @@ eNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
+    mme_ip_address      = ( { ipv4       = "192.168.61.3";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -188,12 +188,12 @@ eNBs =
 
     NETWORK_INTERFACES :
     {
-        ENB_INTERFACE_NAME_FOR_S1_MME            = "ens3";
-        ENB_IPV4_ADDRESS_FOR_S1_MME              = "CI_ENB_IP_ADDR";
-        ENB_INTERFACE_NAME_FOR_S1U               = "ens3";
-        ENB_IPV4_ADDRESS_FOR_S1U                 = "CI_ENB_IP_ADDR";
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "ctrl0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "172.16.1.1";
+        ENB_INTERFACE_NAME_FOR_S1U               = "ctrl0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "172.16.1.1";
         ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        ENB_IPV4_ADDRESS_FOR_X2C                 = "CI_ENB_IP_ADDR";
+        ENB_IPV4_ADDRESS_FOR_X2C                 = "0.0.0.0";
         ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
         
     };

executables/softmodem-common.c

@@ -197,10 +197,10 @@ void set_softmodem_sighandler(void) {
   memset(&act,0,sizeof(act));
   act.sa_handler=signal_handler;
   sigaction(SOFTMODEM_RTSIGNAL,&act,&oldact);
-  printf("Send signal %d to display resource usage...\n",SIGRTMIN+1);
-  signal(SIGSEGV, signal_handler);
-  signal(SIGINT,  signal_handler);
-  signal(SIGTERM, signal_handler);
-  signal(SIGABRT, signal_handler);
+  // printf("Send signal %d to display resource usage...\n",SIGRTMIN+1);
+  // signal(SIGSEGV, signal_handler);
+  // signal(SIGINT,  signal_handler);
+  // signal(SIGTERM, signal_handler);
+  // signal(SIGABRT, signal_handler);
 }
 

openair2/RRC/LTE/rrc_UE.c

@@ -4382,12 +4382,15 @@ void *rrc_ue_task( void *args_p ) {
               RRC_MAC_BCCH_DATA_IND (msg_p).frame, RRC_MAC_BCCH_DATA_IND (msg_p).enb_index);
         //      PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt, instance, ENB_FLAG_NO, NOT_A_RNTI, RRC_MAC_BCCH_DATA_IND (msg_p).frame, 0);
         PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, ue_mod_id, ENB_FLAG_NO, NOT_A_RNTI, RRC_MAC_BCCH_DATA_IND (msg_p).frame, 0,RRC_MAC_BCCH_DATA_IND (msg_p).enb_index);
-        decode_BCCH_DLSCH_Message (&ctxt,
-                                   RRC_MAC_BCCH_DATA_IND (msg_p).enb_index,
-                                   RRC_MAC_BCCH_DATA_IND (msg_p).sdu,
-                                   RRC_MAC_BCCH_DATA_IND (msg_p).sdu_size,
-                                   RRC_MAC_BCCH_DATA_IND (msg_p).rsrq,
-                                   RRC_MAC_BCCH_DATA_IND (msg_p).rsrp);
+        if (UE_rrc_inst[ue_mod_id].RrcState != RRC_STATE_INACTIVE)
+        {
+          decode_BCCH_DLSCH_Message(&ctxt,
+                                    RRC_MAC_BCCH_DATA_IND(msg_p).enb_index,
+                                    RRC_MAC_BCCH_DATA_IND(msg_p).sdu,
+                                    RRC_MAC_BCCH_DATA_IND(msg_p).sdu_size,
+                                    RRC_MAC_BCCH_DATA_IND(msg_p).rsrq,
+                                    RRC_MAC_BCCH_DATA_IND(msg_p).rsrp);
+        }
         break;
 
       case RRC_MAC_BCCH_MBMS_DATA_IND:

targets/RT/USER/lte-ue.c

@@ -2430,7 +2430,7 @@ void init_UE_single_thread_stub(int nb_inst)
     AssertFatal(PHY_vars_UE_g[i]!=NULL,"PHY_vars_UE_g[inst] is NULL\n");
     AssertFatal(PHY_vars_UE_g[i][0]!=NULL,"PHY_vars_UE_g[inst][0] is NULL\n");
 
-    if(NFAPI_MODE==NFAPI_UE_STUB_PNF) {
+    if(NFAPI_MODE==NFAPI_UE_STUB_PNF || NFAPI_MODE_STANDALONE_PNF) {
 #ifdef NAS_UE
       MessageDef *message_p;
       message_p = itti_alloc_new_message(TASK_NAS_UE, INITIALIZE_MESSAGE);