Created separate functions in PDCP for E1 mode

CMakeLists.txt

@@ -1829,6 +1829,7 @@ set(NR_RLC_SRC
 
 set(NR_PDCP_SRC
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+  ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_e1_api.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_entity.c
   ${OPENAIR2_DIR}/LAYER2/nr_pdcp/nr_pdcp_sdu.c

openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include "nr_pdcp_e1_api.h"
+
+void e1_add_drb(int is_gnb,
+                uint64_t ue_id,
+                struct NR_DRB_ToAddMod *s,
+                int ciphering_algorithm,
+                int integrity_algorithm,
+                unsigned char *ciphering_key,
+                unsigned char *integrity_key)
+{
+  add_drb_am(is_gnb, ue_id, s, ciphering_algorithm, integrity_algorithm,
+             ciphering_key, integrity_key);
+  LOG_I(PDCP, "%s:%s:%d: added DRB for UE ID %ld\n", __FILE__, __FUNCTION__, __LINE__, ue_id);
+}
+
+void nr_pdcp_e1_add_drbs(eNB_flag_t enb_flag,
+                         uint64_t ue_id,
+                         NR_DRB_ToAddModList_t  *const drb2add_list,
+                         const uint8_t  security_modeP,
+                         uint8_t        *const kUPenc,
+                         uint8_t        *const kUPint) {
+
+  if (drb2add_list != NULL) {
+    for (int i = 0; i < drb2add_list->list.count; i++) {
+      e1_add_drb(enb_flag, ue_id, drb2add_list->list.array[i],
+              security_modeP & 0x0f, (security_modeP >> 4) & 0x0f,
+              kUPenc, kUPint);
+    }
+  } else
+    LOG_W(PDCP, "%s with void list\n", __FUNCTION__);
+  if (kUPenc)
+    free(kUPenc);
+  if (kUPint)
+    free(kUPint);
+}

openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include "asn1_utils.h"
+#include "NR_RadioBearerConfig.h"
+
+#include "pdcp.h"
+#include "LAYER2/nr_rlc/nr_rlc_oai_api.h"
+#include <openair3/ocp-gtpu/gtp_itf.h>
+#include "openair2/SDAP/nr_sdap/nr_sdap.h"
+
+void e1_add_drb(int is_gnb,
+                uint64_t ue_id,
+                struct NR_DRB_ToAddMod *s,
+                int ciphering_algorithm,
+                int integrity_algorithm,
+                unsigned char *ciphering_key,
+                unsigned char *integrity_key);
+
+void nr_pdcp_e1_add_drbs(eNB_flag_t enb_flag,
+                         uint64_t ue_id,
+                         NR_DRB_ToAddModList_t  *const drb2add_list,
+                         const uint8_t  security_modeP,
+                         uint8_t        *const kUPenc,
+                         uint8_t        *const kUPint);
+
+void add_drb_am(int is_gnb, int rnti, struct NR_DRB_ToAddMod *s,
+                int ciphering_algorithm,
+                int integrity_algorithm,
+                unsigned char *ciphering_key,
+                unsigned char *integrity_key);
+

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -37,6 +37,7 @@
 #include "LAYER2/nr_rlc/nr_rlc_oai_api.h"
 #include <openair3/ocp-gtpu/gtp_itf.h>
 #include "openair2/SDAP/nr_sdap/nr_sdap.h"
+#include "nr_pdcp_e1_api.h"
 
 #define TODO do { \
     printf("%s:%d:%s: todo\n", __FILE__, __LINE__, __FUNCTION__); \
@@ -909,11 +910,11 @@ static void add_srb(int is_gnb, int rnti, struct NR_SRB_ToAddMod *s,
   nr_pdcp_manager_unlock(nr_pdcp_ue_manager);
 }
 
-static void add_drb_am(int is_gnb, int rnti, struct NR_DRB_ToAddMod *s,
-                       int ciphering_algorithm,
-                       int integrity_algorithm,
-                       unsigned char *ciphering_key,
-                       unsigned char *integrity_key)
+void add_drb_am(int is_gnb, int rnti, struct NR_DRB_ToAddMod *s,
+                int ciphering_algorithm,
+                int integrity_algorithm,
+                unsigned char *ciphering_key,
+                unsigned char *integrity_key)
 {
   nr_pdcp_entity_t *pdcp_drb;
   nr_pdcp_ue_t *ue;

openair2/RRC/NR/rrc_gNB.c

@@ -100,6 +100,7 @@
 #include <openair3/ocp-gtpu/gtp_itf.h>
 #include <openair2/RRC/NR/nr_rrc_proto.h>
 #include "LAYER2/nr_rlc/nr_rlc_oai_api.h"
+#include "openair2/LAYER2/nr_pdcp/nr_pdcp_e1_api.h"
 
 #include "BIT_STRING.h"
 #include "assertions.h"
@@ -3977,13 +3978,12 @@ int rrc_gNB_process_e1_bearer_context_setup_req(e1ap_bearer_setup_req_t *req, in
                         (uint8_t *)req->integrityProtectionKey,
                         &kUPint);
 
-  nr_pdcp_add_drbs(false,
-                   create_tunnel_req.ue_id,
-                   &DRB_configList,
-                   (req->integrityProtectionAlgorithm << 4) | req->cipheringAlgorithm,
-                   kUPenc,
-                   kUPint,
-                   NULL);
+  nr_pdcp_e1_add_drbs(false,
+                      create_tunnel_req.ue_id,
+                      &DRB_configList,
+                      (req->integrityProtectionAlgorithm << 4) | req->cipheringAlgorithm,
+                      kUPenc,
+                      kUPint);
 
   MessageDef *message_p;
   message_p = itti_alloc_new_message (TASK_RRC_GNB, instance, E1AP_BEARER_CONTEXT_SETUP_RESP);