Update GTP remote address from response message

Modified GTP tunnel update function accordingly
Put GTP tunnel update out of F1AP
F1 split works

openair2/COMMON/e1ap_messages_def.h

@@ -29,3 +29,5 @@ MESSAGE_DEF(E1AP_BEARER_CONTEXT_SETUP_REQ , MESSAGE_PRIORITY_MED , e1ap_bearer_s
 
 MESSAGE_DEF(E1AP_BEARER_CONTEXT_SETUP_RESP , MESSAGE_PRIORITY_MED , e1ap_bearer_setup_resp_t , e1ap_bearer_setup_resp)
 
+MESSAGE_DEF(E1AP_BEARER_CONTEXT_MODIFICATION_REQ , MESSAGE_PRIORITY_MED , e1ap_bearer_setup_req_t , e1ap_bearer_mod_req)
+

openair2/COMMON/e1ap_messages_types.h

@@ -36,10 +36,11 @@
 #define E1AP_MAX_NUM_DRBS 4
 #define E1AP_MAX_NUM_UP_PARAM 4
 
-#define E1AP_SETUP_REQ(mSGpTR)                     (mSGpTR)->ittiMsg.e1ap_setup_req
-#define E1AP_SETUP_RESP(mSGpTR)                    (mSGpTR)->ittiMsg.e1ap_setup_resp
-#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_SETUP_REQ(mSGpTR)                            (mSGpTR)->ittiMsg.e1ap_setup_req
+#define E1AP_SETUP_RESP(mSGpTR)                           (mSGpTR)->ittiMsg.e1ap_setup_resp
+#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
 
 typedef f1ap_net_ip_address_t e1ap_net_ip_address_t;
 
@@ -112,6 +113,8 @@ typedef struct DRB_nGRAN_to_setup_s {
   long discardTimer;
   long reorderingTimer;
   long rLC_Mode;
+  in_addr_t tlAddress;
+  int teId;
   int numCellGroups;
   cell_group_t cellGroupList[E1AP_MAX_NUM_CELL_GROUPS];
   int numQosFlow2Setup;
@@ -136,6 +139,7 @@ typedef struct pdu_session_to_setup_s {
 
 typedef struct e1ap_bearer_setup_req_s {
   uint64_t gNB_cu_cp_ue_id;
+  rnti_t   rnti;
   uint64_t cipheringAlgorithm;
   uint64_t integrityProtectionAlgorithm;
   char     encryptionKey[128];

openair2/COMMON/gtpv1_u_messages_types.h

@@ -186,6 +186,7 @@ typedef struct gtpv1u_gnb_create_tunnel_resp_s {
   int                    num_tunnels;
   teid_t                 gnb_NGu_teid[NR_GTPV1U_MAX_BEARERS_PER_UE];  ///< Tunnel Endpoint Identifier
   pdusessionid_t         pdusession_id[NR_GTPV1U_MAX_BEARERS_PER_UE];
+  int                    bearer_id[NR_GTPV1U_MAX_BEARERS_PER_UE];
   transport_layer_addr_t gnb_addr;
 } gtpv1u_gnb_create_tunnel_resp_t;
 typedef struct gtpv1u_gnb_delete_tunnel_req_s {

openair2/E1AP/e1ap.c

@@ -1086,7 +1086,8 @@ int e1apCUCP_handle_BEARER_CONTEXT_SETUP_FAILURE(instance_t instance,
   BEARER CONTEXT MODIFICATION REQUEST
 */
 
-int e1apCUCP_send_BEARER_CONTEXT_MODIFICATION_REQUEST(instance_t instance) {
+int e1apCUCP_send_BEARER_CONTEXT_MODIFICATION_REQUEST(instance_t instance,
+                                                      e1ap_bearer_setup_req_t *req) {
   AssertFatal(false,"Not implemented yet\n");
   return -1;
 }
@@ -1373,6 +1374,11 @@ void *E1AP_CUCP_task(void *arg) {
         e1apCUCP_send_BEARER_CONTEXT_SETUP_REQUEST(myInstance, &E1AP_BEARER_CONTEXT_SETUP_REQ(msg));
         break;
 
+      case E1AP_BEARER_CONTEXT_MODIFICATION_REQ:
+        LOG_I(E1AP, "CUCP Task Received E1AP_BEARER_CONTEXT_MODIFICATION_REQ\n");
+        e1apCUCP_send_BEARER_CONTEXT_MODIFICATION_REQUEST(myInstance, &E1AP_BEARER_CONTEXT_SETUP_REQ(msg));
+        break;
+
       default:
         LOG_E(E1AP, "Unknown message received in TASK_CUCP_E1\n");
         break;

openair2/E1AP/e1ap.h

@@ -30,38 +30,8 @@
 #include "openair2/COMMON/e1ap_messages_types.h"
 #include "openair3/UTILS/conversions.h"
 #include "openair2/F1AP/f1ap_common.h"
+#include "openair2/E1AP/e1ap_common.h"
 
-#include <E1AP_Cause.h>
-#include <E1AP_InitiatingMessage.h>
-#include <E1AP_E1AP-PDU.h>
-#include <E1AP_ProtocolIE-Field.h>
-#include <E1AP_SupportedPLMNs-Item.h>
-#include <E1AP_SuccessfulOutcome.h>
-#include <E1AP_ProtocolIE-Field.h>
-#include <E1AP_UnsuccessfulOutcome.h>
-#include <E1AP_GNB-CU-UP-E1SetupFailure.h>
-#include <E1AP_GNB-CU-UP-ConfigurationUpdate.h>
-#include <E1AP_GNB-CU-UP-TNLA-To-Remove-Item.h>
-#include <E1AP_CP-TNL-Information.h>
-#include <E1AP_UP-Parameters-Item.h>
-#include <E1AP_UP-TNL-Information.h>
-#include <E1AP_PDU-Session-Resource-Setup-Item.h>
-#include <E1AP_DRB-Setup-Item-EUTRAN.h>
-#include <E1AP_DRB-Setup-Item-NG-RAN.h>
-#include <E1AP_QoS-Flow-QoS-Parameter-Item.h>
-#include <E1AP_QoS-Flow-Item.h>
-#include <E1AP_DRB-Failed-List-NG-RAN.h>
-#include <E1AP_DRB-Failed-Item-NG-RAN.h>
-#include <E1AP_BearerContextSetupResponse.h>
-#include <E1AP_BearerContextSetupRequest.h>
-#include <E1AP_DRB-To-Setup-Item-EUTRAN.h>
-#include <E1AP_DRB-To-Setup-Item-NG-RAN.h>
-#include <E1AP_Cell-Group-Information-Item.h>
-#include <E1AP_PDU-Session-Resource-To-Setup-Item.h>
-#include <E1AP_GTPTunnel.h>
-#include <E1AP_Non-Dynamic5QIDescriptor.h>
-#include <E1AP_Dynamic5QIDescriptor.h>
-#include <E1AP_T-ReorderingTimer.h>
 #endif
 
 

openair2/E1AP/e1ap_common.c

@@ -51,6 +51,7 @@ void createE1inst(E1_t type, instance_t instance, e1ap_setup_req_t *req) {
   if (type == CPtype) {
     AssertFatal(e1ap_cp_inst[instance] == NULL, "Double call to E1 CP instance %d\n", (int)instance);
     e1ap_cp_inst[instance] = (e1ap_upcp_inst_t *) calloc(1, sizeof(e1ap_upcp_inst_t));
+    memcpy(&e1ap_cp_inst[instance]->setupReq, req, sizeof(e1ap_setup_req_t));
   } else if (type == UPtype) {
     AssertFatal(e1ap_up_inst[instance] == NULL, "Double call to E1 UP instance %d\n", (int)instance);
     e1ap_up_inst[instance] = (e1ap_upcp_inst_t *) calloc(1, sizeof(e1ap_upcp_inst_t));

openair2/E1AP/e1ap_common.h

@@ -25,6 +25,39 @@
 #define E1AP_COMMON_H_
 #include "openair2/E1AP/e1ap_default_values.h"
 #include "openair2/COMMON/e1ap_messages_types.h"
+
+#include <E1AP_Cause.h>
+#include <E1AP_InitiatingMessage.h>
+#include <E1AP_E1AP-PDU.h>
+#include <E1AP_ProtocolIE-Field.h>
+#include <E1AP_SupportedPLMNs-Item.h>
+#include <E1AP_SuccessfulOutcome.h>
+#include <E1AP_ProtocolIE-Field.h>
+#include <E1AP_UnsuccessfulOutcome.h>
+#include <E1AP_GNB-CU-UP-E1SetupFailure.h>
+#include <E1AP_GNB-CU-UP-ConfigurationUpdate.h>
+#include <E1AP_GNB-CU-UP-TNLA-To-Remove-Item.h>
+#include <E1AP_CP-TNL-Information.h>
+#include <E1AP_UP-Parameters-Item.h>
+#include <E1AP_UP-TNL-Information.h>
+#include <E1AP_PDU-Session-Resource-Setup-Item.h>
+#include <E1AP_DRB-Setup-Item-EUTRAN.h>
+#include <E1AP_DRB-Setup-Item-NG-RAN.h>
+#include <E1AP_QoS-Flow-QoS-Parameter-Item.h>
+#include <E1AP_QoS-Flow-Item.h>
+#include <E1AP_DRB-Failed-List-NG-RAN.h>
+#include <E1AP_DRB-Failed-Item-NG-RAN.h>
+#include <E1AP_BearerContextSetupResponse.h>
+#include <E1AP_BearerContextSetupRequest.h>
+#include <E1AP_DRB-To-Setup-Item-EUTRAN.h>
+#include <E1AP_DRB-To-Setup-Item-NG-RAN.h>
+#include <E1AP_Cell-Group-Information-Item.h>
+#include <E1AP_PDU-Session-Resource-To-Setup-Item.h>
+#include <E1AP_GTPTunnel.h>
+#include <E1AP_Non-Dynamic5QIDescriptor.h>
+#include <E1AP_Dynamic5QIDescriptor.h>
+#include <E1AP_T-ReorderingTimer.h>
+
 int e1ap_decode_pdu(E1AP_E1AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t length);
 
 e1ap_upcp_inst_t *getCxtE1(E1_t type, instance_t instance);

openair2/F1AP/f1ap_cu_ue_context_management.c

@@ -700,10 +700,15 @@ int CU_handle_UE_CONTEXT_SETUP_RESPONSE(instance_t       instance,
       F1AP_GTPTunnel_t *dl_up_tnl0 = dl_up_tnl_info_p->dLUPTNLInformation.choice.gTPTunnel;
       BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4(&dl_up_tnl0->transportLayerAddress, drb_p->up_dl_tnl[0].tl_address);
       OCTET_STRING_TO_INT32(&dl_up_tnl0->gTP_TEID, drb_p->up_dl_tnl[0].teid);
-      GtpuUpdateTunnelOutgoingTeid(getCxt(CUtype, instance)->gtpInst,
+      transport_layer_addr_t addr;
+      int sz=sizeof(drb_p->up_dl_tnl[0].tl_address);
+      memcpy(addr.buffer, &drb_p->up_dl_tnl[0].tl_address, sz);
+      addr.length = sz*8;
+      GtpuUpdateTunnelOutgoingPair(getCxt(CUtype, instance)->gtpInst,
                                    f1ap_ue_context_setup_resp->rnti,
                                    (ebi_t)drbs_setup_item_p->dRBID,
-                                   drb_p->up_dl_tnl[0].teid);
+                                   drb_p->up_dl_tnl[0].teid,
+                                   addr);
     }
   }
 
@@ -1691,10 +1696,6 @@ int CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t       instance,
         F1AP_GTPTunnel_t *dl_up_tnl0 = dl_up_tnl_info_p->dLUPTNLInformation.choice.gTPTunnel;
         BIT_STRING_TO_TRANSPORT_LAYER_ADDRESS_IPv4(&dl_up_tnl0->transportLayerAddress, drb_p->up_dl_tnl[0].tl_address);
         OCTET_STRING_TO_INT32(&dl_up_tnl0->gTP_TEID, drb_p->up_dl_tnl[0].teid);
-        GtpuUpdateTunnelOutgoingTeid(getCxt(CUtype, instance)->gtpInst,
-                     f1ap_ue_context_modification_resp->rnti,
-                     (ebi_t)drbs_setupmod_item_p->dRBID,
-                     drb_p->up_dl_tnl[0].teid);
       }
     }
     // SRBs_FailedToBeSetupMod_List

openair2/RRC/NR/nr_rrc_defs.h

@@ -468,11 +468,13 @@ typedef struct {
 } nr_security_configuration_t;
 
 typedef void (*nr_e1_bearer_cxt_msg_transfer_func_t)(e1ap_bearer_setup_req_t *req, instance_t instance);
+typedef void (*nr_e1_ue_cxt_mod_msg_transfer_func_t)(MessageDef *msg, instance_t instance);
 
 typedef struct nr_mac_rrc_dl_if_s {
   /* TODO add other message types as necessary */
   dl_rrc_message_transfer_func_t dl_rrc_message_transfer;
   nr_e1_bearer_cxt_msg_transfer_func_t nr_e1_bearer_cxt_msg_transfer;
+  nr_e1_ue_cxt_mod_msg_transfer_func_t nr_e1_ue_cxt_mod_msg_transfer;
 } nr_mac_rrc_dl_if_t;
 
 //---NR---(completely change)---------------------

openair2/RRC/NR/nr_rrc_proto.h

@@ -225,3 +225,9 @@ void bearer_context_setup_direct(e1ap_bearer_setup_req_t *req,
 void bearer_context_setup_e1ap(e1ap_bearer_setup_req_t *req,
                                  instance_t instance);
 
+void ue_cxt_mod_send_e1ap(MessageDef *msg,
+                          instance_t instance);
+
+void ue_cxt_mod_direct(MessageDef *msg,
+                       instance_t instance);
+

openair2/RRC/NR/rrc_gNB_NGAP.c

@@ -497,12 +497,14 @@ rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(
       return (-1);
     } else {
       PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt, instance, GNB_FLAG_YES, ue_context_p->ue_context.rnti, 0, 0);
+      gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
       ue_context_p->ue_context.gNB_ue_ngap_id = NGAP_INITIAL_CONTEXT_SETUP_REQ (msg_p).gNB_ue_ngap_id;
       ue_context_p->ue_context.amf_ue_ngap_id = NGAP_INITIAL_CONTEXT_SETUP_REQ (msg_p).amf_ue_ngap_id;
       ue_context_p->ue_context.nas_pdu_flag = NGAP_INITIAL_CONTEXT_SETUP_REQ (msg_p).nas_pdu_flag;
 
       uint8_t nb_pdusessions_tosetup = NGAP_INITIAL_CONTEXT_SETUP_REQ (msg_p).nb_of_pdusessions;
       if (nb_pdusessions_tosetup != 0) {
+        AssertFatal(rrc->node_type != ngran_gNB_CUCP, "PDU sessions in Initial context setup request not handled by E1 yet\n");
         gtpv1u_gnb_create_tunnel_req_t  create_tunnel_req={0};
         for (int i = 0; i < NR_NB_RB_MAX - 3; i++) {
           if(ue_context_p->ue_context.pduSession[i].status >= PDU_SESSION_STATUS_DONE)
@@ -992,6 +994,7 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
   e1ap_bearer_setup_req_t *bearer_req = calloc(1, sizeof(e1ap_bearer_setup_req_t));
 
   bearer_req->gNB_cu_cp_ue_id = gNB_ue_ngap_id;
+  bearer_req->rnti = ue_context_p->ue_context.rnti;
   bearer_req->cipheringAlgorithm = ue_context_p->ue_context.ciphering_algorithm;
   memcpy(bearer_req->encryptionKey, ue_context_p->ue_context.kgnb, sizeof(ue_context_p->ue_context.kgnb));
   bearer_req->integrityProtectionAlgorithm = ue_context_p->ue_context.integrity_algorithm;

openair3/ocp-gtpu/gtp_itf.cpp

@@ -546,7 +546,11 @@ instance_t gtpv1Init(openAddr_t context) {
   return id;
 }
 
-void GtpuUpdateTunnelOutgoingTeid(instance_t instance, ue_id_t ue_id, ebi_t bearer_id, teid_t newOutgoingTeid) {
+void GtpuUpdateTunnelOutgoingPair(instance_t instance,
+                                  ue_id_t ue_id,
+                                  ebi_t bearer_id,
+                                  teid_t newOutgoingTeid,
+                                  transport_layer_addr_t newRemoteAddr) {
   pthread_mutex_lock(&globGtp.gtp_lock);
   getInstRetVoid(compatInst(instance));
   getRntiRetVoid(inst, ue_id);
@@ -560,7 +564,36 @@ void GtpuUpdateTunnelOutgoingTeid(instance_t instance, ue_id_t ue_id, ebi_t bear
   }
 
   ptr2->second.teid_outgoing = newOutgoingTeid;
-  LOG_I(GTPU, "[%ld] Tunnel Outgoing TEID updated to %x \n", instance, ptr2->second.teid_outgoing);
+
+  int addrs_length_in_bytes = newRemoteAddr.length / 8;
+
+  switch (addrs_length_in_bytes) {
+    case 4:
+      memcpy(&ptr2->second.outgoing_ip_addr,newRemoteAddr.buffer,4);
+      break;
+
+    case 16:
+      memcpy(ptr2->second.outgoing_ip6_addr.s6_addr,newRemoteAddr.buffer,
+             16);
+      break;
+
+    case 20:
+      memcpy(&ptr2->second.outgoing_ip_addr,newRemoteAddr.buffer,4);
+      memcpy(ptr2->second.outgoing_ip6_addr.s6_addr,
+             newRemoteAddr.buffer+4,
+             16);
+
+    default:
+      AssertFatal(false, "SGW Address size impossible");
+  }
+
+  char ip4[INET_ADDRSTRLEN];
+  char ip6[INET6_ADDRSTRLEN];
+  LOG_I(GTPU, "[%ld] Tunnel Outgoing TEID updated to %x, remote IPv4 to: %s, IPv6 to: %s\n",
+        instance,
+        ptr2->second.teid_outgoing,
+        inet_ntop(AF_INET,(void *)&ptr2->second.outgoing_ip_addr, ip4,INET_ADDRSTRLEN ),
+        inet_ntop(AF_INET6,(void *)ptr2->second.outgoing_ip6_addr.s6_addr, ip6, INET6_ADDRSTRLEN));
   pthread_mutex_unlock(&globGtp.gtp_lock);
   return;
 }
@@ -619,7 +652,7 @@ teid_t newGtpuCreateTunnel(instance_t instance,
 
     case 20:
       memcpy(&tmp->outgoing_ip_addr,remoteAddr.buffer,4);
-      memcpy(&tmp->outgoing_ip6_addr.s6_addr,
+      memcpy(tmp->outgoing_ip6_addr.s6_addr,
              remoteAddr.buffer+4,
              16);
 

openair3/ocp-gtpu/gtp_itf.h

@@ -91,7 +91,13 @@ extern "C" {
                              int port,
                              gtpCallback callBack,
                              gtpCallbackSDAP callBackSDAP);
-  void GtpuUpdateTunnelOutgoingTeid(instance_t instance, ue_id_t ue_id, ebi_t bearer_id, teid_t newOutgoingTeid);
+
+  void GtpuUpdateTunnelOutgoingPair(instance_t instance,
+                                    ue_id_t ue_id,
+                                    ebi_t bearer_id,
+                                    teid_t newOutgoingTeid,
+                                    transport_layer_addr_t newRemoteAddr);
+
   int newGtpuDeleteAllTunnels(instance_t instance, ue_id_t ue_id);
   int newGtpuDeleteTunnels(instance_t instance, ue_id_t ue_id, int nbTunnels, pdusessionid_t *pdusession_id);
   instance_t gtpv1Init(openAddr_t context);