mirror of https://github.com/PentHertz/srsLTE.git
Merge branch 'next'
This commit is contained in:
commit
eac2b6e43c
|
@ -2243,6 +2243,12 @@ LIBLTE_ERROR_ENUM liblte_s1ap_pack_imsi(
|
||||||
if(ie != NULL &&
|
if(ie != NULL &&
|
||||||
ptr != NULL)
|
ptr != NULL)
|
||||||
{
|
{
|
||||||
|
// max length of IE buffer is 32, so limit
|
||||||
|
if (ie->n_octets > 31) {
|
||||||
|
printf("Length in struct exceeds buffer (%d > 31).\n", ie->n_octets);
|
||||||
|
return LIBLTE_ERROR_ENCODE_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
// Dynamic octet string - IMSI
|
// Dynamic octet string - IMSI
|
||||||
// Length
|
// Length
|
||||||
if(ie->n_octets < 128) {
|
if(ie->n_octets < 128) {
|
||||||
|
|
|
@ -150,7 +150,7 @@ int srslte_resample_arb_compute(srslte_resample_arb_t *q, cf_t *input, cf_t *out
|
||||||
|
|
||||||
res1 = srslte_resample_arb_dot_prod(filter_input, srslte_resample_arb_polyfilt[idx], SRSLTE_RESAMPLE_ARB_M);
|
res1 = srslte_resample_arb_dot_prod(filter_input, srslte_resample_arb_polyfilt[idx], SRSLTE_RESAMPLE_ARB_M);
|
||||||
if(q->interpolate){
|
if(q->interpolate){
|
||||||
res2 = srslte_resample_arb_dot_prod(filter_input, srslte_resample_arb_polyfilt[(idx%SRSLTE_RESAMPLE_ARB_N)+1], SRSLTE_RESAMPLE_ARB_M);
|
res2 = srslte_resample_arb_dot_prod(filter_input, srslte_resample_arb_polyfilt[(idx+1)%SRSLTE_RESAMPLE_ARB_N], SRSLTE_RESAMPLE_ARB_M);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(idx == SRSLTE_RESAMPLE_ARB_N){
|
if(idx == SRSLTE_RESAMPLE_ARB_N){
|
||||||
|
|
|
@ -256,7 +256,7 @@ void ue::push_pdu(uint32_t tti, uint32_t len)
|
||||||
bool ue::process_ce(srslte::sch_subh *subh) {
|
bool ue::process_ce(srslte::sch_subh *subh) {
|
||||||
uint32_t buff_size[4] = {0, 0, 0, 0};
|
uint32_t buff_size[4] = {0, 0, 0, 0};
|
||||||
float phr = 0;
|
float phr = 0;
|
||||||
uint32_t idx = 0;
|
int32_t idx = 0;
|
||||||
uint16_t old_rnti = 0;
|
uint16_t old_rnti = 0;
|
||||||
bool is_bsr = false;
|
bool is_bsr = false;
|
||||||
switch(subh->ce_type()) {
|
switch(subh->ce_type()) {
|
||||||
|
@ -279,6 +279,10 @@ bool ue::process_ce(srslte::sch_subh *subh) {
|
||||||
case srslte::sch_subh::TRUNC_BSR:
|
case srslte::sch_subh::TRUNC_BSR:
|
||||||
case srslte::sch_subh::SHORT_BSR:
|
case srslte::sch_subh::SHORT_BSR:
|
||||||
idx = subh->get_bsr(buff_size);
|
idx = subh->get_bsr(buff_size);
|
||||||
|
if(idx == -1){
|
||||||
|
Error("Invalid Index Passed to lc groups\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
for (uint32_t i=0;i<lc_groups[idx].size();i++) {
|
for (uint32_t i=0;i<lc_groups[idx].size();i++) {
|
||||||
// Indicate BSR to scheduler
|
// Indicate BSR to scheduler
|
||||||
sched->ul_bsr(rnti, lc_groups[idx][i], buff_size[idx]);
|
sched->ul_bsr(rnti, lc_groups[idx][i], buff_size[idx]);
|
||||||
|
|
|
@ -653,7 +653,7 @@ int setup_if_addr(char *ip_addr)
|
||||||
close(tun_fd);
|
close(tun_fd);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
close(sock);
|
close(sock);
|
||||||
|
|
||||||
return(tun_fd);
|
return(tun_fd);
|
||||||
|
|
Loading…
Reference in New Issue