From 4484d470c0d39312cbe558335143db5440a695fe Mon Sep 17 00:00:00 2001 From: zeus Date: Sun, 31 Jan 2021 18:01:34 +0200 Subject: [PATCH] wg0 swarmlab0 --- src-local/llo/new.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src-local/llo/new.js b/src-local/llo/new.js index 9e77a83..7e20ffe 100644 --- a/src-local/llo/new.js +++ b/src-local/llo/new.js @@ -383,7 +383,7 @@ var fields = endpoint_tmp.split(':'); var mypath = process.cwd() var swarmlab_config_template = ` - DEV_NAME=wg0 + DEV_NAME=swarmlab0 INTERFACE_IP=${INTERFACE_IP}/16 INTERFACE_IProute=${INTERFACE_IP} ENDPOINT_IP=${endpoint} @@ -447,14 +447,14 @@ var swarmlab_swarm_template = ` var swarmlab_swarm_join_template = ` function swarmlab_ifup() { - swarmlab=$(/bin/bash ${mypath}/hybrid/connect/status.sh wg0 | jq .swarmlab) + swarmlab=$(/bin/bash ${mypath}/hybrid/connect/status.sh swarmlab0 | jq .swarmlab) tempswarm="\${swarmlab%\\"}" tempswarm="\${tempswarm#\\"}" swarmlab=$tempswarm echo $swarmlab } function hybrid_ifup() { - hybrid=$(/bin/bash ${mypath}/hybrid/connect/status.sh wg0 | jq .hybrid) + hybrid=$(/bin/bash ${mypath}/hybrid/connect/status.sh swarmlab0 | jq .hybrid) tempswarm1="\${hybrid%\\"}" tempswarm1="\${tempswarm1#\\"}" hybrid=$tempswarm1 @@ -464,11 +464,11 @@ function hybrid_ifup() { hybrid=$(hybrid_ifup) if [ $hybrid == 'NotOnline' ]; then /bin/bash ${mypath}/hybrid/connect/swarmlab-connect.sh - echo "Start wg0 network interface" + echo "Start swarmlab0 network interface" sleep 3 hybrid1=$(hybrid_ifup) if [ $hybrid1 == 'NotOnline' ]; then - echo "Failed to start wg0 network interface" + echo "Failed to start swarmlab0 network interface" else echo "Swarmlab hybrid $hybrid" fi @@ -498,7 +498,7 @@ fi var swarmlab_swarm_leave_template = ` function hybrid_ifup() { - hybrid=$(/bin/bash ${mypath}/hybrid/connect/status.sh wg0 | jq .hybrid) + hybrid=$(/bin/bash ${mypath}/hybrid/connect/status.sh swarmlab0 | jq .hybrid) tempswarm1="\${hybrid%\\"}" tempswarm1="\${tempswarm1#\\"}" hybrid=$tempswarm1 @@ -509,8 +509,8 @@ hybrid=$(hybrid_ifup) if [ $hybrid == 'NotOnline' ]; then echo "Swarmlab hybrid $hybrid" else - ip link set wg0 down - ip link del wg0 + ip link set swarmlab0 down + ip link del swarmlab0 sleep 3 hybrid1=$(hybrid_ifup) if [ $hybrid1 == 'NotOnline' ]; then @@ -565,7 +565,7 @@ function create_project(swarmlabname,project){ } function myserverStatus(){ - var serverStatus = '/bin/bash ./hybrid/connect/status.sh wg0'; + var serverStatus = '/bin/bash ./hybrid/connect/status.sh swarmlab0'; exec(serverStatus, (err, stdout, stderr) => { if (err) { console.error(`exec error: ${err}`);