E1 bearer modification: harmonize code

openair2/E1AP/e1ap.c

@@ -1283,7 +1283,8 @@ int e1apCUUP_handle_BEARER_CONTEXT_MODIFICATION_REQUEST(sctp_assoc_t assoc_id, e
 
   e1ap_bearer_setup_req_t bearerCxt = {0};
   extract_BEARER_CONTEXT_MODIFICATION_REQUEST(pdu, &bearerCxt);
-  CUUP_process_bearer_context_mod_req(e1_inst->instance, &bearerCxt);
+
+  e1_bearer_context_modif(&bearerCxt);
   return 0;
 }
 
@@ -1778,6 +1779,14 @@ void *E1AP_CUUP_task(void *arg) {
         e1apCUUP_send_BEARER_CONTEXT_SETUP_RESPONSE(inst->cuup.assoc_id, resp);
         } break;
 
+      case E1AP_BEARER_CONTEXT_MODIFICATION_RESP: {
+        //const e1ap_bearer_modif_resp_t *resp = &E1AP_BEARER_CONTEXT_MODIFICATION_RESP(msg);
+        const e1ap_upcp_inst_t *inst = getCxtE1(myInstance);
+        AssertFatal(inst != NULL, "no E1 instance found for instance %ld\n", myInstance);
+        LOG_W(E1AP, "E1AP_BEARER_CONTEXT_MODIFICATION_RESP lost!\n");
+        //e1apCUUP_send_BEARER_CONTEXT_MODIFICATION_RESPONSE
+        } break;
+
       default:
         LOG_E(E1AP, "Unknown message received in TASK_CUUP_E1\n");
         break;

openair2/E1AP/e1ap_api.c

@@ -34,15 +34,6 @@
 #include "e1ap_common.h"
 #include "e1ap.h"
 
-void CUUP_process_bearer_context_mod_req(instance_t instance, e1ap_bearer_setup_req_t *const req)
-{
-  e1ap_upcp_inst_t *inst = getCxtE1(instance);
-  AssertFatal(inst, "");
-  // assume we receive modification of F1-U but it is wrong, we can also get modification of N3 when HO will occur
-  CU_update_UP_DL_tunnel(req, inst->gtpInstF1U, req->gNB_cu_cp_ue_id);
-  // TODO: send bearer cxt mod response
-}
-
 void CUUP_process_bearer_release_command(instance_t instance, e1ap_bearer_release_cmd_t *const cmd)
 {
   e1ap_upcp_inst_t *inst = getCxtE1(instance);

openair2/E1AP/e1ap_api.h

@@ -28,7 +28,6 @@
 #include "openair2/COMMON/e1ap_messages_types.h"
 #include "openair2/E1AP/e1ap_common.h"
 void cuup_init_n3(instance_t instance);
-void CUUP_process_bearer_context_mod_req(instance_t, e1ap_bearer_setup_req_t *const req);
 
 void CUUP_process_bearer_release_command(instance_t, e1ap_bearer_release_cmd_t *const cmd);
 #endif