From 78913e263e68d38566c2030e4ca33e903500bbf7 Mon Sep 17 00:00:00 2001
From: Navid Nikaein <navid.nikaein@eurecom.fr>
Date: Fri, 19 Feb 2016 00:43:02 +0100
Subject: [PATCH] change rrh_gw_config naming in enb config file
---
cmake_targets/tools/build_helper | 18 ++++++++++++++++++
openair2/ENB_APP/enb_config.c | 2 +-
.../CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf | 2 +-
.../CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf | 2 +-
.../CONF/enb.band7.tm1.rrh.lmssdr.conf | 2 +-
.../CONF/enb.band7.tm1.rrh.usrpb210.conf | 2 +-
6 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index d29dbffe13..c8adf45257 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -380,3 +380,21 @@ done
}
+# get from http://www.linuxjournal.com/content/validating-ip-address-bash-script
+validate_ip() {
+
+local ip=$1
+local stat=1
+
+if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+ OIFS=$IFS
+ IFS='.'
+ ip=($ip)
+ IFS=$OIFS
+ [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
+ && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
+ stat=$?
+fi
+
+return $stat
+}
\ No newline at end of file
diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c
index 0f6e6b3706..4c532285f2 100755
--- a/openair2/ENB_APP/enb_config.c
+++ b/openair2/ENB_APP/enb_config.c
@@ -176,7 +176,7 @@
#define ENB_CONFIG_STRING_RRH_GW_REMOTE_ADDRESS "remote_address"
#define ENB_CONFIG_STRING_RRH_GW_LOCAL_PORT "local_port"
#define ENB_CONFIG_STRING_RRH_GW_REMOTE_PORT "remote_port"
-#define ENB_CONFIG_STRING_RRH_GW_ACTIVE "active"
+#define ENB_CONFIG_STRING_RRH_GW_ACTIVE "rrh_gw_active"
#define ENB_CONFIG_STRING_RRH_GW_TRANSPORT_PREFERENCE "tr_preference"
#define ENB_CONFIG_STRING_RRH_GW_RF_TARGET_PREFERENCE "rf_preference"
#define ENB_CONFIG_STRING_RRH_GW_IQ_TXSHIFT "iq_txshift"
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf
index 604226c31a..4cd761645b 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.lmssdr.conf
@@ -149,7 +149,7 @@ rrh_gw_config = (
local_address = "d4:be:d9:22:0a:ac";
local_port = 50000; #for raw option local port must be the same to remote
remote_port = 50000;
- active = "yes";
+ rrh_gw_active = "yes";
tr_preference = "raw";
rf_preference = "lmssdr";
iq_txshift = 0;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf
index c42e1b7864..604f5567ef 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.rrh.usrpb210.conf
@@ -147,7 +147,7 @@ rrh_gw_config = (
local_address = "98:90:96:df:66:07";
local_port = 50000; #for raw option local port must be the same to remote
remote_port = 50000;
- active = "yes";
+ rrh_gw_active = "yes";
tr_preference = "raw";
rf_preference = "usrp_b200";
iq_txshift = 5;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf
index 93afe062e9..9b052bf7ba 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.lmssdr.conf
@@ -149,7 +149,7 @@ rrh_gw_config = (
local_address = "d4:be:d9:22:0a:ac";
local_port = 50000; #for raw option local port must be the same to remote
remote_port = 50000;
- active = "yes";
+ rrh_gw_active = "yes";
tr_preference = "raw";
rf_preference = "lmssdr";
iq_txshift = 0;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
index 6b74698849..33db53740c 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
@@ -149,7 +149,7 @@ rrh_gw_config = (
local_address = "98:90:96:df:66:07";
local_port = 50000; #for raw option local port must be the same to remote
remote_port = 50000;
- active = "yes";
+ rrh_gw_active = "yes";
tr_preference = "raw";
rf_preference = "usrp_b200";
iq_txshift = 5;
--
GitLab