From b09ae059c16020f924bc41be0866e0b179e3061b Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@softwareradiosystems.com>
Date: Fri, 12 Jan 2018 15:11:00 +0000
Subject: [PATCH] Small commit to avoid duplication of UE ctxt in GUTI attach.

---
 srsepc/src/mme/s1ap_nas_transport.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srsepc/src/mme/s1ap_nas_transport.cc b/srsepc/src/mme/s1ap_nas_transport.cc
index 9c9eceff9..394241cb8 100644
--- a/srsepc/src/mme/s1ap_nas_transport.cc
+++ b/srsepc/src/mme/s1ap_nas_transport.cc
@@ -177,8 +177,12 @@ s1ap_nas_transport::handle_initial_ue_message(LIBLTE_S1AP_MESSAGE_INITIALUEMESSA
     ue_ctx.erabs_ctx[i].state = ERAB_DEACTIVATED;
     ue_ctx.erabs_ctx[i].erab_id = i;
   }
-  m_s1ap->add_new_ue_ctx(ue_ctx);
 
+  if(attach_req.eps_mobile_id.type_of_id == LIBLTE_MME_EPS_MOBILE_ID_TYPE_IMSI)
+  {
+    //IMSI attach requeires new UE ctxt
+    m_s1ap->add_new_ue_ctx(ue_ctx);
+  }
   //Pack NAS Authentication Request in Downlink NAS Transport msg
   pack_authentication_request(reply_buffer, ue_ctx.enb_ue_s1ap_id, ue_ctx.mme_ue_s1ap_id, autn, rand);