Commit 03d404a6 authored by Raphael Defosseux's avatar Raphael Defosseux

Merge branch 'issue-399-master-ue-hot-fix' into 'master'

Hot fix on UE configuration module

See merge request !506
parents f7a2965b 28a1fcde
Pipeline #11640 passed with stage
in 0 seconds
......@@ -61,3 +61,4 @@ v1.0.0 -> January 2019. This version first implements the architectural split de
S1-flex has been introduced.
New tools: config library, telnet server, ...
A lot of bugfixes and a proper automated Continuous Integration process validates contributions.
v1.0.1 -> February 2019: Bug fix for the UE L1 simulator.
......@@ -604,10 +604,34 @@ function start_l2_sim_ue {
if [ $i -lt 50 ]
then
UE_SYNC=0
echo "L2-SIM UE is NOT sync'ed w/eNB"
echo "L2-SIM UE is NOT sync'ed w/ eNB"
return
else
UE_SYNC=1
echo "L2-SIM UE is sync'ed w/eNB"
echo "L2-SIM UE is sync'ed w/ eNB"
fi
# Checking oip1 interface has now an IP address
i="0"
echo "ifconfig oip1 | egrep -c \"inet addr\"" > $1
while [ $i -lt 10 ]
do
sleep 5
CONNECTED=`ssh -o StrictHostKeyChecking=no ubuntu@$LOC_VM_IP_ADDR < $1`
if [ $CONNECTED -eq 1 ]
then
i="100"
else
i=$[$i+1]
fi
done
rm $1
if [ $i -lt 50 ]
then
UE_SYNC=0
echo "L2-SIM UE oip1 is NOT sync'ed w/ EPC"
else
UE_SYNC=1
echo "L2-SIM UE oip1 is sync'ed w/ EPC"
fi
sleep 10
}
......
......@@ -693,9 +693,13 @@ int main( int argc, char **argv ) {
#if defined (XFORMS)
int ret;
#endif
configmodule_interface_t *config_mod;
start_background_system();
if ( load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY) == NULL) {
config_mod = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY);
if (config_mod == NULL) {
exit_fun("[SOFTMODEM] Error, configuration module init failed\n");
}
......@@ -811,8 +815,6 @@ int main( int argc, char **argv ) {
} else init_openair0(frame_parms[0],(int)rx_gain[0][0]);
if (simL1flag==1) {
AssertFatal(NULL!=load_configmodule(argc,argv,CONFIG_ENABLECMDLINEONLY),
"[SOFTMODEM] Error, configuration module init failed\n");
RCConfig_sim();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment