mirror of https://github.com/PentHertz/srsLTE.git
move radio bearer definition to RRC
This commit is contained in:
parent
5fdce71710
commit
74138071db
|
@ -96,35 +96,6 @@ static const char error_text[ERROR_N_ITEMS][20] = { "None",
|
||||||
"Can't start",
|
"Can't start",
|
||||||
"Already started"};
|
"Already started"};
|
||||||
|
|
||||||
// Radio bearers
|
|
||||||
typedef enum{
|
|
||||||
RB_ID_SRB0 = 0,
|
|
||||||
RB_ID_SRB1,
|
|
||||||
RB_ID_SRB2,
|
|
||||||
RB_ID_DRB1,
|
|
||||||
RB_ID_DRB2,
|
|
||||||
RB_ID_DRB3,
|
|
||||||
RB_ID_DRB4,
|
|
||||||
RB_ID_DRB5,
|
|
||||||
RB_ID_DRB6,
|
|
||||||
RB_ID_DRB7,
|
|
||||||
RB_ID_DRB8,
|
|
||||||
RB_ID_MAX
|
|
||||||
} rb_id_t;
|
|
||||||
|
|
||||||
static const char rb_id_str[RB_ID_MAX][8] = {"SRB0", "SRB1", "SRB2",
|
|
||||||
"DRB1", "DRB2", "DRB3",
|
|
||||||
"DRB4", "DRB5", "DRB6",
|
|
||||||
"DRB7", "DRB8"};
|
|
||||||
|
|
||||||
inline const char* get_rb_name(uint32_t lcid) {
|
|
||||||
if (lcid < RB_ID_MAX) {
|
|
||||||
return rb_id_str[lcid];
|
|
||||||
} else {
|
|
||||||
return "INVALID_RB";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Byte and Bit buffers
|
* Byte and Bit buffers
|
||||||
*
|
*
|
||||||
|
|
|
@ -174,6 +174,7 @@ public:
|
||||||
virtual void enable_capabilities() = 0;
|
virtual void enable_capabilities() = 0;
|
||||||
virtual void plmn_search() = 0;
|
virtual void plmn_search() = 0;
|
||||||
virtual void plmn_select(LIBLTE_RRC_PLMN_IDENTITY_STRUCT plmn_id) = 0;
|
virtual void plmn_select(LIBLTE_RRC_PLMN_IDENTITY_STRUCT plmn_id) = 0;
|
||||||
|
virtual std::string get_rb_name(uint32_t lcid) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
// RRC interface for PDCP
|
// RRC interface for PDCP
|
||||||
|
@ -184,6 +185,7 @@ public:
|
||||||
virtual void write_pdu_bcch_bch(srslte::byte_buffer_t *pdu) = 0;
|
virtual void write_pdu_bcch_bch(srslte::byte_buffer_t *pdu) = 0;
|
||||||
virtual void write_pdu_bcch_dlsch(srslte::byte_buffer_t *pdu) = 0;
|
virtual void write_pdu_bcch_dlsch(srslte::byte_buffer_t *pdu) = 0;
|
||||||
virtual void write_pdu_pcch(srslte::byte_buffer_t *pdu) = 0;
|
virtual void write_pdu_pcch(srslte::byte_buffer_t *pdu) = 0;
|
||||||
|
virtual std::string get_rb_name(uint32_t lcid) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
// RRC interface for RLC
|
// RRC interface for RLC
|
||||||
|
@ -191,6 +193,7 @@ class rrc_interface_rlc
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void max_retx_attempted() = 0;
|
virtual void max_retx_attempted() = 0;
|
||||||
|
virtual std::string get_rb_name(uint32_t lcid) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
// PDCP interface for GW
|
// PDCP interface for GW
|
||||||
|
|
|
@ -100,9 +100,9 @@ void pdcp::add_bearer(uint32_t lcid, srslte_pdcp_config_t cfg)
|
||||||
}
|
}
|
||||||
if (!pdcp_array[lcid].is_active()) {
|
if (!pdcp_array[lcid].is_active()) {
|
||||||
pdcp_array[lcid].init(rlc, rrc, gw, pdcp_log, lcid, cfg);
|
pdcp_array[lcid].init(rlc, rrc, gw, pdcp_log, lcid, cfg);
|
||||||
pdcp_log->info("Added bearer %s\n", get_rb_name(lcid));
|
pdcp_log->info("Added bearer %s\n", rrc->get_rb_name(lcid).c_str());
|
||||||
} else {
|
} else {
|
||||||
pdcp_log->warning("Bearer %s already configured. Reconfiguration not supported\n", get_rb_name(lcid));
|
pdcp_log->warning("Bearer %s already configured. Reconfiguration not supported\n", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ void pdcp_entity::init(srsue::rlc_interface_pdcp *rlc_,
|
||||||
|
|
||||||
start(PDCP_THREAD_PRIO);
|
start(PDCP_THREAD_PRIO);
|
||||||
|
|
||||||
log->debug("Init %s\n", get_rb_name(lcid));
|
log->debug("Init %s\n", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
void pdcp_entity::stop()
|
void pdcp_entity::stop()
|
||||||
|
@ -94,7 +94,7 @@ void pdcp_entity::reset()
|
||||||
{
|
{
|
||||||
active = false;
|
active = false;
|
||||||
if(log)
|
if(log)
|
||||||
log->debug("Reset %s\n", get_rb_name(lcid));
|
log->debug("Reset %s\n", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool pdcp_entity::is_active()
|
bool pdcp_entity::is_active()
|
||||||
|
@ -107,7 +107,7 @@ void pdcp_entity::write_sdu(byte_buffer_t *sdu)
|
||||||
{
|
{
|
||||||
log->info_hex(sdu->msg, sdu->N_bytes,
|
log->info_hex(sdu->msg, sdu->N_bytes,
|
||||||
"TX %s SDU, SN: %d, do_integrity = %s, do_encryption = %s",
|
"TX %s SDU, SN: %d, do_integrity = %s, do_encryption = %s",
|
||||||
get_rb_name(lcid), tx_count,
|
rrc->get_rb_name(lcid).c_str(), tx_count,
|
||||||
(do_integrity) ? "true" : "false", (do_encryption) ? "true" : "false");
|
(do_integrity) ? "true" : "false", (do_encryption) ? "true" : "false");
|
||||||
|
|
||||||
if (cfg.is_control) {
|
if (cfg.is_control) {
|
||||||
|
@ -131,7 +131,7 @@ void pdcp_entity::write_sdu(byte_buffer_t *sdu)
|
||||||
cipher_encrypt(&sdu->msg[sn_len_bytes],
|
cipher_encrypt(&sdu->msg[sn_len_bytes],
|
||||||
sdu->N_bytes-sn_len_bytes,
|
sdu->N_bytes-sn_len_bytes,
|
||||||
&sdu->msg[sn_len_bytes]);
|
&sdu->msg[sn_len_bytes]);
|
||||||
log->info_hex(sdu->msg, sdu->N_bytes, "TX %s SDU (encrypted)", get_rb_name(lcid));
|
log->info_hex(sdu->msg, sdu->N_bytes, "TX %s SDU (encrypted)", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
tx_count++;
|
tx_count++;
|
||||||
|
|
||||||
|
@ -340,7 +340,7 @@ void pdcp_entity::run_thread()
|
||||||
while(running) {
|
while(running) {
|
||||||
rx_pdu_queue.read(&pdu);
|
rx_pdu_queue.read(&pdu);
|
||||||
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU, do_integrity = %s, do_encryption = %s",
|
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU, do_integrity = %s, do_encryption = %s",
|
||||||
get_rb_name(lcid), (do_integrity) ? "true" : "false", (do_encryption) ? "true" : "false");
|
rrc->get_rb_name(lcid).c_str(), (do_integrity) ? "true" : "false", (do_encryption) ? "true" : "false");
|
||||||
|
|
||||||
// Handle DRB messages
|
// Handle DRB messages
|
||||||
if (cfg.is_data) {
|
if (cfg.is_data) {
|
||||||
|
@ -350,7 +350,7 @@ void pdcp_entity::run_thread()
|
||||||
rx_count,
|
rx_count,
|
||||||
pdu->N_bytes - sn_len_bytes,
|
pdu->N_bytes - sn_len_bytes,
|
||||||
&(pdu->msg[sn_len_bytes]));
|
&(pdu->msg[sn_len_bytes]));
|
||||||
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", get_rb_name(lcid));
|
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
if(12 == cfg.sn_len)
|
if(12 == cfg.sn_len)
|
||||||
{
|
{
|
||||||
|
@ -358,7 +358,7 @@ void pdcp_entity::run_thread()
|
||||||
} else {
|
} else {
|
||||||
pdcp_unpack_data_pdu_short_sn(pdu, &sn);
|
pdcp_unpack_data_pdu_short_sn(pdu, &sn);
|
||||||
}
|
}
|
||||||
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU SN: %d", get_rb_name(lcid), sn);
|
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU SN: %d", rrc->get_rb_name(lcid).c_str(), sn);
|
||||||
gw->write_pdu(lcid, pdu);
|
gw->write_pdu(lcid, pdu);
|
||||||
} else {
|
} else {
|
||||||
// Handle SRB messages
|
// Handle SRB messages
|
||||||
|
@ -369,7 +369,7 @@ void pdcp_entity::run_thread()
|
||||||
rx_count,
|
rx_count,
|
||||||
pdu->N_bytes - sn_len_bytes,
|
pdu->N_bytes - sn_len_bytes,
|
||||||
&(pdu->msg[sn_len_bytes]));
|
&(pdu->msg[sn_len_bytes]));
|
||||||
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", get_rb_name(lcid));
|
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU (decrypted)", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (do_integrity) {
|
if (do_integrity) {
|
||||||
|
@ -380,7 +380,7 @@ void pdcp_entity::run_thread()
|
||||||
}
|
}
|
||||||
|
|
||||||
pdcp_unpack_control_pdu(pdu, &sn);
|
pdcp_unpack_control_pdu(pdu, &sn);
|
||||||
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU SN: %d", get_rb_name(lcid), sn);
|
log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU SN: %d", rrc->get_rb_name(lcid).c_str(), sn);
|
||||||
}
|
}
|
||||||
// pass to RRC
|
// pass to RRC
|
||||||
rrc->write_pdu(lcid, pdu);
|
rrc->write_pdu(lcid, pdu);
|
||||||
|
|
|
@ -224,10 +224,10 @@ void rlc::add_bearer(uint32_t lcid)
|
||||||
cnfg.dl_am_rlc.t_status_prohibit = LIBLTE_RRC_T_STATUS_PROHIBIT_MS0;
|
cnfg.dl_am_rlc.t_status_prohibit = LIBLTE_RRC_T_STATUS_PROHIBIT_MS0;
|
||||||
add_bearer(lcid, srslte_rlc_config_t(&cnfg));
|
add_bearer(lcid, srslte_rlc_config_t(&cnfg));
|
||||||
} else {
|
} else {
|
||||||
rlc_log->warning("Bearer %s already configured. Reconfiguration not supported\n", get_rb_name(lcid));
|
rlc_log->warning("Bearer %s already configured. Reconfiguration not supported\n", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
rlc_log->error("Radio bearer %s does not support default RLC configuration.\n", get_rb_name(lcid));
|
rlc_log->error("Radio bearer %s does not support default RLC configuration.\n", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -240,7 +240,7 @@ void rlc::add_bearer(uint32_t lcid, srslte_rlc_config_t cnfg)
|
||||||
|
|
||||||
if (!rlc_array[lcid].active()) {
|
if (!rlc_array[lcid].active()) {
|
||||||
rlc_log->info("Adding radio bearer %s with mode %s\n",
|
rlc_log->info("Adding radio bearer %s with mode %s\n",
|
||||||
get_rb_name(lcid), liblte_rrc_rlc_mode_text[cnfg.rlc_mode]);
|
rrc->get_rb_name(lcid).c_str(), liblte_rrc_rlc_mode_text[cnfg.rlc_mode]);
|
||||||
switch(cnfg.rlc_mode)
|
switch(cnfg.rlc_mode)
|
||||||
{
|
{
|
||||||
case LIBLTE_RRC_RLC_MODE_AM:
|
case LIBLTE_RRC_RLC_MODE_AM:
|
||||||
|
@ -260,7 +260,7 @@ void rlc::add_bearer(uint32_t lcid, srslte_rlc_config_t cnfg)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
rlc_log->warning("Bearer %s already created.\n", get_rb_name(lcid));
|
rlc_log->warning("Bearer %s already created.\n", rrc->get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
rlc_array[lcid].configure(cnfg);
|
rlc_array[lcid].configure(cnfg);
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ void rlc_am::configure(srslte_rlc_config_t cfg_)
|
||||||
cfg = cfg_.am;
|
cfg = cfg_.am;
|
||||||
log->info("%s configured: t_poll_retx=%d, poll_pdu=%d, poll_byte=%d, max_retx_thresh=%d, "
|
log->info("%s configured: t_poll_retx=%d, poll_pdu=%d, poll_byte=%d, max_retx_thresh=%d, "
|
||||||
"t_reordering=%d, t_status_prohibit=%d\n",
|
"t_reordering=%d, t_status_prohibit=%d\n",
|
||||||
get_rb_name(lcid), cfg.t_poll_retx, cfg.poll_pdu, cfg.poll_byte, cfg.max_retx_thresh,
|
rrc->get_rb_name(lcid).c_str(), cfg.t_poll_retx, cfg.poll_pdu, cfg.poll_byte, cfg.max_retx_thresh,
|
||||||
cfg.t_reordering, cfg.t_status_prohibit);
|
cfg.t_reordering, cfg.t_status_prohibit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ uint32_t rlc_am::get_bearer()
|
||||||
|
|
||||||
void rlc_am::write_sdu(byte_buffer_t *sdu)
|
void rlc_am::write_sdu(byte_buffer_t *sdu)
|
||||||
{
|
{
|
||||||
log->info_hex(sdu->msg, sdu->N_bytes, "%s Tx SDU", get_rb_name(lcid));
|
log->info_hex(sdu->msg, sdu->N_bytes, "%s Tx SDU", rrc->get_rb_name(lcid).c_str());
|
||||||
tx_sdu_queue.write(sdu);
|
tx_sdu_queue.write(sdu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -359,7 +359,7 @@ void rlc_am::check_reordering_timeout()
|
||||||
if(reordering_timeout.is_running() && reordering_timeout.expired())
|
if(reordering_timeout.is_running() && reordering_timeout.expired())
|
||||||
{
|
{
|
||||||
reordering_timeout.reset();
|
reordering_timeout.reset();
|
||||||
log->debug("%s reordering timeout expiry - updating vr_ms\n", get_rb_name(lcid));
|
log->debug("%s reordering timeout expiry - updating vr_ms\n", rrc->get_rb_name(lcid).c_str());
|
||||||
|
|
||||||
// 36.322 v10 Section 5.1.3.2.4
|
// 36.322 v10 Section 5.1.3.2.4
|
||||||
vr_ms = vr_x;
|
vr_ms = vr_x;
|
||||||
|
@ -433,7 +433,7 @@ int rlc_am::build_status_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
if(pdu_len > 0 && nof_bytes >= (uint32_t)pdu_len)
|
if(pdu_len > 0 && nof_bytes >= (uint32_t)pdu_len)
|
||||||
{
|
{
|
||||||
log->info("%s Tx status PDU - %s\n",
|
log->info("%s Tx status PDU - %s\n",
|
||||||
get_rb_name(lcid), rlc_am_to_string(&status).c_str());
|
rrc->get_rb_name(lcid).c_str(), rlc_am_to_string(&status).c_str());
|
||||||
|
|
||||||
do_status = false;
|
do_status = false;
|
||||||
poll_received = false;
|
poll_received = false;
|
||||||
|
@ -444,7 +444,7 @@ int rlc_am::build_status_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
return rlc_am_write_status_pdu(&status, payload);
|
return rlc_am_write_status_pdu(&status, payload);
|
||||||
}else{
|
}else{
|
||||||
log->warning("%s Cannot tx status PDU - %d bytes available, %d bytes required\n",
|
log->warning("%s Cannot tx status PDU - %d bytes available, %d bytes required\n",
|
||||||
get_rb_name(lcid), nof_bytes, pdu_len);
|
rrc->get_rb_name(lcid).c_str(), nof_bytes, pdu_len);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -478,7 +478,7 @@ int rlc_am::build_retx_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if(retx.is_segment || req_size > (int)nof_bytes) {
|
if(retx.is_segment || req_size > (int)nof_bytes) {
|
||||||
log->debug("%s build_retx_pdu - resegmentation required\n", get_rb_name(lcid));
|
log->debug("%s build_retx_pdu - resegmentation required\n", rrc->get_rb_name(lcid).c_str());
|
||||||
return build_segment(payload, nof_bytes, retx);
|
return build_segment(payload, nof_bytes, retx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -503,7 +503,7 @@ int rlc_am::build_retx_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
if(tx_window[retx.sn].retx_count >= cfg.max_retx_thresh)
|
if(tx_window[retx.sn].retx_count >= cfg.max_retx_thresh)
|
||||||
rrc->max_retx_attempted();
|
rrc->max_retx_attempted();
|
||||||
log->info("%s Retx PDU scheduled for tx. SN: %d, retx count: %d\n",
|
log->info("%s Retx PDU scheduled for tx. SN: %d, retx count: %d\n",
|
||||||
get_rb_name(lcid), retx.sn, tx_window[retx.sn].retx_count);
|
rrc->get_rb_name(lcid).c_str(), retx.sn, tx_window[retx.sn].retx_count);
|
||||||
|
|
||||||
debug_state();
|
debug_state();
|
||||||
return (ptr-payload) + tx_window[retx.sn].buf->N_bytes;
|
return (ptr-payload) + tx_window[retx.sn].buf->N_bytes;
|
||||||
|
@ -540,7 +540,7 @@ int rlc_am::build_segment(uint8_t *payload, uint32_t nof_bytes, rlc_amd_retx_t r
|
||||||
if(nof_bytes <= head_len)
|
if(nof_bytes <= head_len)
|
||||||
{
|
{
|
||||||
log->warning("%s Cannot build a PDU segment - %d bytes available, %d bytes required for header\n",
|
log->warning("%s Cannot build a PDU segment - %d bytes available, %d bytes required for header\n",
|
||||||
get_rb_name(lcid), nof_bytes, head_len);
|
rrc->get_rb_name(lcid).c_str(), nof_bytes, head_len);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
pdu_space = nof_bytes-head_len;
|
pdu_space = nof_bytes-head_len;
|
||||||
|
@ -606,15 +606,15 @@ int rlc_am::build_segment(uint8_t *payload, uint32_t nof_bytes, rlc_amd_retx_t r
|
||||||
memcpy(ptr, data, len);
|
memcpy(ptr, data, len);
|
||||||
|
|
||||||
log->info("%s Retx PDU segment scheduled for tx. SN: %d, SO: %d\n",
|
log->info("%s Retx PDU segment scheduled for tx. SN: %d, SO: %d\n",
|
||||||
get_rb_name(lcid), retx.sn, retx.so_start);
|
rrc->get_rb_name(lcid).c_str(), retx.sn, retx.so_start);
|
||||||
|
|
||||||
debug_state();
|
debug_state();
|
||||||
int pdu_len = (ptr-payload) + len;
|
int pdu_len = (ptr-payload) + len;
|
||||||
if(pdu_len > (int)nof_bytes) {
|
if(pdu_len > (int)nof_bytes) {
|
||||||
log->error("%s Retx PDU segment length error. Available: %d, Used: %d\n",
|
log->error("%s Retx PDU segment length error. Available: %d, Used: %d\n",
|
||||||
get_rb_name(lcid), nof_bytes, pdu_len);
|
rrc->get_rb_name(lcid).c_str(), nof_bytes, pdu_len);
|
||||||
log->debug("%s Retx PDU segment length error. Header len: %d, Payload len: %d, N_li: %d\n",
|
log->debug("%s Retx PDU segment length error. Header len: %d, Payload len: %d, N_li: %d\n",
|
||||||
get_rb_name(lcid), (ptr-payload), len, new_header.N_li);
|
rrc->get_rb_name(lcid).c_str(), (ptr-payload), len, new_header.N_li);
|
||||||
}
|
}
|
||||||
return pdu_len;
|
return pdu_len;
|
||||||
|
|
||||||
|
@ -662,13 +662,13 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
if(pdu_space <= head_len + 1)
|
if(pdu_space <= head_len + 1)
|
||||||
{
|
{
|
||||||
log->warning("%s Cannot build a PDU - %d bytes available, %d bytes required for header\n",
|
log->warning("%s Cannot build a PDU - %d bytes available, %d bytes required for header\n",
|
||||||
get_rb_name(lcid), nof_bytes, head_len);
|
rrc->get_rb_name(lcid).c_str(), nof_bytes, head_len);
|
||||||
pool->deallocate(pdu);
|
pool->deallocate(pdu);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
log->debug("%s Building PDU - pdu_space: %d, head_len: %d \n",
|
log->debug("%s Building PDU - pdu_space: %d, head_len: %d \n",
|
||||||
get_rb_name(lcid), pdu_space, head_len);
|
rrc->get_rb_name(lcid).c_str(), pdu_space, head_len);
|
||||||
|
|
||||||
// Check for SDU segment
|
// Check for SDU segment
|
||||||
if(tx_sdu)
|
if(tx_sdu)
|
||||||
|
@ -683,7 +683,7 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
if(tx_sdu->N_bytes == 0)
|
if(tx_sdu->N_bytes == 0)
|
||||||
{
|
{
|
||||||
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
||||||
get_rb_name(lcid), tx_sdu->get_latency_us());
|
rrc->get_rb_name(lcid).c_str(), tx_sdu->get_latency_us());
|
||||||
pool->deallocate(tx_sdu);
|
pool->deallocate(tx_sdu);
|
||||||
tx_sdu = NULL;
|
tx_sdu = NULL;
|
||||||
}
|
}
|
||||||
|
@ -694,7 +694,7 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
header.fi |= RLC_FI_FIELD_NOT_START_ALIGNED; // First byte does not correspond to first byte of SDU
|
header.fi |= RLC_FI_FIELD_NOT_START_ALIGNED; // First byte does not correspond to first byte of SDU
|
||||||
|
|
||||||
log->debug("%s Building PDU - added SDU segment (len:%d) - pdu_space: %d, head_len: %d \n",
|
log->debug("%s Building PDU - added SDU segment (len:%d) - pdu_space: %d, head_len: %d \n",
|
||||||
get_rb_name(lcid), to_move, pdu_space, head_len);
|
rrc->get_rb_name(lcid).c_str(), to_move, pdu_space, head_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Pull SDUs from queue
|
// Pull SDUs from queue
|
||||||
|
@ -718,7 +718,7 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
if(tx_sdu->N_bytes == 0)
|
if(tx_sdu->N_bytes == 0)
|
||||||
{
|
{
|
||||||
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
||||||
get_rb_name(lcid), tx_sdu->get_latency_us());
|
rrc->get_rb_name(lcid).c_str(), tx_sdu->get_latency_us());
|
||||||
pool->deallocate(tx_sdu);
|
pool->deallocate(tx_sdu);
|
||||||
tx_sdu = NULL;
|
tx_sdu = NULL;
|
||||||
}
|
}
|
||||||
|
@ -728,7 +728,7 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
pdu_space = 0;
|
pdu_space = 0;
|
||||||
|
|
||||||
log->debug("%s Building PDU - added SDU segment (len:%d) - pdu_space: %d, head_len: %d \n",
|
log->debug("%s Building PDU - added SDU segment (len:%d) - pdu_space: %d, head_len: %d \n",
|
||||||
get_rb_name(lcid), to_move, pdu_space, head_len);
|
rrc->get_rb_name(lcid).c_str(), to_move, pdu_space, head_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(tx_sdu)
|
if(tx_sdu)
|
||||||
|
@ -737,11 +737,11 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
// Set Poll bit
|
// Set Poll bit
|
||||||
pdu_without_poll++;
|
pdu_without_poll++;
|
||||||
byte_without_poll += (pdu->N_bytes + head_len);
|
byte_without_poll += (pdu->N_bytes + head_len);
|
||||||
log->debug("%s pdu_without_poll: %d\n", get_rb_name(lcid), pdu_without_poll);
|
log->debug("%s pdu_without_poll: %d\n", rrc->get_rb_name(lcid).c_str(), pdu_without_poll);
|
||||||
log->debug("%s byte_without_poll: %d\n", get_rb_name(lcid), byte_without_poll);
|
log->debug("%s byte_without_poll: %d\n", rrc->get_rb_name(lcid).c_str(), byte_without_poll);
|
||||||
if(poll_required())
|
if(poll_required())
|
||||||
{
|
{
|
||||||
log->debug("%s setting poll bit to request status\n", get_rb_name(lcid));
|
log->debug("%s setting poll bit to request status\n", rrc->get_rb_name(lcid).c_str());
|
||||||
header.p = 1;
|
header.p = 1;
|
||||||
poll_sn = vt_s;
|
poll_sn = vt_s;
|
||||||
pdu_without_poll = 0;
|
pdu_without_poll = 0;
|
||||||
|
@ -752,7 +752,7 @@ int rlc_am::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
// Set SN
|
// Set SN
|
||||||
header.sn = vt_s;
|
header.sn = vt_s;
|
||||||
vt_s = (vt_s + 1)%MOD;
|
vt_s = (vt_s + 1)%MOD;
|
||||||
log->info("%s PDU scheduled for tx. SN: %d\n", get_rb_name(lcid), header.sn);
|
log->info("%s PDU scheduled for tx. SN: %d\n", rrc->get_rb_name(lcid).c_str(), header.sn);
|
||||||
|
|
||||||
// Place PDU in tx_window, write header and TX
|
// Place PDU in tx_window, write header and TX
|
||||||
tx_window[header.sn].buf = pdu;
|
tx_window[header.sn].buf = pdu;
|
||||||
|
@ -773,26 +773,26 @@ void rlc_am::handle_data_pdu(uint8_t *payload, uint32_t nof_bytes, rlc_amd_pdu_h
|
||||||
std::map<uint32_t, rlc_amd_rx_pdu_t>::iterator it;
|
std::map<uint32_t, rlc_amd_rx_pdu_t>::iterator it;
|
||||||
|
|
||||||
log->info_hex(payload, nof_bytes, "%s Rx data PDU SN: %d",
|
log->info_hex(payload, nof_bytes, "%s Rx data PDU SN: %d",
|
||||||
get_rb_name(lcid), header.sn);
|
rrc->get_rb_name(lcid).c_str(), header.sn);
|
||||||
|
|
||||||
if(!inside_rx_window(header.sn)) {
|
if(!inside_rx_window(header.sn)) {
|
||||||
if(header.p) {
|
if(header.p) {
|
||||||
log->info("%s Status packet requested through polling bit\n", get_rb_name(lcid));
|
log->info("%s Status packet requested through polling bit\n", rrc->get_rb_name(lcid).c_str());
|
||||||
do_status = true;
|
do_status = true;
|
||||||
}
|
}
|
||||||
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n",
|
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n",
|
||||||
get_rb_name(lcid), header.sn, vr_r, vr_mr);
|
rrc->get_rb_name(lcid).c_str(), header.sn, vr_r, vr_mr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
it = rx_window.find(header.sn);
|
it = rx_window.find(header.sn);
|
||||||
if(rx_window.end() != it) {
|
if(rx_window.end() != it) {
|
||||||
if(header.p) {
|
if(header.p) {
|
||||||
log->info("%s Status packet requested through polling bit\n", get_rb_name(lcid));
|
log->info("%s Status packet requested through polling bit\n", rrc->get_rb_name(lcid).c_str());
|
||||||
do_status = true;
|
do_status = true;
|
||||||
}
|
}
|
||||||
log->info("%s Discarding duplicate SN: %d\n",
|
log->info("%s Discarding duplicate SN: %d\n",
|
||||||
get_rb_name(lcid), header.sn);
|
rrc->get_rb_name(lcid).c_str(), header.sn);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -825,7 +825,7 @@ void rlc_am::handle_data_pdu(uint8_t *payload, uint32_t nof_bytes, rlc_amd_pdu_h
|
||||||
// Check poll bit
|
// Check poll bit
|
||||||
if(header.p)
|
if(header.p)
|
||||||
{
|
{
|
||||||
log->info("%s Status packet requested through polling bit\n", get_rb_name(lcid));
|
log->info("%s Status packet requested through polling bit\n", rrc->get_rb_name(lcid).c_str());
|
||||||
poll_received = true;
|
poll_received = true;
|
||||||
|
|
||||||
// 36.322 v10 Section 5.2.3
|
// 36.322 v10 Section 5.2.3
|
||||||
|
@ -870,16 +870,16 @@ void rlc_am::handle_data_pdu_segment(uint8_t *payload, uint32_t nof_bytes, rlc_a
|
||||||
std::map<uint32_t, rlc_amd_rx_pdu_segments_t>::iterator it;
|
std::map<uint32_t, rlc_amd_rx_pdu_segments_t>::iterator it;
|
||||||
|
|
||||||
log->info_hex(payload, nof_bytes, "%s Rx data PDU segment. SN: %d, SO: %d",
|
log->info_hex(payload, nof_bytes, "%s Rx data PDU segment. SN: %d, SO: %d",
|
||||||
get_rb_name(lcid), header.sn, header.so);
|
rrc->get_rb_name(lcid).c_str(), header.sn, header.so);
|
||||||
|
|
||||||
// Check inside rx window
|
// Check inside rx window
|
||||||
if(!inside_rx_window(header.sn)) {
|
if(!inside_rx_window(header.sn)) {
|
||||||
if(header.p) {
|
if(header.p) {
|
||||||
log->info("%s Status packet requested through polling bit\n", get_rb_name(lcid));
|
log->info("%s Status packet requested through polling bit\n", rrc->get_rb_name(lcid).c_str());
|
||||||
do_status = true;
|
do_status = true;
|
||||||
}
|
}
|
||||||
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n",
|
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n",
|
||||||
get_rb_name(lcid), header.sn, vr_r, vr_mr);
|
rrc->get_rb_name(lcid).c_str(), header.sn, vr_r, vr_mr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -898,7 +898,7 @@ void rlc_am::handle_data_pdu_segment(uint8_t *payload, uint32_t nof_bytes, rlc_a
|
||||||
if(rx_segments.end() != it) {
|
if(rx_segments.end() != it) {
|
||||||
|
|
||||||
if(header.p) {
|
if(header.p) {
|
||||||
log->info("%s Status packet requested through polling bit\n", get_rb_name(lcid));
|
log->info("%s Status packet requested through polling bit\n", rrc->get_rb_name(lcid).c_str());
|
||||||
do_status = true;
|
do_status = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -928,7 +928,7 @@ void rlc_am::handle_data_pdu_segment(uint8_t *payload, uint32_t nof_bytes, rlc_a
|
||||||
// Check poll bit
|
// Check poll bit
|
||||||
if(header.p)
|
if(header.p)
|
||||||
{
|
{
|
||||||
log->info("%s Status packet requested through polling bit\n", get_rb_name(lcid));
|
log->info("%s Status packet requested through polling bit\n", rrc->get_rb_name(lcid).c_str());
|
||||||
poll_received = true;
|
poll_received = true;
|
||||||
|
|
||||||
// 36.322 v10 Section 5.2.3
|
// 36.322 v10 Section 5.2.3
|
||||||
|
@ -946,12 +946,12 @@ void rlc_am::handle_data_pdu_segment(uint8_t *payload, uint32_t nof_bytes, rlc_a
|
||||||
|
|
||||||
void rlc_am::handle_control_pdu(uint8_t *payload, uint32_t nof_bytes)
|
void rlc_am::handle_control_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
{
|
{
|
||||||
log->info_hex(payload, nof_bytes, "%s Rx control PDU", get_rb_name(lcid));
|
log->info_hex(payload, nof_bytes, "%s Rx control PDU", rrc->get_rb_name(lcid).c_str());
|
||||||
|
|
||||||
rlc_status_pdu_t status;
|
rlc_status_pdu_t status;
|
||||||
rlc_am_read_status_pdu(payload, nof_bytes, &status);
|
rlc_am_read_status_pdu(payload, nof_bytes, &status);
|
||||||
|
|
||||||
log->info("%s Rx Status PDU: %s\n", get_rb_name(lcid), rlc_am_to_string(&status).c_str());
|
log->info("%s Rx Status PDU: %s\n", rrc->get_rb_name(lcid).c_str(), rlc_am_to_string(&status).c_str());
|
||||||
|
|
||||||
poll_retx_timeout.reset();
|
poll_retx_timeout.reset();
|
||||||
|
|
||||||
|
@ -989,7 +989,7 @@ void rlc_am::handle_control_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log->warning("%s invalid segment NACK received for SN %d. so_start: %d, so_end: %d, N_bytes: %d\n",
|
log->warning("%s invalid segment NACK received for SN %d. so_start: %d, so_end: %d, N_bytes: %d\n",
|
||||||
get_rb_name(lcid), i, status.nacks[j].so_start, status.nacks[j].so_end, it->second.buf->N_bytes);
|
rrc->get_rb_name(lcid).c_str(), i, status.nacks[j].so_start, status.nacks[j].so_end, it->second.buf->N_bytes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1043,7 +1043,7 @@ void rlc_am::reassemble_rx_sdus()
|
||||||
rx_sdu->N_bytes += len;
|
rx_sdu->N_bytes += len;
|
||||||
rx_window[vr_r].buf->msg += len;
|
rx_window[vr_r].buf->msg += len;
|
||||||
rx_window[vr_r].buf->N_bytes -= len;
|
rx_window[vr_r].buf->N_bytes -= len;
|
||||||
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU", get_rb_name(lcid));
|
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU", rrc->get_rb_name(lcid).c_str());
|
||||||
rx_sdu->set_timestamp();
|
rx_sdu->set_timestamp();
|
||||||
pdcp->write_pdu(lcid, rx_sdu);
|
pdcp->write_pdu(lcid, rx_sdu);
|
||||||
rx_sdu = pool_allocate;
|
rx_sdu = pool_allocate;
|
||||||
|
@ -1059,7 +1059,7 @@ void rlc_am::reassemble_rx_sdus()
|
||||||
rx_sdu->N_bytes += rx_window[vr_r].buf->N_bytes;
|
rx_sdu->N_bytes += rx_window[vr_r].buf->N_bytes;
|
||||||
if(rlc_am_end_aligned(rx_window[vr_r].header.fi))
|
if(rlc_am_end_aligned(rx_window[vr_r].header.fi))
|
||||||
{
|
{
|
||||||
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU", get_rb_name(lcid));
|
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU", rrc->get_rb_name(lcid).c_str());
|
||||||
rx_sdu->set_timestamp();
|
rx_sdu->set_timestamp();
|
||||||
pdcp->write_pdu(lcid, rx_sdu);
|
pdcp->write_pdu(lcid, rx_sdu);
|
||||||
rx_sdu = pool_allocate;
|
rx_sdu = pool_allocate;
|
||||||
|
@ -1103,7 +1103,7 @@ void rlc_am::debug_state()
|
||||||
{
|
{
|
||||||
log->debug("%s vt_a = %d, vt_ms = %d, vt_s = %d, poll_sn = %d "
|
log->debug("%s vt_a = %d, vt_ms = %d, vt_s = %d, poll_sn = %d "
|
||||||
"vr_r = %d, vr_mr = %d, vr_x = %d, vr_ms = %d, vr_h = %d\n",
|
"vr_r = %d, vr_mr = %d, vr_x = %d, vr_ms = %d, vr_h = %d\n",
|
||||||
get_rb_name(lcid), vt_a, vt_ms, vt_s, poll_sn,
|
rrc->get_rb_name(lcid).c_str(), vt_a, vt_ms, vt_s, poll_sn,
|
||||||
vr_r, vr_mr, vr_x, vr_ms, vr_h);
|
vr_r, vr_mr, vr_x, vr_ms, vr_h);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,7 +84,7 @@ uint32_t rlc_tm::get_bearer()
|
||||||
// PDCP interface
|
// PDCP interface
|
||||||
void rlc_tm::write_sdu(byte_buffer_t *sdu)
|
void rlc_tm::write_sdu(byte_buffer_t *sdu)
|
||||||
{
|
{
|
||||||
log->info_hex(sdu->msg, sdu->N_bytes, "%s Tx SDU", get_rb_name(lcid));
|
log->info_hex(sdu->msg, sdu->N_bytes, "%s Tx SDU", rrc->get_rb_name(lcid).c_str());
|
||||||
ul_queue.write(sdu);
|
ul_queue.write(sdu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ int rlc_tm::read_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
uint32_t pdu_size = ul_queue.size_tail_bytes();
|
uint32_t pdu_size = ul_queue.size_tail_bytes();
|
||||||
if(pdu_size > nof_bytes)
|
if(pdu_size > nof_bytes)
|
||||||
{
|
{
|
||||||
log->error("TX %s PDU size larger than MAC opportunity\n", get_rb_name(lcid));
|
log->error("TX %s PDU size larger than MAC opportunity\n", rrc->get_rb_name(lcid).c_str());
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
byte_buffer_t *buf;
|
byte_buffer_t *buf;
|
||||||
|
@ -112,9 +112,9 @@ int rlc_tm::read_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
pdu_size = buf->N_bytes;
|
pdu_size = buf->N_bytes;
|
||||||
memcpy(payload, buf->msg, buf->N_bytes);
|
memcpy(payload, buf->msg, buf->N_bytes);
|
||||||
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
||||||
get_rb_name(lcid), buf->get_latency_us());
|
rrc->get_rb_name(lcid).c_str(), buf->get_latency_us());
|
||||||
pool->deallocate(buf);
|
pool->deallocate(buf);
|
||||||
log->info_hex(payload, pdu_size, "TX %s, %s PDU", get_rb_name(lcid), rlc_mode_text[RLC_MODE_TM]);
|
log->info_hex(payload, pdu_size, "TX %s, %s PDU", rrc->get_rb_name(lcid).c_str(), rlc_mode_text[RLC_MODE_TM]);
|
||||||
return pdu_size;
|
return pdu_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -75,18 +75,18 @@ void rlc_um::configure(srslte_rlc_config_t cnfg_)
|
||||||
case LIBLTE_RRC_RLC_MODE_UM_BI:
|
case LIBLTE_RRC_RLC_MODE_UM_BI:
|
||||||
log->info("%s configured in %s mode: "
|
log->info("%s configured in %s mode: "
|
||||||
"t_reordering=%d ms, rx_sn_field_length=%u bits, tx_sn_field_length=%u bits\n",
|
"t_reordering=%d ms, rx_sn_field_length=%u bits, tx_sn_field_length=%u bits\n",
|
||||||
get_rb_name(lcid), liblte_rrc_rlc_mode_text[cnfg_.rlc_mode],
|
rrc->get_rb_name(lcid).c_str(), liblte_rrc_rlc_mode_text[cnfg_.rlc_mode],
|
||||||
cfg.t_reordering, rlc_umd_sn_size_num[cfg.rx_sn_field_length], rlc_umd_sn_size_num[cfg.rx_sn_field_length]);
|
cfg.t_reordering, rlc_umd_sn_size_num[cfg.rx_sn_field_length], rlc_umd_sn_size_num[cfg.rx_sn_field_length]);
|
||||||
break;
|
break;
|
||||||
case LIBLTE_RRC_RLC_MODE_UM_UNI_UL:
|
case LIBLTE_RRC_RLC_MODE_UM_UNI_UL:
|
||||||
log->info("%s configured in %s mode: tx_sn_field_length=%u bits\n",
|
log->info("%s configured in %s mode: tx_sn_field_length=%u bits\n",
|
||||||
get_rb_name(lcid), liblte_rrc_rlc_mode_text[cnfg_.rlc_mode],
|
rrc->get_rb_name(lcid).c_str(), liblte_rrc_rlc_mode_text[cnfg_.rlc_mode],
|
||||||
rlc_umd_sn_size_num[cfg.rx_sn_field_length]);
|
rlc_umd_sn_size_num[cfg.rx_sn_field_length]);
|
||||||
break;
|
break;
|
||||||
case LIBLTE_RRC_RLC_MODE_UM_UNI_DL:
|
case LIBLTE_RRC_RLC_MODE_UM_UNI_DL:
|
||||||
log->info("%s configured in %s mode: "
|
log->info("%s configured in %s mode: "
|
||||||
"t_reordering=%d ms, rx_sn_field_length=%u bits\n",
|
"t_reordering=%d ms, rx_sn_field_length=%u bits\n",
|
||||||
get_rb_name(lcid), liblte_rrc_rlc_mode_text[cnfg_.rlc_mode],
|
rrc->get_rb_name(lcid).c_str(), liblte_rrc_rlc_mode_text[cnfg_.rlc_mode],
|
||||||
cfg.t_reordering, rlc_umd_sn_size_num[cfg.rx_sn_field_length]);
|
cfg.t_reordering, rlc_umd_sn_size_num[cfg.rx_sn_field_length]);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -153,7 +153,7 @@ uint32_t rlc_um::get_bearer()
|
||||||
|
|
||||||
void rlc_um::write_sdu(byte_buffer_t *sdu)
|
void rlc_um::write_sdu(byte_buffer_t *sdu)
|
||||||
{
|
{
|
||||||
log->info_hex(sdu->msg, sdu->N_bytes, "%s Tx SDU", get_rb_name(lcid));
|
log->info_hex(sdu->msg, sdu->N_bytes, "%s Tx SDU", rrc->get_rb_name(lcid).c_str());
|
||||||
tx_sdu_queue.write(sdu);
|
tx_sdu_queue.write(sdu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ void rlc_um::timer_expired(uint32_t timeout_id)
|
||||||
|
|
||||||
// 36.322 v10 Section 5.1.2.2.4
|
// 36.322 v10 Section 5.1.2.2.4
|
||||||
log->info("%s reordering timeout expiry - updating vr_ur and reassembling\n",
|
log->info("%s reordering timeout expiry - updating vr_ur and reassembling\n",
|
||||||
get_rb_name(lcid));
|
rrc->get_rb_name(lcid).c_str());
|
||||||
|
|
||||||
log->warning("Lost PDU SN: %d\n", vr_ur);
|
log->warning("Lost PDU SN: %d\n", vr_ur);
|
||||||
pdu_lost = true;
|
pdu_lost = true;
|
||||||
|
@ -281,7 +281,7 @@ int rlc_um::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
{
|
{
|
||||||
pool->deallocate(pdu);
|
pool->deallocate(pdu);
|
||||||
log->warning("%s Cannot build a PDU - %d bytes available, %d bytes required for header\n",
|
log->warning("%s Cannot build a PDU - %d bytes available, %d bytes required for header\n",
|
||||||
get_rb_name(lcid), nof_bytes, head_len);
|
rrc->get_rb_name(lcid).c_str(), nof_bytes, head_len);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -291,7 +291,7 @@ int rlc_um::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
uint32_t space = pdu_space-head_len;
|
uint32_t space = pdu_space-head_len;
|
||||||
to_move = space >= tx_sdu->N_bytes ? tx_sdu->N_bytes : space;
|
to_move = space >= tx_sdu->N_bytes ? tx_sdu->N_bytes : space;
|
||||||
log->debug("%s adding remainder of SDU segment - %d bytes of %d remaining\n",
|
log->debug("%s adding remainder of SDU segment - %d bytes of %d remaining\n",
|
||||||
get_rb_name(lcid), to_move, tx_sdu->N_bytes);
|
rrc->get_rb_name(lcid).c_str(), to_move, tx_sdu->N_bytes);
|
||||||
memcpy(pdu_ptr, tx_sdu->msg, to_move);
|
memcpy(pdu_ptr, tx_sdu->msg, to_move);
|
||||||
last_li = to_move;
|
last_li = to_move;
|
||||||
pdu_ptr += to_move;
|
pdu_ptr += to_move;
|
||||||
|
@ -301,7 +301,7 @@ int rlc_um::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
if(tx_sdu->N_bytes == 0)
|
if(tx_sdu->N_bytes == 0)
|
||||||
{
|
{
|
||||||
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
||||||
get_rb_name(lcid), tx_sdu->get_latency_us());
|
rrc->get_rb_name(lcid).c_str(), tx_sdu->get_latency_us());
|
||||||
pool->deallocate(tx_sdu);
|
pool->deallocate(tx_sdu);
|
||||||
tx_sdu = NULL;
|
tx_sdu = NULL;
|
||||||
}
|
}
|
||||||
|
@ -320,7 +320,7 @@ int rlc_um::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
uint32_t space = pdu_space-head_len;
|
uint32_t space = pdu_space-head_len;
|
||||||
to_move = space >= tx_sdu->N_bytes ? tx_sdu->N_bytes : space;
|
to_move = space >= tx_sdu->N_bytes ? tx_sdu->N_bytes : space;
|
||||||
log->debug("%s adding new SDU segment - %d bytes of %d remaining\n",
|
log->debug("%s adding new SDU segment - %d bytes of %d remaining\n",
|
||||||
get_rb_name(lcid), to_move, tx_sdu->N_bytes);
|
rrc->get_rb_name(lcid).c_str(), to_move, tx_sdu->N_bytes);
|
||||||
memcpy(pdu_ptr, tx_sdu->msg, to_move);
|
memcpy(pdu_ptr, tx_sdu->msg, to_move);
|
||||||
last_li = to_move;
|
last_li = to_move;
|
||||||
pdu_ptr += to_move;
|
pdu_ptr += to_move;
|
||||||
|
@ -330,7 +330,7 @@ int rlc_um::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
if(tx_sdu->N_bytes == 0)
|
if(tx_sdu->N_bytes == 0)
|
||||||
{
|
{
|
||||||
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
log->info("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
|
||||||
get_rb_name(lcid), tx_sdu->get_latency_us());
|
rrc->get_rb_name(lcid).c_str(), tx_sdu->get_latency_us());
|
||||||
pool->deallocate(tx_sdu);
|
pool->deallocate(tx_sdu);
|
||||||
tx_sdu = NULL;
|
tx_sdu = NULL;
|
||||||
}
|
}
|
||||||
|
@ -345,11 +345,11 @@ int rlc_um::build_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
vt_us = (vt_us + 1)%cfg.tx_mod;
|
vt_us = (vt_us + 1)%cfg.tx_mod;
|
||||||
|
|
||||||
// Add header and TX
|
// Add header and TX
|
||||||
log->debug("%s packing PDU with length %d\n", get_rb_name(lcid), pdu->N_bytes);
|
log->debug("%s packing PDU with length %d\n", rrc->get_rb_name(lcid).c_str(), pdu->N_bytes);
|
||||||
rlc_um_write_data_pdu_header(&header, pdu);
|
rlc_um_write_data_pdu_header(&header, pdu);
|
||||||
memcpy(payload, pdu->msg, pdu->N_bytes);
|
memcpy(payload, pdu->msg, pdu->N_bytes);
|
||||||
uint32_t ret = pdu->N_bytes;
|
uint32_t ret = pdu->N_bytes;
|
||||||
log->debug("%s returning length %d\n", get_rb_name(lcid), pdu->N_bytes);
|
log->debug("%s returning length %d\n", rrc->get_rb_name(lcid).c_str(), pdu->N_bytes);
|
||||||
pool->deallocate(pdu);
|
pool->deallocate(pdu);
|
||||||
|
|
||||||
debug_state();
|
debug_state();
|
||||||
|
@ -363,20 +363,20 @@ void rlc_um::handle_data_pdu(uint8_t *payload, uint32_t nof_bytes)
|
||||||
rlc_um_read_data_pdu_header(payload, nof_bytes, cfg.rx_sn_field_length, &header);
|
rlc_um_read_data_pdu_header(payload, nof_bytes, cfg.rx_sn_field_length, &header);
|
||||||
|
|
||||||
log->info_hex(payload, nof_bytes, "RX %s Rx data PDU SN: %d",
|
log->info_hex(payload, nof_bytes, "RX %s Rx data PDU SN: %d",
|
||||||
get_rb_name(lcid), header.sn);
|
rrc->get_rb_name(lcid).c_str(), header.sn);
|
||||||
|
|
||||||
if(RX_MOD_BASE(header.sn) >= RX_MOD_BASE(vr_uh-cfg.rx_window_size) &&
|
if(RX_MOD_BASE(header.sn) >= RX_MOD_BASE(vr_uh-cfg.rx_window_size) &&
|
||||||
RX_MOD_BASE(header.sn) < RX_MOD_BASE(vr_ur))
|
RX_MOD_BASE(header.sn) < RX_MOD_BASE(vr_ur))
|
||||||
{
|
{
|
||||||
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n",
|
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n",
|
||||||
get_rb_name(lcid), header.sn, vr_ur, vr_uh);
|
rrc->get_rb_name(lcid).c_str(), header.sn, vr_ur, vr_uh);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
it = rx_window.find(header.sn);
|
it = rx_window.find(header.sn);
|
||||||
if(rx_window.end() != it)
|
if(rx_window.end() != it)
|
||||||
{
|
{
|
||||||
log->info("%s Discarding duplicate SN: %d\n",
|
log->info("%s Discarding duplicate SN: %d\n",
|
||||||
get_rb_name(lcid), header.sn);
|
rrc->get_rb_name(lcid).c_str(), header.sn);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -451,7 +451,7 @@ void rlc_um::reassemble_rx_sdus()
|
||||||
log->warning("Dropping remainder of lost PDU (lower edge middle segments, vr_ur=%d, vr_ur_in_rx_sdu=%d)\n", vr_ur, vr_ur_in_rx_sdu);
|
log->warning("Dropping remainder of lost PDU (lower edge middle segments, vr_ur=%d, vr_ur_in_rx_sdu=%d)\n", vr_ur, vr_ur_in_rx_sdu);
|
||||||
rx_sdu->reset();
|
rx_sdu->reset();
|
||||||
} else {
|
} else {
|
||||||
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d, i=%d (lower edge middle segments)", get_rb_name(lcid), vr_ur, i);
|
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d, i=%d (lower edge middle segments)", rrc->get_rb_name(lcid).c_str(), vr_ur, i);
|
||||||
rx_sdu->set_timestamp();
|
rx_sdu->set_timestamp();
|
||||||
pdcp->write_pdu(lcid, rx_sdu);
|
pdcp->write_pdu(lcid, rx_sdu);
|
||||||
rx_sdu = pool_allocate;
|
rx_sdu = pool_allocate;
|
||||||
|
@ -471,7 +471,7 @@ void rlc_um::reassemble_rx_sdus()
|
||||||
log->warning("Dropping remainder of lost PDU (lower edge last segments)\n");
|
log->warning("Dropping remainder of lost PDU (lower edge last segments)\n");
|
||||||
rx_sdu->reset();
|
rx_sdu->reset();
|
||||||
} else {
|
} else {
|
||||||
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d (lower edge last segments)", get_rb_name(lcid), vr_ur);
|
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d (lower edge last segments)", rrc->get_rb_name(lcid).c_str(), vr_ur);
|
||||||
rx_sdu->set_timestamp();
|
rx_sdu->set_timestamp();
|
||||||
pdcp->write_pdu(lcid, rx_sdu);
|
pdcp->write_pdu(lcid, rx_sdu);
|
||||||
rx_sdu = pool_allocate;
|
rx_sdu = pool_allocate;
|
||||||
|
@ -505,7 +505,7 @@ void rlc_um::reassemble_rx_sdus()
|
||||||
log->warning("Dropping remainder of lost PDU (update vr_ur middle segments, vr_ur=%d, vr_ur_in_rx_sdu=%d)\n", vr_ur, vr_ur_in_rx_sdu);
|
log->warning("Dropping remainder of lost PDU (update vr_ur middle segments, vr_ur=%d, vr_ur_in_rx_sdu=%d)\n", vr_ur, vr_ur_in_rx_sdu);
|
||||||
rx_sdu->reset();
|
rx_sdu->reset();
|
||||||
} else {
|
} else {
|
||||||
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d, i=%d, (update vr_ur middle segments)", get_rb_name(lcid), vr_ur, i);
|
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d, i=%d, (update vr_ur middle segments)", rrc->get_rb_name(lcid).c_str(), vr_ur, i);
|
||||||
rx_sdu->set_timestamp();
|
rx_sdu->set_timestamp();
|
||||||
pdcp->write_pdu(lcid, rx_sdu);
|
pdcp->write_pdu(lcid, rx_sdu);
|
||||||
rx_sdu = pool_allocate;
|
rx_sdu = pool_allocate;
|
||||||
|
@ -534,7 +534,7 @@ void rlc_um::reassemble_rx_sdus()
|
||||||
log->warning("Dropping remainder of lost PDU (update vr_ur last segments)\n");
|
log->warning("Dropping remainder of lost PDU (update vr_ur last segments)\n");
|
||||||
rx_sdu->reset();
|
rx_sdu->reset();
|
||||||
} else {
|
} else {
|
||||||
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d (update vr_ur last segments)", get_rb_name(lcid), vr_ur);
|
log->info_hex(rx_sdu->msg, rx_sdu->N_bytes, "%s Rx SDU vr_ur=%d (update vr_ur last segments)", rrc->get_rb_name(lcid).c_str(), vr_ur);
|
||||||
rx_sdu->set_timestamp();
|
rx_sdu->set_timestamp();
|
||||||
pdcp->write_pdu(lcid, rx_sdu);
|
pdcp->write_pdu(lcid, rx_sdu);
|
||||||
rx_sdu = pool_allocate;
|
rx_sdu = pool_allocate;
|
||||||
|
@ -564,7 +564,7 @@ bool rlc_um::inside_reordering_window(uint16_t sn)
|
||||||
void rlc_um::debug_state()
|
void rlc_um::debug_state()
|
||||||
{
|
{
|
||||||
log->debug("%s vt_us = %d, vr_ur = %d, vr_ux = %d, vr_uh = %d \n",
|
log->debug("%s vt_us = %d, vr_ur = %d, vr_ux = %d, vr_uh = %d \n",
|
||||||
get_rb_name(lcid), vt_us, vr_ur, vr_ux, vr_uh);
|
rrc->get_rb_name(lcid).c_str(), vt_us, vr_ur, vr_ux, vr_uh);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,13 +49,6 @@ typedef struct {
|
||||||
|
|
||||||
using srslte::byte_buffer_t;
|
using srslte::byte_buffer_t;
|
||||||
|
|
||||||
|
|
||||||
static std::string rb_id_str[] = {"SRB0", "SRB1", "SRB2",
|
|
||||||
"DRB1","DRB2","DRB3",
|
|
||||||
"DRB4","DRB5","DRB6",
|
|
||||||
"DRB7","DRB8"};
|
|
||||||
|
|
||||||
|
|
||||||
namespace srsue {
|
namespace srsue {
|
||||||
|
|
||||||
class rrc
|
class rrc
|
||||||
|
@ -195,6 +188,33 @@ private:
|
||||||
uint32_t n311_cnt, N311;
|
uint32_t n311_cnt, N311;
|
||||||
uint32_t t301, t310, t311, t304;
|
uint32_t t301, t310, t311, t304;
|
||||||
|
|
||||||
|
// Radio bearers
|
||||||
|
typedef enum{
|
||||||
|
RB_ID_SRB0 = 0,
|
||||||
|
RB_ID_SRB1,
|
||||||
|
RB_ID_SRB2,
|
||||||
|
RB_ID_DRB1,
|
||||||
|
RB_ID_DRB2,
|
||||||
|
RB_ID_DRB3,
|
||||||
|
RB_ID_DRB4,
|
||||||
|
RB_ID_DRB5,
|
||||||
|
RB_ID_DRB6,
|
||||||
|
RB_ID_DRB7,
|
||||||
|
RB_ID_DRB8,
|
||||||
|
RB_ID_MAX
|
||||||
|
} rb_id_t;
|
||||||
|
|
||||||
|
static const std::string rb_id_str[];
|
||||||
|
|
||||||
|
std::string get_rb_name(uint32_t lcid)
|
||||||
|
{
|
||||||
|
if (lcid < RB_ID_MAX) {
|
||||||
|
return rb_id_str[lcid];
|
||||||
|
} else {
|
||||||
|
return "INVALID_RB";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint32_t earfcn;
|
uint32_t earfcn;
|
||||||
srslte_cell_t phy_cell;
|
srslte_cell_t phy_cell;
|
||||||
|
@ -405,7 +425,6 @@ private:
|
||||||
void set_phy_default();
|
void set_phy_default();
|
||||||
void set_mac_default();
|
void set_mac_default();
|
||||||
void set_rrc_default();
|
void set_rrc_default();
|
||||||
void set_bearers();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace srsue
|
} // namespace srsue
|
||||||
|
|
|
@ -198,7 +198,7 @@ void nas::write_pdu(uint32_t lcid, byte_buffer_t *pdu) {
|
||||||
uint8 sec_hdr_type;
|
uint8 sec_hdr_type;
|
||||||
bool mac_valid = false;
|
bool mac_valid = false;
|
||||||
|
|
||||||
nas_log->info_hex(pdu->msg, pdu->N_bytes, "DL %s PDU", get_rb_name(lcid));
|
nas_log->info_hex(pdu->msg, pdu->N_bytes, "DL %s PDU", rrc->get_rb_name(lcid).c_str());
|
||||||
|
|
||||||
// Parse the message security header
|
// Parse the message security header
|
||||||
liblte_mme_parse_msg_sec_header((LIBLTE_BYTE_MSG_STRUCT*)pdu, &pd, &sec_hdr_type);
|
liblte_mme_parse_msg_sec_header((LIBLTE_BYTE_MSG_STRUCT*)pdu, &pd, &sec_hdr_type);
|
||||||
|
@ -228,7 +228,7 @@ void nas::write_pdu(uint32_t lcid, byte_buffer_t *pdu) {
|
||||||
|
|
||||||
// Parse the message header
|
// Parse the message header
|
||||||
liblte_mme_parse_msg_header((LIBLTE_BYTE_MSG_STRUCT *) pdu, &pd, &msg_type);
|
liblte_mme_parse_msg_header((LIBLTE_BYTE_MSG_STRUCT *) pdu, &pd, &msg_type);
|
||||||
nas_log->info_hex(pdu->msg, pdu->N_bytes, "DL %s Decrypted PDU", get_rb_name(lcid));
|
nas_log->info_hex(pdu->msg, pdu->N_bytes, "DL %s Decrypted PDU", rrc->get_rb_name(lcid).c_str());
|
||||||
// TODO: Check if message type requieres specical security header type and if it isvalid
|
// TODO: Check if message type requieres specical security header type and if it isvalid
|
||||||
|
|
||||||
switch (msg_type) {
|
switch (msg_type) {
|
||||||
|
@ -770,7 +770,7 @@ void nas::parse_security_mode_command(uint32_t lcid, byte_buffer_t *pdu)
|
||||||
&sdu->msg[1]);
|
&sdu->msg[1]);
|
||||||
nas_log->info("Sending Security Mode Complete nas_current_ctxt.tx_count=%d, RB=%s\n",
|
nas_log->info("Sending Security Mode Complete nas_current_ctxt.tx_count=%d, RB=%s\n",
|
||||||
ctxt.tx_count,
|
ctxt.tx_count,
|
||||||
get_rb_name(lcid));
|
rrc->get_rb_name(lcid).c_str());
|
||||||
rrc->write_sdu(lcid, sdu);
|
rrc->write_sdu(lcid, sdu);
|
||||||
ctxt.tx_count++;
|
ctxt.tx_count++;
|
||||||
pool->deallocate(pdu);
|
pool->deallocate(pdu);
|
||||||
|
|
|
@ -1447,7 +1447,7 @@ void rrc::send_ul_dcch_msg(byte_buffer_t *pdu)
|
||||||
|
|
||||||
void rrc::write_sdu(uint32_t lcid, byte_buffer_t *sdu) {
|
void rrc::write_sdu(uint32_t lcid, byte_buffer_t *sdu) {
|
||||||
|
|
||||||
rrc_log->info_hex(sdu->msg, sdu->N_bytes, "TX %s SDU", get_rb_name(lcid));
|
rrc_log->info_hex(sdu->msg, sdu->N_bytes, "TX %s SDU", get_rb_name(lcid).c_str());
|
||||||
switch (state) {
|
switch (state) {
|
||||||
case RRC_STATE_CONNECTING:
|
case RRC_STATE_CONNECTING:
|
||||||
send_con_setup_complete(sdu);
|
send_con_setup_complete(sdu);
|
||||||
|
@ -1462,7 +1462,7 @@ void rrc::write_sdu(uint32_t lcid, byte_buffer_t *sdu) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void rrc::write_pdu(uint32_t lcid, byte_buffer_t *pdu) {
|
void rrc::write_pdu(uint32_t lcid, byte_buffer_t *pdu) {
|
||||||
rrc_log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU", get_rb_name(lcid));
|
rrc_log->info_hex(pdu->msg, pdu->N_bytes, "RX %s PDU", get_rb_name(lcid).c_str());
|
||||||
|
|
||||||
switch (lcid) {
|
switch (lcid) {
|
||||||
case RB_ID_SRB0:
|
case RB_ID_SRB0:
|
||||||
|
@ -1524,7 +1524,7 @@ void rrc::parse_dl_dcch(uint32_t lcid, byte_buffer_t *pdu) {
|
||||||
liblte_rrc_unpack_dl_dcch_msg((LIBLTE_BIT_MSG_STRUCT *) &bit_buf, &dl_dcch_msg);
|
liblte_rrc_unpack_dl_dcch_msg((LIBLTE_BIT_MSG_STRUCT *) &bit_buf, &dl_dcch_msg);
|
||||||
|
|
||||||
rrc_log->info("%s - Received %s\n",
|
rrc_log->info("%s - Received %s\n",
|
||||||
get_rb_name(lcid),
|
get_rb_name(lcid).c_str(),
|
||||||
liblte_rrc_dl_dcch_msg_type_text[dl_dcch_msg.msg_type]);
|
liblte_rrc_dl_dcch_msg_type_text[dl_dcch_msg.msg_type]);
|
||||||
|
|
||||||
// Reset and reuse pdu buffer if possible
|
// Reset and reuse pdu buffer if possible
|
||||||
|
@ -2098,7 +2098,7 @@ void rrc::add_srb(LIBLTE_RRC_SRB_TO_ADD_MOD_STRUCT *srb_cnfg) {
|
||||||
}
|
}
|
||||||
|
|
||||||
srbs[srb_cnfg->srb_id] = *srb_cnfg;
|
srbs[srb_cnfg->srb_id] = *srb_cnfg;
|
||||||
rrc_log->info("Added radio bearer %s\n", get_rb_name(srb_cnfg->srb_id));
|
rrc_log->info("Added radio bearer %s\n", get_rb_name(srb_cnfg->srb_id).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
void rrc::add_drb(LIBLTE_RRC_DRB_TO_ADD_MOD_STRUCT *drb_cnfg) {
|
void rrc::add_drb(LIBLTE_RRC_DRB_TO_ADD_MOD_STRUCT *drb_cnfg) {
|
||||||
|
@ -2157,7 +2157,7 @@ void rrc::add_drb(LIBLTE_RRC_DRB_TO_ADD_MOD_STRUCT *drb_cnfg) {
|
||||||
|
|
||||||
drbs[lcid] = *drb_cnfg;
|
drbs[lcid] = *drb_cnfg;
|
||||||
drb_up = true;
|
drb_up = true;
|
||||||
rrc_log->info("Added radio bearer %s\n", get_rb_name(lcid));
|
rrc_log->info("Added radio bearer %s\n", get_rb_name(lcid).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
void rrc::release_drb(uint8_t lcid) {
|
void rrc::release_drb(uint8_t lcid) {
|
||||||
|
@ -2807,13 +2807,9 @@ float rrc::rrc_meas::range_to_value(quantity_t quant, uint8_t range) {
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const std::string rrc::rb_id_str[] = {"SRB0", "SRB1", "SRB2",
|
||||||
|
"DRB1", "DRB2", "DRB3",
|
||||||
|
"DRB4", "DRB5", "DRB6",
|
||||||
|
"DRB7", "DRB8"};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace srsue
|
} // namespace srsue
|
||||||
|
|
Loading…
Reference in New Issue