From ee5b055829e3844e63439b91fc41b574edfe3886 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Wed, 25 Jul 2018 15:09:19 +0200
Subject: [PATCH] rename pdcp function for GW to is_lcid_enabled()

---
 lib/include/srslte/interfaces/ue_interfaces.h | 2 +-
 lib/include/srslte/upper/pdcp.h               | 2 +-
 lib/src/upper/pdcp.cc                         | 2 +-
 srsue/src/upper/gw.cc                         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/include/srslte/interfaces/ue_interfaces.h b/lib/include/srslte/interfaces/ue_interfaces.h
index 1cfcc56e0..dc8128041 100644
--- a/lib/include/srslte/interfaces/ue_interfaces.h
+++ b/lib/include/srslte/interfaces/ue_interfaces.h
@@ -229,7 +229,7 @@ class pdcp_interface_gw
 {
 public:
   virtual void write_sdu(uint32_t lcid, srslte::byte_buffer_t *sdu, bool blocking) = 0;
-  virtual bool is_drb_enabled(uint32_t lcid) = 0;
+  virtual bool is_lcid_enabled(uint32_t lcid) = 0;
 };
 
 // PDCP interface for RRC
diff --git a/lib/include/srslte/upper/pdcp.h b/lib/include/srslte/upper/pdcp.h
index 53149154a..2376bd020 100644
--- a/lib/include/srslte/upper/pdcp.h
+++ b/lib/include/srslte/upper/pdcp.h
@@ -51,7 +51,7 @@ public:
   void stop();
 
   // GW interface
-  bool is_drb_enabled(uint32_t lcid);
+  bool is_lcid_enabled(uint32_t lcid);
 
   // RRC interface
   void reestablish();
diff --git a/lib/src/upper/pdcp.cc b/lib/src/upper/pdcp.cc
index acf0d6988..c15fe6106 100644
--- a/lib/src/upper/pdcp.cc
+++ b/lib/src/upper/pdcp.cc
@@ -106,7 +106,7 @@ void pdcp::reset()
 /*******************************************************************************
   RRC/GW interface
 *******************************************************************************/
-bool pdcp::is_drb_enabled(uint32_t lcid)
+bool pdcp::is_lcid_enabled(uint32_t lcid)
 {
   pthread_rwlock_rdlock(&rwlock);
   bool ret = false;
diff --git a/srsue/src/upper/gw.cc b/srsue/src/upper/gw.cc
index acf2bb07e..e78bd70bb 100644
--- a/srsue/src/upper/gw.cc
+++ b/srsue/src/upper/gw.cc
@@ -343,7 +343,7 @@ void gw::run_thread()
         {
           gw_log->info_hex(pdu->msg, pdu->N_bytes, "TX PDU");
 
-          while(run_enable && !pdcp->is_drb_enabled(cfg.lcid) && attach_wait < ATTACH_WAIT_TOUT) {
+          while(run_enable && !pdcp->is_lcid_enabled(cfg.lcid) && attach_wait < ATTACH_WAIT_TOUT) {
             if (!attach_wait) {
               gw_log->info("LCID=%d not active, requesting NAS attach (%d/%d)\n", cfg.lcid, attach_wait, ATTACH_WAIT_TOUT);
               if (!nas->attach_request()) {
@@ -361,7 +361,7 @@ void gw::run_thread()
           }
 
           // Send PDU directly to PDCP
-          if (pdcp->is_drb_enabled(cfg.lcid)) {
+          if (pdcp->is_lcid_enabled(cfg.lcid)) {
             pdu->set_timestamp();
             ul_tput_bytes += pdu->N_bytes;
             pdcp->write_sdu(cfg.lcid, pdu, false);