From c474b24d3245ed69b66f9fbcc39fc21408f16df4 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Mon, 7 Aug 2017 13:17:11 +0200
Subject: [PATCH] add basic NAS configuration class

---
 lib/include/srslte/common/interfaces_common.h | 11 +++++++++++
 srsue/hdr/upper/nas.h                         |  4 ++--
 srsue/src/upper/nas.cc                        | 10 +++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/include/srslte/common/interfaces_common.h b/lib/include/srslte/common/interfaces_common.h
index 44b1c5338..d919d9fe5 100644
--- a/lib/include/srslte/common/interfaces_common.h
+++ b/lib/include/srslte/common/interfaces_common.h
@@ -34,6 +34,17 @@
 
 namespace srslte {
 
+class srslte_nas_config_t
+{
+public:
+  srslte_nas_config_t(uint32_t lcid_ = 0)
+    :lcid(lcid_)
+    {}
+
+  uint32_t lcid;
+};
+
+
 class srslte_pdcp_config_t
 {
 public:
diff --git a/srsue/hdr/upper/nas.h b/srsue/hdr/upper/nas.h
index ae3dfe246..32afd52bb 100644
--- a/srsue/hdr/upper/nas.h
+++ b/srsue/hdr/upper/nas.h
@@ -66,7 +66,7 @@ public:
             rrc_interface_nas   *rrc_,
             gw_interface_nas    *gw_,
             srslte::log         *nas_log_,
-            uint32_t            lcid_);
+            srslte::srslte_nas_config_t cfg_);
   void stop();
 
   emm_state_t get_state();
@@ -84,7 +84,7 @@ private:
   rrc_interface_nas  *rrc;
   usim_interface_nas *usim;
   gw_interface_nas   *gw;
-  uint32_t           default_lcid;
+  srslte::srslte_nas_config_t cfg;
 
   emm_state_t        state;
    
diff --git a/srsue/src/upper/nas.cc b/srsue/src/upper/nas.cc
index 440ac77e4..1595a2cec 100644
--- a/srsue/src/upper/nas.cc
+++ b/srsue/src/upper/nas.cc
@@ -44,14 +44,14 @@ void nas::init(usim_interface_nas *usim_,
                rrc_interface_nas  *rrc_,
                gw_interface_nas   *gw_,
                srslte::log        *nas_log_,
-               uint32_t           lcid_)
+               srslte::srslte_nas_config_t cfg_)
 {
   pool    = byte_buffer_pool::get_instance();
   usim    = usim_;
   rrc     = rrc_;
   gw      = gw_;
   nas_log = nas_log_;
-  default_lcid = lcid_;
+  cfg     = cfg_;
 }
 
 void nas::stop()
@@ -574,7 +574,7 @@ void nas::send_attach_request()
   liblte_mme_pack_attach_request_msg(&attach_req, (LIBLTE_BYTE_MSG_STRUCT*)msg);
 
   nas_log->info("Sending attach request\n");
-  rrc->write_sdu(default_lcid, msg);
+  rrc->write_sdu(cfg.lcid, msg);
 }
 
 void nas::gen_pdn_connectivity_request(LIBLTE_BYTE_MSG_STRUCT *msg)
@@ -616,7 +616,7 @@ void nas::send_service_request()
   uint8_t mac[4];
   integrity_generate(&k_nas_int[16],
                       count_ul,
-                      default_lcid-1,
+                      cfg.lcid-1,
                       SECURITY_DIRECTION_UPLINK,
                       &msg->msg[0],
                       2,
@@ -627,7 +627,7 @@ void nas::send_service_request()
   msg->msg[3] = mac[3];
   msg->N_bytes++;
   nas_log->info("Sending service request\n");
-  rrc->write_sdu(default_lcid, msg);
+  rrc->write_sdu(cfg.lcid, msg);
 }
 
 void nas::send_esm_information_response(){}