rename pdcp function for GW to is_lcid_enabled()

master
Andre Puschmann 6 years ago
parent 40d19e2d32
commit ee5b055829

@ -229,7 +229,7 @@ class pdcp_interface_gw
{ {
public: public:
virtual void write_sdu(uint32_t lcid, srslte::byte_buffer_t *sdu, bool blocking) = 0; 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 // PDCP interface for RRC

@ -51,7 +51,7 @@ public:
void stop(); void stop();
// GW interface // GW interface
bool is_drb_enabled(uint32_t lcid); bool is_lcid_enabled(uint32_t lcid);
// RRC interface // RRC interface
void reestablish(); void reestablish();

@ -106,7 +106,7 @@ void pdcp::reset()
/******************************************************************************* /*******************************************************************************
RRC/GW interface RRC/GW interface
*******************************************************************************/ *******************************************************************************/
bool pdcp::is_drb_enabled(uint32_t lcid) bool pdcp::is_lcid_enabled(uint32_t lcid)
{ {
pthread_rwlock_rdlock(&rwlock); pthread_rwlock_rdlock(&rwlock);
bool ret = false; bool ret = false;

@ -343,7 +343,7 @@ void gw::run_thread()
{ {
gw_log->info_hex(pdu->msg, pdu->N_bytes, "TX PDU"); 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) { if (!attach_wait) {
gw_log->info("LCID=%d not active, requesting NAS attach (%d/%d)\n", cfg.lcid, attach_wait, ATTACH_WAIT_TOUT); gw_log->info("LCID=%d not active, requesting NAS attach (%d/%d)\n", cfg.lcid, attach_wait, ATTACH_WAIT_TOUT);
if (!nas->attach_request()) { if (!nas->attach_request()) {
@ -361,7 +361,7 @@ void gw::run_thread()
} }
// Send PDU directly to PDCP // Send PDU directly to PDCP
if (pdcp->is_drb_enabled(cfg.lcid)) { if (pdcp->is_lcid_enabled(cfg.lcid)) {
pdu->set_timestamp(); pdu->set_timestamp();
ul_tput_bytes += pdu->N_bytes; ul_tput_bytes += pdu->N_bytes;
pdcp->write_sdu(cfg.lcid, pdu, false); pdcp->write_sdu(cfg.lcid, pdu, false);

Loading…
Cancel
Save