From 1fc16077ffe2859ab38a5523a635b2e0b0705f8f Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 2 May 2024 15:14:33 +0200
Subject: [PATCH] Correctly trigger NGAP UE Context Setup Response

Trigger UE ctxt setup response for the case of "registration request"
(no PDU sessions in UE Context setup response), as mandated by
O-RAN.WG5.C.1-v11.
---
 openair2/RRC/NR/nr_rrc_defs.h | 1 -
 openair2/RRC/NR/rrc_gNB.c     | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openair2/RRC/NR/nr_rrc_defs.h b/openair2/RRC/NR/nr_rrc_defs.h
index c880604616..62402827fc 100644
--- a/openair2/RRC/NR/nr_rrc_defs.h
+++ b/openair2/RRC/NR/nr_rrc_defs.h
@@ -241,7 +241,6 @@ typedef enum {
   RRC_SETUP_FOR_REESTABLISHMENT,
   RRC_REESTABLISH,
   RRC_REESTABLISH_COMPLETE,
-  RRC_DEFAULT_RECONF,
   RRC_DEDICATED_RECONF,
   RRC_PDUSESSION_ESTABLISH,
   RRC_PDUSESSION_MODIFY,
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 7eef263629..cd8c56cfac 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -1321,6 +1321,7 @@ static int handle_ueCapabilityInformation(const protocol_ctxt_t *const ctxt_pP,
 
   rrc_gNB_send_NGAP_UE_CAPABILITIES_IND(ctxt_pP, ue_context_p, ue_cap_info);
 
+  rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(ctxt_pP, ue_context_p);
   rrc_forward_ue_nas_message(RC.nrrrc[ctxt_pP->instance], UE);
 
   return 0;
@@ -1420,9 +1421,6 @@ static void handle_rrcReconfigurationComplete(const protocol_ctxt_t *const ctxt_
     case RRC_PDUSESSION_MODIFY:
       rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(ctxt_pP, ue_context_p, xid);
       break;
-    case RRC_DEFAULT_RECONF:
-      rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(ctxt_pP, ue_context_p);
-      break;
     case RRC_REESTABLISH_COMPLETE:
     case RRC_DEDICATED_RECONF:
       /* do nothing */
@@ -1552,6 +1550,9 @@ int rrc_gNB_decode_dcch(const protocol_ctxt_t *const ctxt_pP,
           rrc_gNB_generate_UECapabilityEnquiry(ctxt_pP, ue_context_p);
           /* else block is executed after receiving UE capability info */
         } else {
+          /* we already have capabilities, and no PDU sessions to setup, ack
+           * this UE */
+          rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(ctxt_pP, ue_context_p);
           rrc_forward_ue_nas_message(RC.nrrrc[0], &ue_context_p->ue_context);
         }
         break;