From f19ea82f8e4cb36ff97e20d1638e6f384ad52f35 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Thu, 24 Feb 2022 12:54:04 +0100
Subject: [PATCH] Drop an sgNB release request if no SCTP endpoint available

---
 openair2/X2AP/x2ap_eNB.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openair2/X2AP/x2ap_eNB.c b/openair2/X2AP/x2ap_eNB.c
index 38e6149ccd..2b1d19001a 100644
--- a/openair2/X2AP/x2ap_eNB.c
+++ b/openair2/X2AP/x2ap_eNB.c
@@ -621,7 +621,12 @@ void x2ap_eNB_handle_sgNB_release_request(instance_t instance,
   }
 
   target = x2ap_get_eNB(NULL, x2ap_release_req->assoc_id, 0);
-  DevAssert(target != NULL);
+  if (target == NULL) {
+    X2AP_ERROR("no X2AP target eNB on assoc_id %d, dropping sgNB release request\n", x2ap_release_req->assoc_id);
+    /* x2ap_gNB_handle_ENDC_sGNB_release_request_acknowledge() would handle the
+     * ack, but does not do anything */
+    return;
+  }
 
   /* id_source is not used by oai's gNB so it's not big deal. For
    * interoperability with other gNBs things may need to be refined.