From afcd6d74e548a5988d04cd337c832885298fe44e Mon Sep 17 00:00:00 2001
From: Nicola Baldo <nbaldo@cttc.es>
Date: Wed, 5 Dec 2012 17:19:28 +0100
Subject: [PATCH] initialize SRB0 saps at startup

---
 src/lte/model/lte-ue-rrc.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc
index 73cb017c4..9a001c1dd 100644
--- a/src/lte/model/lte-ue-rrc.cc
+++ b/src/lte/model/lte-ue-rrc.cc
@@ -338,6 +338,10 @@ LteUeRrc::DoStart (void)
   m_srb0 = CreateObject<LteSignalingRadioBearerInfo> ();  
   m_srb0->m_rlc = rlc;
   m_srb0->m_srbIdentity = 0;
+  LteUeRrcSapUser::SetupParameters ueParams;
+  ueParams.srb0SapProvider = m_srb0->m_rlc->GetLteRlcSapProvider ();
+  ueParams.srb1SapProvider = 0;
+  m_rrcSapUser->Setup (ueParams);
 
   // CCCH (LCID 0) is pre-configured, here is the hardcoded configuration:
   LteUeCmacSapProvider::LogicalChannelConfig lcConfig;
@@ -529,7 +533,10 @@ LteUeRrc::DoCompleteSetup (LteUeRrcSapProvider::CompleteSetupParameters params)
 {
   NS_LOG_FUNCTION (this);
   m_srb0->m_rlc->SetLteRlcSapUser (params.srb0SapUser);
-  m_srb1->m_pdcp->SetLtePdcpSapUser (params.srb1SapUser);
+  if (m_srb1)
+    {
+      m_srb1->m_pdcp->SetLtePdcpSapUser (params.srb1SapUser);
+    }
 }