maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix after merge and a ci bug (containers)

Browse Source
This commit is contained in:
Laurent THOMAS
2021-12-17 21:57:00 +01:00
parent 0f00e57148
commit 3fde37a28d
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/system.c
+3 -8
View File
@@ -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");
}
/********************************************************************/
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+3 -2
View File
@@ -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,
openair2/RRC/NR/rrc_gNB_NGAP.c
+1 -1
View File
@@ -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;