5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added interface to get internal PDCP state.

Browse Source
master
Pedro Alvarez 5 years ago
parent 4093e75237
commit 33567d81db
11 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File

3
lib/include/srslte/interfaces/enb_interfaces.h
Unescape Escape View File

@ -385,7 +385,8 @@ public:
virtual void enable_integrity(uint16_t rnti, uint32_t lcid) = 0;
virtual void enable_encryption(uint16_t rnti, uint32_t lcid) = 0;
virtual bool
get_bearer_status(uint16_t rnti, uint32_t lcid, uint16_t* dlsn, uint16_t* dlhfn, uint16_t* ulsn, uint16_t* ulhfn) = 0;
get_bearer_status(uint16_t rnti, uint32_t lcid, uint16_t* dlsn, uint16_t* dlhfn, uint16_t* ulsn, uint16_t* ulhfn) = 0;
virtual bool get_state(uint16_t rnti, uint32_t lcid, srslte::pdcp_lte_state_t* state) = 0;
};
// PDCP interface for RLC

8
lib/include/srslte/interfaces/pdcp_interface_types.h
Unescape Escape View File

@ -142,6 +142,14 @@ public:
enum srslte_direction_t { DIRECTION_NONE = 0, DIRECTION_TX, DIRECTION_RX, DIRECTION_TXRX, DIRECTION_N_ITEMS };
static const char* srslte_direction_text[DIRECTION_N_ITEMS] = {"none", "tx", "rx", "tx/rx"};
// PDCP LTE internal state
struct pdcp_lte_state_t {
uint32_t tx_count;
uint32_t rx_hfn;
uint32_t next_pdcp_rx_sn;
uint32_t last_submitted_pdcp_rx_sn;
};
} // namespace srslte
#endif // SRSLTE_PDCP_INTERFACE_TYPES_H

1
lib/include/srslte/upper/pdcp.h
Unescape Escape View File

@ -56,6 +56,7 @@ public:
void enable_encryption(uint32_t lcid, srslte_direction_t direction);
void enable_security_timed(uint32_t lcid, srslte_direction_t direction, uint32_t sn);
bool get_bearer_status(uint32_t lcid, uint16_t* dlsn, uint16_t* dlhfn, uint16_t* ulsn, uint16_t* ulhfn);
bool get_state(uint32_t lcid, srslte::pdcp_lte_state_t* state);
// RLC interface
void write_pdu(uint32_t lcid, unique_byte_buffer_t sdu);

15
lib/include/srslte/upper/pdcp_entity_lte.h
Unescape Escape View File

@ -39,13 +39,6 @@ namespace srslte {
#define PDCP_CONTROL_MAC_I 0x00000000
struct pdcp_lte_state_t {
uint32_t tx_count;
uint32_t rx_hfn;
uint32_t next_pdcp_rx_sn;
uint32_t last_submitted_pdcp_rx_sn;
};
/****************************************************************************
* LTE PDCP Entity
* Class for LTE PDCP entities
@ -64,10 +57,10 @@ public:
void reestablish();
// GW/RRC interface
void write_sdu(unique_byte_buffer_t sdu, bool blocking);
void get_bearer_status(uint16_t* dlsn, uint16_t* dlhfn, uint16_t* ulsn, uint16_t* ulhfn);
pdcp_lte_state_t get_state();
void set_state(const pdcp_lte_state_t& state);
void write_sdu(unique_byte_buffer_t sdu, bool blocking);
void get_bearer_status(uint16_t* dlsn, uint16_t* dlhfn, uint16_t* ulsn, uint16_t* ulhfn);
void get_state(pdcp_lte_state_t* state);
void set_state(const pdcp_lte_state_t& state);
// RLC interface
void write_pdu(unique_byte_buffer_t pdu);

15
lib/src/upper/pdcp.cc
Unescape Escape View File

@ -24,10 +24,8 @@
namespace srslte {
pdcp::pdcp(srslte::task_handler_interface* task_executor_, const char* logname) :
task_executor(task_executor_),
pdcp_log(logname)
{
}
task_executor(task_executor_), pdcp_log(logname)
{}
pdcp::~pdcp()
{
@ -230,6 +228,15 @@ bool pdcp::get_bearer_status(uint32_t lcid, uint16_t* dlsn, uint16_t* dlhfn, uin
return true;
}
bool pdcp::get_state(uint32_t lcid, srslte::pdcp_lte_state_t* state)
{
if (not valid_lcid(lcid)) {
return false;
}
pdcp_array[lcid]->get_state(state);
return true;
}
/*******************************************************************************
RLC interface
*******************************************************************************/

4
lib/src/upper/pdcp_entity_lte.cc
Unescape Escape View File

@ -369,9 +369,9 @@ bool pdcp_entity_lte::check_valid_config()
/****************************************************************************
* Internal state getters/setters
***************************************************************************/
pdcp_lte_state_t pdcp_entity_lte::get_state()
void pdcp_entity_lte::get_state(pdcp_lte_state_t* state)
{
return pdcp_lte_state_t{tx_count, rx_hfn, next_pdcp_rx_sn, last_submitted_pdcp_rx_sn};
*state = {tx_count, rx_hfn, next_pdcp_rx_sn, last_submitted_pdcp_rx_sn};
}
void pdcp_entity_lte::set_state(const pdcp_lte_state_t& state)

3
srsenb/hdr/stack/rrc/rrc_ue.h
Unescape Escape View File

@ -123,8 +123,9 @@ private:
sched_interface::ue_cfg_t current_sched_ue_cfg = {};
uint32_t rlf_cnt = 0;
uint8_t transaction_id = 0;
uint16_t old_reest_rnti = SRSLTE_INVALID_RNTI;
rrc_state_t state = RRC_STATE_IDLE;
uint16_t old_reest_rnti = SRSLTE_INVALID_RNTI;
srslte::pdcp_lte_state_t old_reest_pdcp_state = {};
asn1::s1ap::ue_aggregate_maximum_bitrate_s bitrates;
bool eutra_capabilities_unpacked = false;

1
srsenb/hdr/stack/upper/pdcp.h
Unescape Escape View File

@ -54,6 +54,7 @@ public:
void enable_encryption(uint16_t rnti, uint32_t lcid) override;
bool get_bearer_status(uint16_t rnti, uint32_t lcid, uint16_t* dlsn, uint16_t* dlhfn, uint16_t* ulsn, uint16_t* ulhfn)
override;
bool get_state(uint16_t rnti, uint32_t lcid, srslte::pdcp_lte_state_t* state);
private:
class user_interface_rlc : public srsue::rlc_interface_pdcp

3
srsenb/src/stack/rrc/rrc_ue.cc
Unescape Escape View File

@ -364,6 +364,9 @@ void rrc::ue::handle_rrc_con_reest_req(rrc_conn_reest_request_s* msg)
// Modify GTP-U tunnel
parent->gtpu->mod_bearer_rnti(old_rnti, rnti);
// Get PDCP entity state (required when using RLC AM)
parent->pdcp->get_state(old_rnti, 3, &old_reest_pdcp_state);
old_reest_rnti = old_rnti;
state = RRC_STATE_WAIT_FOR_CON_REEST_COMPLETE;
set_activity_timeout(UE_RESPONSE_RX_TIMEOUT);

12
srsenb/src/stack/upper/pdcp.cc
Unescape Escape View File

@ -25,9 +25,7 @@
namespace srsenb {
pdcp::pdcp(srslte::task_handler_interface* task_executor_, const char* logname) :
task_executor(task_executor_),
log_h(logname),
pool(srslte::byte_buffer_pool::get_instance())
task_executor(task_executor_), log_h(logname), pool(srslte::byte_buffer_pool::get_instance())
{}
void pdcp::init(rlc_interface_pdcp* rlc_, rrc_interface_pdcp* rrc_, gtpu_interface_pdcp* gtpu_)
@ -132,6 +130,14 @@ bool pdcp::get_bearer_status(uint16_t rnti,
return users[rnti].pdcp->get_bearer_status(lcid, dlsn, dlhfn, ulsn, ulhfn);
}
bool pdcp::get_state(uint16_t rnti, uint32_t lcid, srslte::pdcp_lte_state_t* state)
{
if (users.count(rnti) == 0) {
return false;
}
return users[rnti].pdcp->get_state(lcid, state);
}
void pdcp::write_pdu(uint16_t rnti, uint32_t lcid, srslte::unique_byte_buffer_t sdu)
{
if (users.count(rnti)) {

1
srsenb/test/common/dummy_classes.h
Unescape Escape View File

@ -77,6 +77,7 @@ public:
{
return true;
}
bool get_state(uint16_t rnti, uint32_t lcid, srslte::pdcp_lte_state_t* state) { return true; }
};
class s1ap_dummy : public s1ap_interface_rrc

Write Preview
Loading…
Cancel
Save