From c5fdcd85cc936677e65daa378c11b6b35a8cb0cf Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@eurecom.fr>
Date: Sat, 11 Apr 2020 15:42:13 +0200
Subject: [PATCH] Bugfix FlexRAN: if a UE is in RRC but not S1AP, treat as no
 bug

---
 openair2/ENB_APP/flexran_agent_ran_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openair2/ENB_APP/flexran_agent_ran_api.c b/openair2/ENB_APP/flexran_agent_ran_api.c
index 32cb8c74e1..abade20846 100644
--- a/openair2/ENB_APP/flexran_agent_ran_api.c
+++ b/openair2/ENB_APP/flexran_agent_ran_api.c
@@ -3644,7 +3644,7 @@ int flexran_get_s1ap_ue(mid_t mod_id, rnti_t rnti, Protocol__FlexS1apUe * ue_con
   RB_FOREACH(ue, s1ap_ue_map, &s1ap->s1ap_ue_head){
     if (ue->eNB_ue_s1ap_id == enb_ue_s1ap_id) break;
   }
-  if (ue == NULL) return -1;
+  if (!ue) return 0; // UE does not exist: it might be connected but CN did not answer
 
   if (ue->mme_ref->mme_s1_ip.ipv4)
     ue_conf->mme_s1_ip = (char*) &ue->mme_ref->mme_s1_ip.ipv4_address[0];