From 3fde37a28d56fb18295f457ee412981a25cfa79d Mon Sep 17 00:00:00 2001
From: Laurent THOMAS <laurent.thomas@open-cells.com>
Date: Fri, 17 Dec 2021 21:57:00 +0100
Subject: [PATCH] fix after merge and a ci bug (containers)

---
 common/utils/system.c                     | 11 +++--------
 openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c |  5 +++--
 openair2/RRC/NR/rrc_gNB_NGAP.c            |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/common/utils/system.c b/common/utils/system.c
index 1bdad55529..93b13f03f2 100644
--- a/common/utils/system.c
+++ b/common/utils/system.c
@@ -96,20 +96,15 @@ static void read_pipe(int p, char *b, int size) {
   }
 }
 int checkIfFedoraDistribution(void) {
-  return system("grep -iq 'ID_LIKE.*fedora' /etc/os-release ");
+  return !system("grep -iq 'ID_LIKE.*fedora' /etc/os-release ");
 }
 
 int checkIfGenericKernelOnFedora(void) {
-  int ret=system("uname -a | grep -q rt");
-  return 1 - ret;
+  return system("uname -a | grep -q rt");
 }
 
 int checkIfInsideContainer(void) {
-  int res=system("egrep -q 'libpod|podman|kubepods'  /proc/self/cgroup");
-  if (res > 0)
-    return 1;
-  else
-    return 0;
+  return !system("egrep -q 'libpod|podman|kubepods'  /proc/self/cgroup");
 }
 
 /********************************************************************/
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index f3dfba4d39..322c39c49b 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -254,7 +254,6 @@ static void do_pdcp_data_ind(
       //ctxt_pP->enb_flag != 1 ||
       ctxt_pP->instance != 0 ||
       ctxt_pP->eNB_index != 0 ||
-      ctxt_pP->configured != 1 ||
       ctxt_pP->brOption != 0) {
     LOG_E(PDCP, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
     exit(1);
@@ -374,7 +373,9 @@ boolean_t pdcp_data_ind(
   const MBMS_flag_t MBMS_flagP,
   const rb_id_t rb_id,
   const sdu_size_t sdu_buffer_size,
-  mem_block_t *const sdu_buffer)
+  mem_block_t *const sdu_buffer,
+  const uint32_t *const srcID,
+  const uint32_t *const dstID)
 {
   enqueue_pdcp_data_ind(ctxt_pP,
                         srb_flagP,
diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index b59b42dc4c..00a2a56566 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -306,7 +306,7 @@ nr_rrc_pdcp_config_security(
   uint8_t                            *kRRCenc = NULL;
   uint8_t                            *kRRCint = NULL;
   uint8_t                            *kUPenc = NULL;
-  uint8_t                            *k_kdf  = NULL;
+  //uint8_t                            *k_kdf  = NULL;
   static int                          print_keys= 1;