From 372649714e6569ae147bdff88af979aa4d751671 Mon Sep 17 00:00:00 2001
From: Ferreira <ferreira@eurecom.fr>
Date: Mon, 13 Oct 2014 14:17:22 +0000
Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5875
818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
.../enb1/oai_conf/start_enb.bash | 4 ++--
.../mih_user/lte_test_user/enb2_lte_user.cpp | 18 +++++++++++++-----
targets/PROJECTS/SPECTRA/start_enb.bash | 4 ++--
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb1/oai_conf/start_enb.bash b/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb1/oai_conf/start_enb.bash
index 70f254ffd2..4204ab9b7c 100644
--- a/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb1/oai_conf/start_enb.bash
+++ b/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb1/oai_conf/start_enb.bash
@@ -68,8 +68,8 @@ source $THIS_SCRIPT_PATH/env_802dot21.bash
###########################################################
bash_exec "ifconfig $EMULATION_DEV_INTERFACE up $EMULATION_DEV_ADDRESS netmask 255.255.255.0"
bash_exec "ifconfig eth2 up 192.168.14.3 netmask 255.255.255.0"
-bash_exec "ip r d default dev eth0"
-bash_exec "ip r a default via 192.168.14.4 dev eth2"
+#bash_exec "ip r d default dev eth0"
+#bash_exec "ip r a default via 192.168.14.4 dev eth2"
###########################################################
IPTABLES=/sbin/iptables
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
diff --git a/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb2/mih_user/lte_test_user/enb2_lte_user.cpp b/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb2/mih_user/lte_test_user/enb2_lte_user.cpp
index c5bc9e5887..87179f2a7f 100644
--- a/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb2/mih_user/lte_test_user/enb2_lte_user.cpp
+++ b/targets/PROJECTS/SPECTRA/DEMO_SPECTRA/spectra_demo_src/enb2/mih_user/lte_test_user/enb2_lte_user.cpp
@@ -36,7 +36,7 @@
#include <map>
#include <stdio.h>
#include <time.h>
-
+#include <unistd.h>
///////////////////////////////////////////////////////////////////////////////
// Definition of the scenario to execute
@@ -1372,6 +1372,14 @@ void mih_user::receive_MIH_Link_Actions_confirm(odtone::mih::message& msg)
// #endif // SCENARIO_2
log_(0, "MIH_Link_Actions.confirm - End\n");
+ if( second_link_activated == 1 )
+ {
+ unsigned int pause_time = 30; // in seconds to show the result of the demo then proceed
+ log_(0, "\n\n\n\n\t----- Confirmed Configuration of LTE Link for TVWS -----\n");
+ log_(0, "\n\t----- END OF SPECTRA DEMO ! -----\n");
+ log_(0, "\n\n MIH User regular function will resume in (secs) : ", pause_time );
+ usleep(pause_time * 1000000);
+ }
}
// void mih_user::cognitive_decision()
@@ -1454,13 +1462,13 @@ void mih_user::receive_MIH_MN_HO_Candidate_Query_request(odtone::mih::message& m
// send_MIH_Link_Actions_request(link, odtone::mih::link_ac_type_power_up);
//Send ONLY ONCE RRC_Connection_Reconfiguration request to the UE on LTE link 0
- log_(0, "COUNT: ", count );
+// log_(0, "COUNT: ", count );
if (second_link_activated==0)
{
- log_(0, "COUNT: ", count );
- if (count >= 30)
+// log_(0, "COUNT: ", count );
+ if (count >= 750)
{
- log_(0, "COUNT: ", count );
+// log_(0, "COUNT: ", count );
send_MIH_Link_Action_Power_Up_request(_link_id_list[0]);//Link LTE
second_link_activated = 1;
}
diff --git a/targets/PROJECTS/SPECTRA/start_enb.bash b/targets/PROJECTS/SPECTRA/start_enb.bash
index 70f254ffd2..4204ab9b7c 100755
--- a/targets/PROJECTS/SPECTRA/start_enb.bash
+++ b/targets/PROJECTS/SPECTRA/start_enb.bash
@@ -68,8 +68,8 @@ source $THIS_SCRIPT_PATH/env_802dot21.bash
###########################################################
bash_exec "ifconfig $EMULATION_DEV_INTERFACE up $EMULATION_DEV_ADDRESS netmask 255.255.255.0"
bash_exec "ifconfig eth2 up 192.168.14.3 netmask 255.255.255.0"
-bash_exec "ip r d default dev eth0"
-bash_exec "ip r a default via 192.168.14.4 dev eth2"
+#bash_exec "ip r d default dev eth0"
+#bash_exec "ip r a default via 192.168.14.4 dev eth2"
###########################################################
IPTABLES=/sbin/iptables
THIS_SCRIPT_PATH=$(dirname $(readlink -f $0))
--
GitLab