diff --git a/targets/DOCS/oaisim_walkthrough.pdf b/targets/DOCS/oaisim_walkthrough.pdf new file mode 100644 index 0000000000000000000000000000000000000000..1e9c0c11574584d1bde55e6240db178119b67b8e Binary files /dev/null and b/targets/DOCS/oaisim_walkthrough.pdf differ diff --git a/targets/README.txt b/targets/README.txt index fcaf698ac8576ed116e70fe0d732195bb4e79123..c35a422fef1bec4f4de2ff74994d19dcc0539638 100644 --- a/targets/README.txt +++ b/targets/README.txt @@ -19,6 +19,7 @@ First, you must have all four openair SW directories, openair1, openair2, openai - libgtk-3-dev - libxml2 and libxml2-dev and gccxml - libforms-bin libforms-dev + - nettle-dev nettle-bin openssl - libatlas-base-dev and libatlas-headers (for Ubuntu 11.04, libatlas-dev instead of libatlas-headers) - asn1c and the LTE ASN1 files (for more information on how to install this and generate the required files see the README file in openair2/RRC/LITE/MESSAGES) @@ -64,3 +65,17 @@ The 3 folders have the following structures + after the line: %admin ALL=(ALL) ALL, add : user_name ALL=(ALL) NOPASSWD: ALL - include this line: alias sudo='sudo -E', to the .bashrc - run oai as follows: sudo ./oaisim arg1 arg2 .... + + +---------------------------------------------------------------- +4) Detail Instructions +---------------------------------------------------------------- + + Please follow the instructions given in DOCS/oaisim_walkthrough.pdf + + +---------------------------------------------------------------- +5) OAI on virtual machine +---------------------------------------------------------------- + you may download the image using this URL: https://emu.openairinterface.org/openairlab/openairlab.zip + chekc that all the packges are there as some packages might be added later. diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile index c9ca925f8ec90336b8e91be8b11aaaab84e6f80e..42581887f0589c6420cc48ac1022c261508ce26d 100644 --- a/targets/SIMU/USER/Makefile +++ b/targets/SIMU/USER/Makefile @@ -188,11 +188,11 @@ endif ifdef SECU ifeq ($(NETTLE_FOUND), 0) -@echo "Nettle library >= 2.5 is not installed on your system, continuing with security disabled" +@echo "Nettle library >= 2.5 is not installed on your system, nettle-dev lib needed, continuing with security disabled" SECU=0 else ifeq ($(OPENSSL_FOUND), 0) -@echo "openssl library is not installed on your system, continuing with security disabled" +@echo "openssl library is not installed on your system, openssl lib needed, continuing with security disabled" SECU=0 else CFLAGS += -DENABLE_SECURITY diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c index 70a160397f5f6996d550fa62ac33ebfd9a65341b..9e022195726b048f2f4707346a0aad6c2de48b5d 100644 --- a/targets/SIMU/USER/oaisim.c +++ b/targets/SIMU/USER/oaisim.c @@ -1303,9 +1303,9 @@ void reset_opp_meas(void){ reset_meas(&eNB_mac_inst[eNB_id].schedule_mch); // only embms reset_meas(&eNB_mac_inst[eNB_id].rx_ulsch_sdu); // include rlc_data_ind + mac header parser - reset_meas(&eNB_pdcp_stats[UE_id].pdcp_run); - reset_meas(&eNB_pdcp_stats[UE_id].data_req); - reset_meas(&eNB_pdcp_stats[UE_id].data_ind); + reset_meas(&eNB_pdcp_stats[eNB_id].pdcp_run); + reset_meas(&eNB_pdcp_stats[eNB_id].data_req); + reset_meas(&eNB_pdcp_stats[eNB_id].data_ind); /* reset_meas(&eNB_pdcp_stats[UE_id].encrption); reset_meas(&eNB_pdcp_stats[UE_id].decrption); @@ -1436,9 +1436,9 @@ void print_opp_meas(void){ print_meas(&eNB_mac_inst[eNB_id].schedule_ulsch,"[eNB][UL][ULSCH]",&oaisim_stats,&oaisim_stats_f); print_meas(&eNB_mac_inst[eNB_id].rx_ulsch_sdu,"[eNB][UL][rx_ulsch_sdu]",&oaisim_stats,&oaisim_stats_f); - print_meas(&eNB_pdcp_stats[UE_id].pdcp_run,"[eNB][pdcp_run]",&oaisim_stats,&oaisim_stats_f); - print_meas(&eNB_pdcp_stats[UE_id].data_req,"[eNB][DL][pdcp_data_req]",&oaisim_stats,&oaisim_stats_f); - print_meas(&eNB_pdcp_stats[UE_id].data_ind,"[eNB][UL][pdcp_data_ind]",&oaisim_stats,&oaisim_stats_f); + print_meas(&eNB_pdcp_stats[eNB_id].pdcp_run,"[eNB][pdcp_run]",&oaisim_stats,&oaisim_stats_f); + print_meas(&eNB_pdcp_stats[eNB_id].data_req,"[eNB][DL][pdcp_data_req]",&oaisim_stats,&oaisim_stats_f); + print_meas(&eNB_pdcp_stats[eNB_id].data_ind,"[eNB][UL][pdcp_data_ind]",&oaisim_stats,&oaisim_stats_f); } }