Merge remote-tracking branch 'origin/e1-reestablishment' into integration_2024_w09

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -37,6 +37,10 @@
     370001
     370000
     370002
+    360001
+    100002
+    360002
+    350000
     310011
     310002
     330201
@@ -114,9 +118,9 @@
 
   <testCase id="350000">
     <class>Ping</class>
-    <desc>Ping: 20pings in 20sec</desc>
+    <desc>Ping: 50pings in 10sec</desc>
     <id>idefix</id>
-    <ping_args>-c 20 %cn_ip%</ping_args>
+    <ping_args>-c 20 -i 0.2 %cn_ip%</ping_args>
     <ping_packetloss_threshold>1</ping_packetloss_threshold>
     <ping_rttavg_threshold>25</ping_rttavg_threshold>
   </testCase>
@@ -152,6 +156,27 @@
     <iperf_profile>single-ue</iperf_profile>
   </testCase>
 
+  <testCase id="360001">
+    <class>Custom_Command</class>
+    <desc>Trigger Reestablishment (on DU)</desc>
+    <node>ofqot</node>
+    <command>echo ci force_reestab | nc -N 192.168.68.195 9090 | grep -E 'Reset RLC counters of UE RNTI [0-9a-f]{4} to trigger reestablishment'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+  <testCase id="360002">
+    <class>Custom_Command</class>
+    <desc>Verify Reestablishment (on CU)</desc>
+    <node>ofqot</node>
+    <command>echo ci get_reestab_count | nc -N 192.168.68.194 9090 | grep -E 'UE RNTI [0-9a-f]{4} reestab 1'</command>
+    <command_fail>yes</command_fail>
+  </testCase>
+
+  <testCase id="100002">
+    <class>IdleSleep</class>
+    <desc>Sleep</desc>
+    <idle_sleep_time_in_sec>10</idle_sleep_time_in_sec>
+  </testCase>
+
   <testCase id="330201">
     <class>Undeploy_Object</class>
     <desc>Undeploy CU-DU</desc>

ci-scripts/yaml_files/sa_e1_b200_gnb/docker-compose.yml

@@ -6,7 +6,7 @@ services:
         privileged: true
         container_name: sa-cucp-gnb
         environment:
-            USE_ADDITIONAL_OPTIONS: --sa --log_config.global_log_options level,nocolor,time,line_num,function
+            USE_ADDITIONAL_OPTIONS: --sa --telnetsrv --telnetsrv.shrmod ci --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-cucp.sa.f1.quectel.conf:/opt/oai-gnb/etc/gnb.conf
         networks:
@@ -43,7 +43,13 @@ services:
         container_name: sa-du-b200-gnb
         environment:
             USE_B2XX: 'yes'
-            USE_ADDITIONAL_OPTIONS: --sa --RUs.[0].sdr_addrs serial=30C51D4 --continuous-tx -E --log_config.global_log_options level,nocolor,time,line_num,function --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1 --RUs.[0].att_rx 18 --RUs.[0].att_tx 18
+            USE_ADDITIONAL_OPTIONS: --sa
+                                    --RUs.[0].sdr_addrs serial=30C51D4
+                                    --continuous-tx -E
+                                    --telnetsrv --telnetsrv.shrmod ci
+                                    --gNBs.[0].min_rxtxtime 2 --gNBs.[0].do_CSIRS 1 --gNBs.[0].do_SRS 1
+                                    --RUs.[0].att_rx 18 --RUs.[0].att_tx 18
+                                    --log_config.global_log_options level,nocolor,time,line_num,function
         volumes:
             - ../../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf:/opt/oai-gnb/etc/gnb.conf
             - /dev:/dev

common/ngran_types.h

@@ -56,5 +56,4 @@ typedef enum { CPtype = 0, UPtype } E1_t;
 #define GTPV1_U_PORT_NUMBER (2152)
 
 typedef enum { non_dynamic, dynamic } fiveQI_type_t;
-#define maxSRBs 4
 #endif

doc/E1-design.md → doc/E1AP/E1-design.md

@@ -75,11 +75,11 @@ sequenceDiagram
   Note over u: E1AP_CUUP_task (SCTP Handler)
   Note over u: ASN1 decoder
 ```
-
+More details about the E1AP procedures in OAI are available in this document: [E1 Procedures](./e1ap_procedures.md).
 
 # 2. Running the E1 Split
 
-The setup is assuming that all modules are running on the same machine. The user can refer to the [F1 design document](./F1-design.md) for local deployment of the DU.
+The setup is assuming that all modules are running on the same machine. The user can refer to the [F1 design document](./../F1-design.md) for local deployment of the DU.
 
 ## 2.1 Configuration File
 

doc/E1AP/e1ap_procedures.md

+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+      <a href="http://www.openairinterface.org/">
+         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+         </img>
+      </a>
+    </td>
+    <td style="border-collapse: collapse; border: none; vertical-align: center;">
+      <b><font size = "5">E1AP Procedures</font></b>
+    </td>
+  </tr>
+</table>
+
+[[_TOC_]]
+
+# Introduction
+The E1 interface is between the gNB-CU-CP (Central Unit - Control Plane) and gNB-CU-UP (Central Unit - User Plane) nodes. This interface is governed by the E1 Application Protocol (E1AP) outlined in the 3GPP release 16 specifications, specifically in the documents:
+* 3GPP TS 38.463 - E1 Application Protocol (E1AP)
+* 3GPP TS 38.460 - E1 general aspects and principles
+* 3GPP TS 38.461 - E1 interface: layer 1 
+* 3GPP TS 38.462 - E1 interface: signaling transport
+
+The E1AP protocol consists of the following sets of functions:
+* E1 Interface Management functions
+* E1 Bearer Context Management functions
+* TEID allocation function
+
+## E1 Bearer Context Management function
+This function handles the establishment, modification, and release of E1 bearer contexts.
+* E1 Bearer Context Establishment: initiation of E1 bearer context is by gNB-CU-CP and acceptance or rejection is determined by gNB-CU-UP based on admission control criteria (e.g., resource availability).
+* E1 Bearer Context Modification: can be initiated by either gNB-CU-CP or gNB-CU-UP, with the receiving node having the authority to accept or reject the modification.
+* Release of Bearer Context: can be triggered either directly by gNB-CU-CP or following a request from gNB-CU-UP.
+* QoS-Flow to DRB Mapping Configuration: responsible for setting up and modifying the QoS-flow to DRB mapping configuration. gNB-CU-CP decides the flow-to-DRB mapping, generates SDAP and PDCP configurations, and provides them to gNB-CU-UP.
+
+# OAI implementation
+
+For the E1AP design in OAI, please refer to the [E1 Design](./E1-design.md) document.
+
+## E1 re-establishment
+
+The purpose of this procedure is to follow-up the re-establishment of RRC connection over the E1 interface. For all activated DRBs a Bearer Context Modification from CU-CP to CU-UP is necessary, according to clause 9.2.2.4 of 3GPP TS 38.463. If any modification to the bearer context is required, the CU-CP informs the CU-UP with the relevant IEs (e.g. in case of PDCP re-establishment, PDCP Configuration IE clause 9.3.1.38), Current implementation in OAI:
+
+```mermaid
+sequenceDiagram
+  participant e as UE
+  participant d as DU
+  participant c as CUCP
+  participant u as CUUP
+
+  Note over e,c: RRCReestablishment Procedure
+  e->>d: RRCReestablishmentRequest
+  Note over d: initial_ul_rrc_message_transfer_f1ap
+  d->>+c: Initial UL RRC Message Transfer (CCCH, new C-RNTI)
+  Note over c: rrc_gNB_process_initial_ul_rrc_message
+  Note over c: rrc_handle_RRCReestablishmentRequests
+  c-->>+d: DL RRC Message Transfer
+  note right of d: fallback to RRC establishment
+  d-->>-e: RRCSetup
+  e-->>d: RRCSetupComplete
+  Note over c: rrc_gNB_generate_RRCReestablishment
+  Note over c: cuup_notify_reestablishment
+  Note over c: e1apCUCP_send_BEARER_CONTEXT_MODIFICATION_REQUEST
+  c->>u: BEARER CONTEXT MODIFICATION REQUEST
+  Note over u: e1apCUUP_handle_BEARER_CONTEXT_MODIFICATION_REQUEST
+  Note over u: e1_bearer_context_modif
+  Note over u: nr_pdcp_reestablishment
+  c->>-d: DL RRC Message Transfer (old gNB DU F1AP UE ID)
+  d->>e: RRCReestablishment
+  Note over d: Fetch UE Context with old gNB DU F1AP UE ID and update C-RNTI
+  e->>d: RRCReestablishmentComplete
+  u->>c: BEARER CONTEXT MODIFICATION RESPONSE
+  Note over c: e1apCUCP_handle_BEARER_CONTEXT_MODIFICATION_RESPONSE
+```

doc/README.md

@@ -57,7 +57,7 @@ Legacy unmaintained files:
 # Designs
 
 - General software architecture notes: [SW_archi.md](./SW_archi.md)
-- [Information on E1](./E1-design.md)
+- [Information on E1](./E1AP/E1-design.md)
 - [Information on F1](./F1-design.md)
 - [Information on how NR nFAPI works](./NR_NFAPI_archi.md)
 - [Flow graph of the L1 in gNB](SW-archi-graph.md)

openair2/COMMON/e1ap_messages_def.h

@@ -39,7 +39,7 @@ MESSAGE_DEF(E1AP_BEARER_CONTEXT_SETUP_REQ , MESSAGE_PRIORITY_MED , e1ap_bearer_s
 /* E1AP Bearer Context Setup Response: gNB-CU-UP -> gNB-CU-CP */
 MESSAGE_DEF(E1AP_BEARER_CONTEXT_SETUP_RESP , MESSAGE_PRIORITY_MED , e1ap_bearer_setup_resp_t , e1ap_bearer_setup_resp)
 /* E1AP Bearer Context Modification Request: gNB-CU-CP -> gNB-CU-UP */
-MESSAGE_DEF(E1AP_BEARER_CONTEXT_MODIFICATION_REQ , MESSAGE_PRIORITY_MED , e1ap_bearer_setup_req_t , e1ap_bearer_mod_req)
+MESSAGE_DEF(E1AP_BEARER_CONTEXT_MODIFICATION_REQ , MESSAGE_PRIORITY_MED , e1ap_bearer_mod_req_t , e1ap_bearer_mod_req)
 /* E1AP Bearer Context Modification Response: gNB-CU-UP -> gNB-CU-CP */
 MESSAGE_DEF(E1AP_BEARER_CONTEXT_MODIFICATION_RESP, MESSAGE_PRIORITY_MED, e1ap_bearer_modif_resp_t, e1ap_bearer_modif_resp)
 /* E1AP Bearer Context Release Request: gNB-CU-CP -> gNB-CU-UP */

openair2/COMMON/e1ap_messages_types.h

@@ -47,7 +47,7 @@
 #define E1AP_SETUP_FAIL(mSGpTR)                           (mSGpTR)->ittiMsg.e1ap_setup_fail
 #define E1AP_BEARER_CONTEXT_SETUP_REQ(mSGpTR)             (mSGpTR)->ittiMsg.e1ap_bearer_setup_req
 #define E1AP_BEARER_CONTEXT_SETUP_RESP(mSGpTR)            (mSGpTR)->ittiMsg.e1ap_bearer_setup_resp
-#define E1AP_BEARER_CONTEXT_MODIFICATION_REQ(mSGpTR)      (mSGpTR)->ittiMsg.e1ap_bearer_setup_req
+#define E1AP_BEARER_CONTEXT_MODIFICATION_REQ(mSGpTR)      (mSGpTR)->ittiMsg.e1ap_bearer_mod_req
 #define E1AP_BEARER_CONTEXT_MODIFICATION_RESP(mSGpTR)     (mSGpTR)->ittiMsg.e1ap_bearer_modif_resp
 #define E1AP_BEARER_CONTEXT_RELEASE_CMD(mSGpTR)           (mSGpTR)->ittiMsg.e1ap_bearer_release_cmd
 #define E1AP_BEARER_CONTEXT_RELEASE_CPLT(mSGpTR)          (mSGpTR)->ittiMsg.e1ap_bearer_release_cplt
@@ -111,11 +111,26 @@ typedef struct up_params_s {
   int cell_group_id;
 } up_params_t;
 
-typedef struct drb_to_setup_s {
-  long drbId;
+/* IE SDAP Configuration (clause 9.3.1.39 of 3GPP TS 38.463) */
+typedef struct bearer_context_sdap_config_s {
+  long defaultDRB;
+  long sDAP_Header_UL;
+  long sDAP_Header_DL;
+} bearer_context_sdap_config_t;
+
+/* IE PDCP Configuration (clause 9.3.1.38 of 3GPP TS 38.463) */
+typedef struct bearer_context_pdcp_config_s {
   long pDCP_SN_Size_UL;
   long pDCP_SN_Size_DL;
   long rLC_Mode;
+  long reorderingTimer;
+  long discardTimer;
+  bool pDCP_Reestablishment;
+} bearer_context_pdcp_config_t;
+
+typedef struct drb_to_setup_s {
+  long drbId;
+  bearer_context_pdcp_config_t pdcp_config;
   long qci;
   long qosPriorityLevel;
   long pre_emptionCapability;
@@ -161,26 +176,38 @@ typedef struct qos_flow_setup_e {
   qos_flow_level_qos_parameters_t qos_params;
 } qos_flow_to_setup_t;
 
+/* DRB To Setup List according to 3GPP TS 38.463 */
 typedef struct DRB_nGRAN_to_setup_s {
+  /* DRB ID (clause 9.3.1.16) */
   long id;
-  long defaultDRB;
-  long sDAP_Header_UL;
-  long sDAP_Header_DL;
-  long pDCP_SN_Size_UL;
-  long pDCP_SN_Size_DL;
-  long discardTimer;
-  long reorderingTimer;
-  long rLC_Mode;
+
+  /* SDAP Configuration (clause 9.3.1.39) */
+  bearer_context_sdap_config_t sdap_config;
+  /* PDCP Configuration (clause 9.3.1.38) */
+  bearer_context_pdcp_config_t pdcp_config;
+
+  /* DRB Data Forwarding Information (clause 9.3.2.6) */
+  /* Transport Layer Address (clause 9.3.2.4) */
   in_addr_t tlAddress;
+  /* GTP-TEID (clause 9.3.2.3) */
   int teId;
+  /* DL UP Transport Layer Information (clause 9.3.2.1) */
   int numDlUpParam;
   up_params_t DlUpParamList[E1AP_MAX_NUM_UP_PARAM];
+
+  /* Cell Group Information (clause 9.3.1.11) */
   int numCellGroups;
   cell_group_t cellGroupList[E1AP_MAX_NUM_CELL_GROUPS];
+
+  /* DRB QoS Flows Parameters (clause 9.3.1.26) */
   int numQosFlow2Setup;
   qos_flow_to_setup_t qosFlows[E1AP_MAX_NUM_QOS_FLOWS];
-} DRB_nGRAN_to_setup_t;
+} DRB_nGRAN_to_setup_t, DRB_nGRAN_to_mod_t;
 
+/**
+ * PDU Session Resource To Setup List (clause 9.3.3.10)
+ * PDU Session Resource To Modify List (clause 9.3.3.11)
+*/
 typedef struct pdu_session_to_setup_s {
   long sessionId;
   long sessionType;
@@ -196,9 +223,14 @@ typedef struct pdu_session_to_setup_s {
   long numDRB2Setup;
   DRB_nGRAN_to_setup_t DRBnGRanList[E1AP_MAX_NUM_NGRAN_DRB];
   long numDRB2Modify;
-  DRB_nGRAN_to_setup_t DRBnGRanModList[E1AP_MAX_NUM_NGRAN_DRB];
-} pdu_session_to_setup_t;
+  DRB_nGRAN_to_mod_t DRBnGRanModList[E1AP_MAX_NUM_NGRAN_DRB];
+} pdu_session_to_setup_t, pdu_session_to_mod_t;
 
+/**
+ * Bearer Context Setup Request message, clause 9.2.2.1 of 3GPP TS 38.463
+ * out of simplicity, this same struct is used for clause 9.2.2.4
+ * i.e. Bearer Context Modification Request message
+ */
 typedef struct e1ap_bearer_setup_req_s {
   uint32_t gNB_cu_cp_ue_id;
   uint32_t gNB_cu_up_ue_id;
@@ -212,8 +244,8 @@ typedef struct e1ap_bearer_setup_req_s {
   int numPDUSessions;
   pdu_session_to_setup_t pduSession[E1AP_MAX_NUM_PDU_SESSIONS];
   int numPDUSessionsMod;
-  pdu_session_to_setup_t pduSessionMod[E1AP_MAX_NUM_PDU_SESSIONS];
-} e1ap_bearer_setup_req_t;
+  pdu_session_to_mod_t pduSessionMod[E1AP_MAX_NUM_PDU_SESSIONS];
+} e1ap_bearer_setup_req_t, e1ap_bearer_mod_req_t;
 
 typedef struct e1ap_bearer_release_cmd_s {
   uint32_t gNB_cu_cp_ue_id;

openair2/COMMON/ngap_messages_types.h

@@ -276,12 +276,14 @@ typedef struct pdusession_s {
   /* The transport layer address for the IP packets */
   pdu_session_type_t pdu_session_type;
   transport_layer_addr_t upf_addr;
-  /* S-GW Tunnel endpoint identifier */
+  /* Outgoing (UL) NG-U Tunnel Endpoint Identifier (S-GW/UPF) */
   uint32_t gtp_teid;
   /* Stores the DRB ID of the DRBs used by this PDU Session */
   uint8_t used_drbs[MAX_DRBS_PER_UE];
+  /* Incoming (DL) NG-U Tunnel Endpoint Identifier (S-GW/UPF) */
   uint32_t gNB_teid_N3;
   transport_layer_addr_t gNB_addr_N3;
+  /* Incoming (DL) NG-U Tunnel Endpoint Identifier (S-GW/UPF) */
   uint32_t UPF_teid_N3;
   transport_layer_addr_t UPF_addr_N3;
   nssai_t nssai;
@@ -306,7 +308,7 @@ typedef struct pdusession_setup_s {
   uint8_t pdu_session_type;
   transport_layer_addr_t gNB_addr;
 
-  /* UPF Tunnel endpoint identifier */
+  /* Incoming NG-U Tunnel Endpoint Identifier (S-GW/UPF) */
   uint32_t gtp_teid;
 
   /* qos flow list number */

openair2/LAYER2/nr_pdcp/cucp_cuup_handler.c

@@ -37,7 +37,7 @@
 
 static void fill_DRB_configList_e1(NR_DRB_ToAddModList_t *DRB_configList, const pdu_session_to_setup_t *pdu)
 {
-  for (int i=0; i < pdu->numDRB2Setup; i++) {
+  for (int i = 0; i < pdu->numDRB2Setup; i++) {
     const DRB_nGRAN_to_setup_t *drb = pdu->DRBnGRanList + i;
     asn1cSequenceAdd(DRB_configList->list, struct NR_DRB_ToAddMod, ie);
     ie->drb_Identity = drb->id;
@@ -47,12 +47,12 @@ static void fill_DRB_configList_e1(NR_DRB_ToAddModList_t *DRB_configList, const
     // sdap_Config
     asn1cCalloc(ie->cnAssociation->choice.sdap_Config, sdap_config);
     sdap_config->pdu_Session = pdu->sessionId;
-    sdap_config->sdap_HeaderDL = drb->sDAP_Header_DL;
-    sdap_config->sdap_HeaderUL = drb->sDAP_Header_UL;
-    sdap_config->defaultDRB = drb->defaultDRB;
-
+    /* SDAP */
+    sdap_config->sdap_HeaderDL = drb->sdap_config.sDAP_Header_DL;
+    sdap_config->sdap_HeaderUL = drb->sdap_config.sDAP_Header_UL;
+    sdap_config->defaultDRB    = drb->sdap_config.defaultDRB;
     asn1cCalloc(sdap_config->mappedQoS_FlowsToAdd, FlowsToAdd);
-    for (int j=0; j < drb->numQosFlow2Setup; j++) {
+    for (int j = 0; j < drb->numQosFlow2Setup; j++) {
       asn1cSequenceAdd(FlowsToAdd->list, NR_QFI_t, qfi);
       *qfi = drb->qosFlows[j].qfi;
     }
@@ -63,26 +63,22 @@ static void fill_DRB_configList_e1(NR_DRB_ToAddModList_t *DRB_configList, const
     ie->recoverPDCP = NULL;
     asn1cCalloc(ie->pdcp_Config, pdcp_config);
     asn1cCalloc(pdcp_config->drb, drbCfg);
-    asn1cCallocOne(drbCfg->discardTimer, drb->discardTimer);
-    asn1cCallocOne(drbCfg->pdcp_SN_SizeUL, drb->pDCP_SN_Size_UL);
-    asn1cCallocOne(drbCfg->pdcp_SN_SizeDL, drb->pDCP_SN_Size_DL);
+    asn1cCallocOne(drbCfg->discardTimer, drb->pdcp_config.discardTimer);
+    asn1cCallocOne(drbCfg->pdcp_SN_SizeUL, drb->pdcp_config.pDCP_SN_Size_UL);
+    asn1cCallocOne(drbCfg->pdcp_SN_SizeDL, drb->pdcp_config.pDCP_SN_Size_DL);
     drbCfg->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
     drbCfg->headerCompression.choice.notUsed = 0;
-
     drbCfg->integrityProtection = NULL;
     drbCfg->statusReportRequired = NULL;
     drbCfg->outOfOrderDelivery = NULL;
     pdcp_config->moreThanOneRLC = NULL;
-
     pdcp_config->t_Reordering = calloc(1, sizeof(*pdcp_config->t_Reordering));
-    *pdcp_config->t_Reordering = drb->reorderingTimer;
+    *pdcp_config->t_Reordering = drb->pdcp_config.reorderingTimer;
     pdcp_config->ext1 = NULL;
-
     if (pdu->integrityProtectionIndication == 0 || // Required
         pdu->integrityProtectionIndication == 1) { // Preferred
-      asn1cCallocOne(drbCfg->integrityProtection, NR_PDCP_Config__drb__integrityProtection_enabled);
+        asn1cCallocOne(drbCfg->integrityProtection, NR_PDCP_Config__drb__integrityProtection_enabled);
     }
-
     if (pdu->confidentialityProtectionIndication == 2) { // Not Needed
       asn1cCalloc(pdcp_config->ext1, ext1);
       asn1cCallocOne(ext1->cipheringDisabled, NR_PDCP_Config__ext1__cipheringDisabled_true);
@@ -227,7 +223,10 @@ void e1_bearer_context_setup(const e1ap_bearer_setup_req_t *req)
   get_e1_if()->bearer_setup_response(&resp);
 }
 
-void e1_bearer_context_modif(const e1ap_bearer_setup_req_t *req)
+/**
+ * @brief Fill Bearer Context Modification Response and send to callback
+ */
+void e1_bearer_context_modif(const e1ap_bearer_mod_req_t *req)
 {
   AssertFatal(req->numPDUSessionsMod > 0, "need at least one PDU session to modify\n");
 
@@ -239,7 +238,8 @@ void e1_bearer_context_modif(const e1ap_bearer_setup_req_t *req)
 
   instance_t f1inst = get_f1_gtp_instance();
 
-  for (int i=0; i < req->numPDUSessionsMod; i++) {
+  /* PDU Session Resource To Modify List (see 9.3.3.11 of TS 38.463) */
+  for (int i = 0; i < req->numPDUSessionsMod; i++) {
     DevAssert(req->pduSessionMod[i].sessionId > 0);
     LOG_I(E1AP,
           "UE %d: updating PDU session ID %ld (%ld bearers)\n",
@@ -248,11 +248,16 @@ void e1_bearer_context_modif(const e1ap_bearer_setup_req_t *req)
           req->pduSessionMod[i].numDRB2Modify);
     modif.pduSessionMod[i].id = req->pduSessionMod[i].sessionId;
     modif.pduSessionMod[i].numDRBModified = req->pduSessionMod[i].numDRB2Modify;
-    for (int j=0; j < req->pduSessionMod[i].numDRB2Modify; j++) {
-      const DRB_nGRAN_to_setup_t *to_modif = &req->pduSessionMod[i].DRBnGRanModList[j];
+    /* DRBs to modify */
+    for (int j = 0; j < req->pduSessionMod[i].numDRB2Modify; j++) {
+      const DRB_nGRAN_to_mod_t *to_modif = &req->pduSessionMod[i].DRBnGRanModList[j];
       DRB_nGRAN_modified_t *modified = &modif.pduSessionMod[i].DRBnGRanModList[j];
       modified->id = to_modif->id;
 
+      if (to_modif->pdcp_config.pDCP_Reestablishment) {
+        nr_pdcp_reestablishment(req->gNB_cu_up_ue_id, to_modif->id, false);
+      }
+
       if (f1inst < 0) // no F1-U?
         continue; // nothing to do
 

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c

@@ -416,6 +416,10 @@ static void free_rx_list(nr_pdcp_entity_t *entity)
   entity->rx_size = 0;
 }
 
+/**
+ * @brief PDCP entity re-establishment according to 5.1.2 of 3GPP TS 38.323
+ * @todo  deal with ciphering/integrity algos and keys for transmitting/receiving entity procedures
+*/
 static void nr_pdcp_entity_reestablish_drb_am(nr_pdcp_entity_t *entity)
 {
   /* transmitting entity procedures */

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -1210,9 +1210,10 @@ void nr_pdcp_reestablishment(ue_id_t ue_id, int rb_id, bool srb_flag)
   rb = nr_pdcp_get_rb(ue, rb_id, srb_flag);
 
   if (rb != NULL) {
+    LOG_D(PDCP, "UE %4.4lx re-establishment of %sRB %d\n", ue_id, srb_flag ? "S" : "D", rb_id);
     rb->reestablish_entity(rb);
   } else {
-    LOG_W(PDCP, "UE %4.4lx cannot re-establish RB %d (is_srb %d), RB not found\n", ue_id, rb_id, srb_flag);
+    LOG_W(PDCP, "UE %4.4lx cannot re-establish %sRB %d, RB not found\n", ue_id, srb_flag ? "S" : "D", rb_id);
   }
 
   nr_pdcp_manager_unlock(nr_pdcp_ue_manager);

openair2/RRC/NR/cucp_cuup_direct.c

@@ -31,7 +31,7 @@ static void cucp_cuup_bearer_context_setup_direct(sctp_assoc_t assoc_id, const e
   e1_bearer_context_setup(req);
 }
 
-static void cucp_cuup_bearer_context_modif_direct(sctp_assoc_t assoc_id, const e1ap_bearer_setup_req_t *req)
+static void cucp_cuup_bearer_context_modif_direct(sctp_assoc_t assoc_id, const e1ap_bearer_mod_req_t *req)
 {
   AssertFatal(assoc_id == -1, "illegal assoc_id %d, impossible for integrated CU\n", assoc_id);
   e1_bearer_context_modif(req);

openair2/RRC/NR/cucp_cuup_e1ap.c

@@ -37,12 +37,12 @@ static void cucp_cuup_bearer_context_setup_e1ap(sctp_assoc_t assoc_id, const e1a
   itti_send_msg_to_task (TASK_CUCP_E1, 0, msg_p);
 }
 
-static void cucp_cuup_bearer_context_mod_e1ap(sctp_assoc_t assoc_id, const e1ap_bearer_setup_req_t *req)
+static void cucp_cuup_bearer_context_mod_e1ap(sctp_assoc_t assoc_id, const e1ap_bearer_mod_req_t *req)
 {
   AssertFatal(assoc_id > 0, "illegal assoc_id %d\n", assoc_id);
   MessageDef *msg = itti_alloc_new_message(TASK_CUCP_E1, 0, E1AP_BEARER_CONTEXT_MODIFICATION_REQ);
   msg->ittiMsgHeader.originInstance = assoc_id;
-  e1ap_bearer_setup_req_t *req_msg = &E1AP_BEARER_CONTEXT_SETUP_REQ(msg);
+  e1ap_bearer_mod_req_t *req_msg = &E1AP_BEARER_CONTEXT_MODIFICATION_REQ(msg);
   memcpy(req_msg, req, sizeof(*req));
   itti_send_msg_to_task(TASK_CUCP_E1, 0, msg);
 }

openair2/RRC/NR/nr_rrc_common.h

@@ -28,7 +28,8 @@
 
 #define NR_RRC_HEADER_SIZE_MAX 64
 #define NR_RRC_BUFFER_SIZE_MAX 1024
-#define NR_NUM_SRB 4
+#define NR_NUM_SRB 4 /* Number of Signalling Radio Bearers according to clause 4.2.2 of 3GPP TS 38.331 */
+#define NR_K_KEY_SIZE 16 /* K keys have 128 bits length */
 
 typedef struct {
   char Payload[NR_RRC_BUFFER_SIZE_MAX];

openair2/RRC/NR/nr_rrc_defs.h

@@ -189,6 +189,16 @@ typedef struct pdu_session_param_s {
   uint8_t cause_value;
 } rrc_pdu_session_param_t;
 
+/**
+ * @brief F1-U tunnel configuration
+*/
+typedef struct f1u_tunnel_s {
+  /* Downlink F1-U Tunnel Endpoint Identifier (CU-UP/DU) */
+  uint32_t cuup_teid_f1u;
+  /* DL F1-U Transport Layer */
+  transport_layer_addr_t cuup_addr_f1u;
+} f1u_tunnel_t;
+
 typedef struct drb_s {
   int status;
   int defaultDRBid;
@@ -221,6 +231,8 @@ typedef struct drb_s {
       int cipheringDisabled;
     } ext1;
   } pdcp_config;
+  // F1-U
+  f1u_tunnel_t f1u_tunnel_config;
 } drb_t;
 
 typedef enum {
@@ -241,7 +253,7 @@ typedef struct gNB_RRC_UE_s {
   drb_t                              established_drbs[MAX_DRBS_PER_UE];
   NR_DRB_ToReleaseList_t            *DRB_ReleaseList;
 
-  NR_SRB_INFO_TABLE_ENTRY Srb[maxSRBs]; // 3gpp max is 3 SRBs, number 1..3, we waste the entry 0 for code simplicity
+  NR_SRB_INFO_TABLE_ENTRY Srb[NR_NUM_SRB];
   NR_MeasConfig_t                   *measConfig;
   NR_HANDOVER_INFO                  *handover_info;
   NR_MeasResults_t                  *measResults;

openair2/RRC/NR/rrc_gNB_NGAP.c

@@ -60,6 +60,7 @@
 #include "f1ap_messages_types.h"
 #include "openair2/F1AP/f1ap_ids.h"
 #include "openair2/E1AP/e1ap_asnc.h"
+#include "openair2/E1AP/e1ap.h"
 #include "NGAP_asn_constant.h"
 #include "NGAP_PDUSessionResourceSetupRequestTransfer.h"
 #include "NGAP_PDUSessionResourceModifyRequestTransfer.h"
@@ -130,9 +131,9 @@ nr_rrc_pdcp_config_security(
 )
 //------------------------------------------------------------------------------
 {
-  uint8_t kRRCenc[16] = {0};
-  uint8_t kRRCint[16] = {0};
-  uint8_t kUPenc[16] = {0};
+  uint8_t kRRCenc[NR_K_KEY_SIZE] = {0};
+  uint8_t kRRCint[NR_K_KEY_SIZE] = {0};
+  uint8_t kUPenc[NR_K_KEY_SIZE]  = {0};
   //uint8_t                            *k_kdf  = NULL;
   static int                          print_keys= 1;
   gNB_RRC_UE_t *UE = &ue_context_pP->ue_context;
@@ -406,19 +407,13 @@ static void trigger_bearer_setup(gNB_RRC_INST *rrc, gNB_RRC_UE_t *UE, int n, pdu
       DRB_nGRAN_to_setup_t *drb = pdu->DRBnGRanList + j;
 
       drb->id = rrc_drb->drb_id;
-
+      /* SDAP */
       struct sdap_config_s *sdap_config = &rrc_drb->cnAssociation.sdap_config;
-      drb->defaultDRB = sdap_config->defaultDRB;
-      drb->sDAP_Header_UL = sdap_config->sdap_HeaderUL;
-      drb->sDAP_Header_DL = sdap_config->sdap_HeaderDL;
-
-      struct pdcp_config_s *pdcp_config = &rrc_drb->pdcp_config;
-      drb->pDCP_SN_Size_UL = pdcp_config->pdcp_SN_SizeUL;
-      drb->pDCP_SN_Size_DL = pdcp_config->pdcp_SN_SizeDL;
-      drb->discardTimer = pdcp_config->discardTimer;
-      drb->reorderingTimer = pdcp_config->t_Reordering;
-
-      drb->rLC_Mode = rrc->configuration.um_on_default_drb ? E1AP_RLC_Mode_rlc_um_bidirectional : E1AP_RLC_Mode_rlc_am;
+      drb->sdap_config.defaultDRB = sdap_config->defaultDRB;
+      drb->sdap_config.sDAP_Header_UL = sdap_config->sdap_HeaderUL;
+      drb->sdap_config.sDAP_Header_DL = sdap_config->sdap_HeaderDL;
+      /* PDCP */
+      set_bearer_context_pdcp_config(&drb->pdcp_config, rrc_drb, rrc->configuration.um_on_default_drb);
 
       drb->numCellGroups = 1; // assume one cell group associated with a DRB
 

openair2/RRC/NR/rrc_gNB_nsa.c

@@ -126,8 +126,8 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc, rrc_gNB_ue_context_t *ue_context_p, x2a
   gtpv1u_enb_create_tunnel_req_t  create_tunnel_req;
   gtpv1u_enb_create_tunnel_resp_t create_tunnel_resp;
   protocol_ctxt_t ctxt={0};
-  uint8_t kUPenc[16] = {0};
-  uint8_t kUPint[16] = {0};
+  uint8_t kUPenc[NR_K_KEY_SIZE] = {0};
+  uint8_t kUPint[NR_K_KEY_SIZE] = {0};
   int i;
   gNB_RRC_UE_t *UE = &ue_context_p->ue_context;
 

openair2/RRC/NR/rrc_gNB_radio_bearers.c

@@ -21,6 +21,7 @@
 
 #include "rrc_gNB_radio_bearers.h"
 #include "oai_asn1.h"
+#include "openair2/E1AP/e1ap.h"
 
 rrc_pdu_session_param_t *find_pduSession(gNB_RRC_UE_t *ue, int id, bool create)
 {
@@ -56,6 +57,29 @@ drb_t *get_drb(gNB_RRC_UE_t *ue, uint8_t drb_id)
   return &ue->established_drbs[drb_id - 1];
 }
 
+void set_default_drb_pdcp_config(struct pdcp_config_s *pdcp_config, int do_drb_integrity, int do_drb_ciphering)
+{
+  AssertError(pdcp_config != NULL, return, "Failed to set default PDCP configuration for DRB!\n");
+  pdcp_config->discardTimer = NR_PDCP_Config__drb__discardTimer_infinity;
+  pdcp_config->pdcp_SN_SizeDL = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
+  pdcp_config->pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits;
+  pdcp_config->t_Reordering = NR_PDCP_Config__t_Reordering_ms100;
+  pdcp_config->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
+  pdcp_config->headerCompression.NotUsed = 0;
+  pdcp_config->integrityProtection = do_drb_integrity ? NR_PDCP_Config__drb__integrityProtection_enabled : 1;
+  pdcp_config->ext1.cipheringDisabled = do_drb_ciphering ? 1 : NR_PDCP_Config__ext1__cipheringDisabled_true;
+}
+
+void set_bearer_context_pdcp_config(bearer_context_pdcp_config_t *pdcp_config, drb_t *rrc_drb, bool um_on_default_drb)
+{
+  AssertError(rrc_drb != NULL && pdcp_config != NULL, return, "Failed to set default bearer context PDCP configuration!\n");
+  pdcp_config->pDCP_SN_Size_UL = rrc_drb->pdcp_config.pdcp_SN_SizeUL;
+  pdcp_config->pDCP_SN_Size_DL = rrc_drb->pdcp_config.pdcp_SN_SizeDL;
+  pdcp_config->discardTimer = rrc_drb->pdcp_config.discardTimer;
+  pdcp_config->reorderingTimer = rrc_drb->pdcp_config.t_Reordering;
+  pdcp_config->rLC_Mode = um_on_default_drb ? E1AP_RLC_Mode_rlc_um_bidirectional : E1AP_RLC_Mode_rlc_am;
+}
+
 drb_t *generateDRB(gNB_RRC_UE_t *ue,
                    uint8_t drb_id,
                    const rrc_pdu_session_param_t *pduSession,
@@ -95,20 +119,7 @@ drb_t *generateDRB(gNB_RRC_UE_t *ue,
       est_drb->status = DRB_ACTIVE;
   }
   /* PDCP Configuration */
-  est_drb->pdcp_config.discardTimer = NR_PDCP_Config__drb__discardTimer_infinity;
-  est_drb->pdcp_config.pdcp_SN_SizeDL = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
-  est_drb->pdcp_config.pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits;
-  est_drb->pdcp_config.t_Reordering = NR_PDCP_Config__t_Reordering_ms100;
-  est_drb->pdcp_config.headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
-  est_drb->pdcp_config.headerCompression.NotUsed = 0;
-  if (do_drb_integrity)
-    est_drb->pdcp_config.integrityProtection = NR_PDCP_Config__drb__integrityProtection_enabled;
-  else
-    est_drb->pdcp_config.integrityProtection = 1;
-  if (do_drb_ciphering)
-    est_drb->pdcp_config.ext1.cipheringDisabled = 1;
-  else
-    est_drb->pdcp_config.ext1.cipheringDisabled = NR_PDCP_Config__ext1__cipheringDisabled_true;
+  set_default_drb_pdcp_config(&est_drb->pdcp_config, do_drb_integrity, do_drb_ciphering);
 
   drb_t *rrc_drb = get_drb(ue, drb_id);
   DevAssert(rrc_drb == est_drb); /* to double check that we create the same which we would retrieve */

openair2/RRC/NR/rrc_gNB_radio_bearers.h

@@ -71,4 +71,7 @@ rrc_pdu_session_param_t *find_pduSession(gNB_RRC_UE_t *ue, int id, bool create);
 /// @brief get PDU session of UE ue through the DRB drb_id
 rrc_pdu_session_param_t *find_pduSession_from_drbId(gNB_RRC_UE_t *ue, int drb_id);
 
+/// @brief set PDCP configuration in a bearer context management message
+void set_bearer_context_pdcp_config(bearer_context_pdcp_config_t *pdcp_config, drb_t *rrc_drb, bool um_on_default_drb);
+
 #endif

openair2/RRC/NR_UE/rrc_UE.c

@@ -987,9 +987,9 @@ static void nr_rrc_ue_process_securityModeCommand(NR_UE_RRC_INST_t *ue_rrc,
     c1->present = NR_UL_DCCH_MessageType__c1_PR_securityModeComplete;
   }
 
-  uint8_t kRRCenc[16] = {0};
-  uint8_t kUPenc[16] = {0};
-  uint8_t kRRCint[16] = {0};
+  uint8_t kRRCenc[NR_K_KEY_SIZE] = {0};
+  uint8_t  kUPenc[NR_K_KEY_SIZE] = {0};
+  uint8_t kRRCint[NR_K_KEY_SIZE] = {0};
   nr_derive_key(UP_ENC_ALG, ue_rrc->cipheringAlgorithm, ue_rrc->kgnb, kUPenc);
   nr_derive_key(RRC_ENC_ALG, ue_rrc->cipheringAlgorithm, ue_rrc->kgnb, kRRCenc);
   nr_derive_key(RRC_INT_ALG, ue_rrc->integrityProtAlgorithm, ue_rrc->kgnb, kRRCint);
@@ -1167,8 +1167,8 @@ static void nr_rrc_ue_process_RadioBearerConfig(NR_UE_RRC_INST_t *ue_rrc,
   if (radioBearerConfig->srb3_ToRelease)
     nr_pdcp_release_srb(ue_rrc->ue_id, 3);
 
-  uint8_t kRRCenc[16] = {0};
-  uint8_t kRRCint[16] = {0};
+  uint8_t kRRCenc[NR_K_KEY_SIZE] = {0};
+  uint8_t kRRCint[NR_K_KEY_SIZE] = {0};
   if (ue_rrc->as_security_activated) {
     if (radioBearerConfig->securityConfig != NULL) {
       // When the field is not included, continue to use the currently configured keyToUse