UL traffic issue fixed-Support more than one apps

openair2/RRC/LITE/L2_interface.c

@@ -754,4 +754,5 @@ void rrc_lite_ue_update_ho_status(module_id_t Mod_idP){
 	//UE_rrc_inst[Mod_idP].HandoverInfoUe.measFlag = 0; // Stop the measurements
 	UE_mac_inst[Mod_idP].RA_active = 0;
 	UE_rrc_inst[Mod_idP].Info[0].State = RRC_RECONFIGURED;
+	LOG_D(RRC,"UE is updated: Mod_id: %d/State: %d\n",Mod_idP,UE_rrc_inst[Mod_idP].Info[0].State);
 }

openair2/UTIL/OMG/TRACE/handover.tr

 0 0 1800 4800 1000
 1 0 4700 4840 1000
 2 0 1800 4800 1000
+3 0 4700 4840 1000

openair2/UTIL/OTG/otg_tx.c

@@ -273,8 +273,7 @@ unsigned char *packet_gen(
   //LOG_I(OTG,"Src: %d - Dest: %d - before exit\n",src_instance,dst_instance);
   // check if the app is configured
   if (app >= g_otg->application_idx[src_instance][dst_instance]) {
-	//LOG_I(OTG,"Src: %d - Dest: %d - no packet to generate - no application\n",src_instance,dst_instance);
-    return NULL;
+	    return NULL;
   }
 
   LOG_T(OTG,"[src %d] [dst %d ][APP %d] current time  %d\n",src_instance,  dst_instance, app, ctime);

targets/SIMU/EXAMPLES/OSD/WEBXML/template_42.xml

@@ -100,6 +100,7 @@
       <SIZE_MIN_byte>850</SIZE_MIN_byte>
       <SIZE_MAX_byte>1408</SIZE_MAX_byte>
     </CUSTOMIZED_TRAFFIC>
+
   <!--</APPLICATION_CONFIG> -->
 
 <!-- DL -->

targets/SIMU/USER/oaisim_functions.c

@@ -1468,16 +1468,17 @@ void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
 void update_otg_UE(module_id_t ue_mod_idP, unsigned int ctime)
 {
 #if defined(USER_MODE) && defined(OAI_EMU)
-
-  if (oai_emulation.info.otg_enabled ==1 ) {
+	int app_id;
+ if (oai_emulation.info.otg_enabled ==1 ) {
     module_id_t dst_id, src_id; //dst_id = eNB_index
     module_id_t module_id = ue_mod_idP+NB_eNB_INST;
 
     src_id = module_id;
 
-    for (dst_id=0; dst_id<NB_SIG_CNX_UE; dst_id++) {
+   for (dst_id=0; dst_id<NB_SIG_CNX_UE; dst_id++) {
       // only consider the first attached eNB
-      if (mac_UE_get_rrc_status(ue_mod_idP, dst_id ) > 2 /*RRC_CONNECTED*/) {
+     if (mac_UE_get_rrc_status(ue_mod_idP, dst_id ) > 2 /*RRC_CONNECTED*/) {
+      for (app_id=0; app_id<MAX_NUM_APPLICATION; app_id++) {
         Packet_otg_elt_t *otg_pkt = malloc (sizeof(Packet_otg_elt_t));
 
         if (otg_pkt!=NULL)
@@ -1487,7 +1488,7 @@ void update_otg_UE(module_id_t ue_mod_idP, unsigned int ctime)
           exit(-1);
         }// Manage to add this packet to the tail of your list
 
-        (otg_pkt->otg_pkt).sdu_buffer = (uint8_t*) packet_gen(src_id, dst_id, 0, ctime, &((otg_pkt->otg_pkt).sdu_buffer_size));
+        (otg_pkt->otg_pkt).sdu_buffer = (uint8_t*) packet_gen(src_id, dst_id, app_id, ctime, &((otg_pkt->otg_pkt).sdu_buffer_size));
 
         if ((otg_pkt->otg_pkt).sdu_buffer != NULL) {
           (otg_pkt->otg_pkt).rb_id     = DTCH-2;
@@ -1503,6 +1504,7 @@ void update_otg_UE(module_id_t ue_mod_idP, unsigned int ctime)
           free(otg_pkt);
           otg_pkt=NULL;
         }
+       }
       }
     }
   }