From 984c0bff0f079ce2665edeccb5ec99986801c6c9 Mon Sep 17 00:00:00 2001
From: Guido Casati <hello@guidocasati.com>
Date: Mon, 1 Sep 2025 15:05:54 +0200
Subject: [PATCH] Send NG HO failure message upon nr_rrc_n2_ho_acknowledge
 failure

---
 openair2/RRC/NR/rrc_gNB_mobility.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openair2/RRC/NR/rrc_gNB_mobility.c b/openair2/RRC/NR/rrc_gNB_mobility.c
index a2978e2d56..3c9bf2c17b 100644
--- a/openair2/RRC/NR/rrc_gNB_mobility.c
+++ b/openair2/RRC/NR/rrc_gNB_mobility.c
@@ -469,6 +469,10 @@ static void nr_rrc_n2_ho_acknowledge(gNB_RRC_INST *rrc, gNB_RRC_UE_t *UE)
   byte_array_t hoCommand = rrc_gNB_encode_HandoverCommand(UE, rrc);
   if (hoCommand.len < 0) {
     LOG_E(NR_RRC, "ASN1 message encoding failed: failed to generate Handover Command Message\n");
+    ngap_handover_failure_t fail = {.amf_ue_ngap_id = UE->amf_ue_ngap_id,
+                                    .cause.type = NGAP_CAUSE_RADIO_NETWORK,
+                                    .cause.value = NGAP_CAUSE_RADIO_NETWORK_HO_FAILURE_IN_TARGET_5GC_NGRAN_NODE_OR_TARGET_SYSTEM};
+    UE->ho_context->target->ho_failure(rrc, UE->rrc_ue_id, &fail);
     return;
   } else {
     LOG_D(NR_RRC, "HO LOG: Handover Command for UE %u Encoded (%ld bytes)\n", UE->rrc_ue_id, hoCommand.len);