test repeat

openair2/LAYER2/RLC/rlc.h

@@ -386,7 +386,12 @@ public_rlc_rrc(rlc_op_status_t rrc_rlc_remove_ue (const protocol_ctxt_t* const);
 * \param[in]  rb_idP             Radio bearer identifier.
 * \return     A status about the processing, OK or error code.
 */
-public_rlc_rrc(rlc_op_status_t rrc_rlc_remove_rlc   (const protocol_ctxt_t* const, const srb_flag_t, const MBMS_flag_t, const  rb_id_t );)
+public_rlc_rrc(rlc_op_status_t rrc_rlc_remove_rlc   (const protocol_ctxt_t* const, const srb_flag_t, const MBMS_flag_t, const  rb_id_t
+#ifdef Rel14
+    ,const uint32_t sourceL2Id
+    ,const uint32_t destinationL2Id
+#endif
+    );)
 
 /*! \fn rlc_union_t*  rrc_rlc_add_rlc   (const protocol_ctxt_t* const ctxtP, const srb_flag_t srb_flagP, const  MBMS_flag_t MBMS_flagP, const  rb_id_t rb_idP, logical_chan_id_t chan_idP, rlc_mode_t rlc_modeP)
 * \brief  Add a RLC protocol instance to a radio bearer.

openair2/LAYER2/RLC/rlc_rrc.c

@@ -411,7 +411,12 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt_pP
         ctxt_pP,
         SRB_FLAG_NO,
         MBMS_FLAG_NO,
-        *pdrb_id);
+        *pdrb_id
+#ifdef Rel14
+              ,sourceL2Id,
+              destinationL2Id
+#endif
+              );
     }
   }
 
@@ -535,14 +540,22 @@ rlc_op_status_t rrc_rlc_remove_ue (
     rrc_rlc_remove_rlc(ctxt_pP,
                        SRB_FLAG_YES,
                        MBMS_FLAG_NO,
-                       rb_id);
+                       rb_id
+#ifdef Rel14
+               ,0, 0
+#endif
+               );
   }
 
   for (rb_id = 1; rb_id <= maxDRB; rb_id++) {
     rrc_rlc_remove_rlc(ctxt_pP,
                        SRB_FLAG_NO,
                        MBMS_FLAG_NO,
-                       rb_id);
+                       rb_id
+#ifdef Rel14
+               ,0, 0
+#endif
+               );
   }
 
   return RLC_OP_STATUS_OK;
@@ -553,7 +566,12 @@ rlc_op_status_t rrc_rlc_remove_rlc   (
   const protocol_ctxt_t* const ctxt_pP,
   const srb_flag_t  srb_flagP,
   const MBMS_flag_t MBMS_flagP,
-  const rb_id_t     rb_idP)
+  const rb_id_t     rb_idP
+#ifdef Rel14
+    ,const uint32_t sourceL2Id
+    ,const uint32_t destinationL2Id
+#endif
+    )
 {
   //-----------------------------------------------------------------------------
   logical_chan_id_t      lcid            = 0;
@@ -854,7 +872,11 @@ rlc_op_status_t rrc_rlc_config_req   (
     break;
 
   case CONFIG_ACTION_REMOVE:
-    return rrc_rlc_remove_rlc(ctxt_pP, srb_flagP, mbms_flagP, rb_idP);
+    return rrc_rlc_remove_rlc(ctxt_pP, srb_flagP, mbms_flagP, rb_idP
+#ifdef Rel14
+               ,0, 0
+#endif
+               );
     break;
 
   default:

openair2/RRC/LITE/rrc_UE.c

@@ -6023,9 +6023,11 @@ void *rrc_control_socket_thread_fct(void *arg)
  #endif
           slrb_id = sl_ctrl_msg_recv->sidelinkPrimitive.slrb_id;
           //reset groupL2ID from MAC LAYER
+
           UE_rrc_inst[module_id].destinationL2Id = 0x00000000;
           sourceL2Id = UE_rrc_inst[module_id].sourceL2Id;
 
+
           //find the corresponding record and reset the values
           if (slrb_id > 0){
              for (i=0; i< MAX_NUM_LCID_DATA; i++) {
@@ -6033,11 +6035,32 @@ void *rrc_control_socket_thread_fct(void *arg)
                    UE_rrc_inst[module_id].sl_info[i].LCID = 0;
                    LOG_I(RRC,"[GroupCommunicationReleaseRequest] rbid %d for destination Id: 0x%08x\n has been removed",slrb_id, UE_rrc_inst[module_id].sl_info[i].destinationL2Id );
                    //UE_rrc_inst[module_id].sl_info[i].destinationL2Id = 0x00;
+                   destinationL2Id = UE_rrc_inst[module_id].sl_info[i].destinationL2Id;
                    break;
                 }
              }
           }
 
+          //TEST REMOVE RLC
+/*
+           DRB_ToReleaseList_t*  drb2release_list;
+           drb2release_list = CALLOC(1, sizeof(DRB_ToReleaseList_t));
+           ASN_SEQUENCE_ADD(&drb2release_list->list, (DRB_Identity_t) slrb_id);
+
+
+           rrc_rlc_config_asn1_req(&ctxt,
+                 (SRB_ToAddModList_t*)NULL,
+                 (DRB_ToAddModList_t*)NULL,
+                 (DRB_ToReleaseList_t*)drb2release_list
+  #ifdef Rel14
+                 ,(PMCH_InfoList_r9_t *)NULL
+                 , sourceL2Id, destinationL2Id
+  #endif
+           );
+
+*/
+
+
           rrc_mac_config_req_ue(module_id,0,0, //eNB_index =0
                      (RadioResourceConfigCommonSIB_t *)NULL,
                      (struct PhysicalConfigDedicated *)NULL,