Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
OpenXG-RAN
Commits
f51590b5
Commit
f51590b5
authored
Feb 18, 2022
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't leak check in {nr_,}{d,u}lsim, fix buffer overflows in dlsim
parent
990385ee
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
5 deletions
+23
-5
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-2
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+1
-1
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/dlsim.c
+9
-2
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+6
-0
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+6
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
f51590b5
...
...
@@ -50,6 +50,7 @@ include_directories(${CRYPTO_INCLUDE_DIRS})
#uhd 4.0 and iris installs by default in /usr/local
include_directories
(
"/usr/local/include/"
)
#use native cmake method as this package is not in pkg-config
add_list2_option
(
RF_BOARD
"None"
"RF head type"
"None"
"OAI_USRP"
"OAI_BLADERF"
"OAI_LMSSDR"
"OAI_SIMU"
"EXMIMO"
)
if
(
${
RF_BOARD
}
STREQUAL
"OAI_USRP"
)
find_package
(
Boost REQUIRED
)
include_directories
(
${
LIBBOOST_INCLUDE_DIR
}
)
...
...
@@ -688,8 +689,6 @@ add_library(F1AP ${F1AP_C_FILES} )
add_list1_option
(
NB_ANTENNAS_RX
"4"
"Number of antennas in reception"
"1"
"2"
"4"
)
add_list1_option
(
NB_ANTENNAS_TX
"4"
"Number of antennas in transmission"
"1"
"2"
"4"
)
add_list2_option
(
RF_BOARD
"EXMIMO"
"RF head type"
"None"
"OAI_USRP"
"OAI_BLADERF"
"OAI_LMSSDR"
"OAI_SIMU"
)
#NOKIA config enhancement
set
(
CONFIG_ROOTDIR
${
OPENAIR_DIR
}
/common/config
...
...
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
View file @
f51590b5
...
...
@@ -6481,7 +6481,7 @@ void dump_dlsch2(PHY_VARS_UE *ue,uint8_t eNB_id,uint8_t subframe,unsigned int *c
sprintf
(
fname
,
"dlsch%d_rxF_r%d_uespec0.m"
,
eNB_id
,
round
);
sprintf
(
vname
,
"dl%d_rxF_r%d_uespec0"
,
eNB_id
,
round
);
LOG_M
(
fname
,
vname
,
ue
->
pdsch_vars
[
ue
->
current_thread_id
[
subframe
]][
eNB_id
]
->
rxdataF_uespec_pilots
[
0
],
12
*
(
ue
->
frame_parms
.
N_RB_DL
)
*
NSYMB
,
1
,
1
);
12
*
(
ue
->
frame_parms
.
N_RB_DL
),
1
,
1
);
/*
LOG_M("dlsch%d_ch_ext01.m","dl01_ch0_ext",pdsch_vars[eNB_id]->dl_ch_estimates_ext[1],12*N_RB_DL*NSYMB,1,1);
LOG_M("dlsch%d_ch_ext10.m","dl10_ch0_ext",pdsch_vars[eNB_id]->dl_ch_estimates_ext[2],12*N_RB_DL*NSYMB,1,1);
...
...
openair1/SIMULATION/LTE_PHY/dlsim.c
View file @
f51590b5
...
...
@@ -64,6 +64,13 @@
void
feptx_ofdm
(
RU_t
*
ru
,
int
frame
,
int
subframe
);
void
feptx_prec
(
RU_t
*
ru
,
int
frame
,
int
subframe
);
const
char
*
__asan_default_options
()
{
/* don't do leak checking in nr_ulsim, not finished yet */
return
"detect_leaks=0"
;
}
double
cpuf
;
#define inMicroS(a) (((double)(a))/(get_cpu_freq_GHz()*1000.0))
//#define MCS_COUNT 23//added for PHY abstraction
...
...
@@ -1538,9 +1545,9 @@ int main(int argc, char **argv) {
LOG_M
(
"txsig0.m"
,
"txs0"
,
&
ru
->
common
.
txdata
[
0
][
subframe
*
eNB
->
frame_parms
.
samples_per_tti
],
eNB
->
frame_parms
.
samples_per_tti
,
1
,
1
);
if
(
transmission_mode
<
7
)
{
LOG_M
(
"txsigF0.m"
,
"txsF0x"
,
&
ru
->
common
.
txdataF_BF
[
0
][
subframe
*
nsymb
*
eNB
->
frame_parms
.
ofdm_symbol_size
],
nsymb
*
eNB
->
frame_parms
.
ofdm_symbol_size
,
1
,
1
);
LOG_M
(
"txsigF0.m"
,
"txsF0x"
,
&
ru
->
common
.
txdataF_BF
[
0
][
0
],
nsymb
*
eNB
->
frame_parms
.
ofdm_symbol_size
,
1
,
1
);
}
else
if
(
transmission_mode
==
7
)
{
LOG_M
(
"txsigF0.m"
,
"txsF0"
,
&
ru
->
common
.
txdataF_BF
[
5
][
subframe
*
nsymb
*
eNB
->
frame_parms
.
ofdm_symbol_size
],
nsymb
*
eNB
->
frame_parms
.
ofdm_symbol_size
,
1
,
1
);
LOG_M
(
"txsigF0.m"
,
"txsF0"
,
&
ru
->
common
.
txdataF_BF
[
5
][
0
],
nsymb
*
eNB
->
frame_parms
.
ofdm_symbol_size
,
1
,
1
);
LOG_M
(
"txsigF0_BF.m"
,
"txsF0_BF"
,
&
ru
->
common
.
txdataF_BF
[
0
][
0
],
eNB
->
frame_parms
.
ofdm_symbol_size
,
1
,
1
);
}
}
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
f51590b5
...
...
@@ -73,6 +73,12 @@
#include <executables/softmodem-common.h>
#include <openair3/ocp-gtpu/gtp_itf.h>
const
char
*
__asan_default_options
()
{
/* don't do leak checking in nr_ulsim, not finished yet */
return
"detect_leaks=0"
;
}
LCHAN_DESC
DCCH_LCHAN_DESC
,
DTCH_DL_LCHAN_DESC
,
DTCH_UL_LCHAN_DESC
;
rlc_info_t
Rlc_info_um
,
Rlc_info_am_config
;
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
f51590b5
...
...
@@ -68,6 +68,12 @@
#include <openair3/ocp-gtpu/gtp_itf.h>
//#define DEBUG_ULSIM
const
char
*
__asan_default_options
()
{
/* don't do leak checking in nr_ulsim, not finished yet */
return
"detect_leaks=0"
;
}
LCHAN_DESC
DCCH_LCHAN_DESC
,
DTCH_DL_LCHAN_DESC
,
DTCH_UL_LCHAN_DESC
;
rlc_info_t
Rlc_info_um
,
Rlc_info_am_config
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment