update with correct WF streams

diff --git a/ulvpn-mm.sh b/ulvpn-mm.sh
index c22b2d6fca88388619e7be132dfe59155c86a5d4..249254c9e3384c86b00db9a704c8748a3608f6e9 100755 (executable)
--- a/ulvpn-mm.sh
+++ b/ulvpn-mm.sh
@@ -5,14 +5,16 @@ MTU=1439
 
 TEST=$(basename $0 .sh)
 
-LRED=eth0://78:a1:35:10:10:10
-LBLK=eth1://78:a1:35:20:20:20
-RRED=eth0://78:a1:35:01:01:01
-RBLK=eth1://78:a1:35:02:02:02
+LRED=eth1://78:a1:35:10:10:10
+LBLK=eth2://78:a1:35:20:20:20
+RRED=eth1://78:a1:35:01:01:01
+RBLK=eth2://78:a1:35:02:02:02
 
 LOOP=lo://00:00:00:00:00:00
 
-DUDP=eth2
+#DUDP=eth2
+DUDP=lo
+PUDP=1253
 
 CRYPTOMOD=./cryptomod.exe
 SIMULATOR=./simulator.exe
@@ -59,7 +61,7 @@ fi
 
 pids=
 if [ -f /data/MDLU ]; then
-    title Remote
+    title Remote -MDLU-
 
     title starting software crypto module
     $CRYPTOMOD -v 1 -V 1 -l cryptomod.log \
@@ -76,18 +78,18 @@ if [ -f /data/MDLU ]; then
     $SIMULATOR -v1 -V1 -s PROVISIONING -r $LOOP/080B -t $LOOP/081B provisioning.eth && pass OK || { fail KO; exit 1; }
 
     title starting vpn
-    ip addr add 10.1.0.2/24 dev $DUDP
-    ip link set dev $DUDP up
+    #ip addr add 125.128.0.16/8 dev eth0 home
     $VPN -v 0 -V 0 -l ulvpn.log \
         -d tun://tun0:$MTU \
         -l tun://10.2.1.1 -r tun://10.2.0.0 \
-        -t udp://10.1.0.2:1234 -u udp://10.1.0.1:1234 \
+        -tx udp://125.128.0.1:1253 -ux udp://125.128.0.1:8208 \
+        -tt udp://125.128.0.1:1024 -ut udp://125.128.0.1:1189 \
         -x $LOOP/0829 $LOOP/0839 \
         -y $LOOP/0809 $LOOP/0819 | \
         awk '{print "vpn:", $0}'
 
 else
-    title Local
+    title Local -PDLU-
 
     launch configurate interfaces
     i=1
@@ -95,7 +97,12 @@ else
         ip link set dev ${DEV/:*} down
         ip link set dev ${DEV/:\/\// addr }
         ip link set dev ${DEV/:*} up
-        ip addr 192.168.$i.1/24 add dev ${DEV/:*}
+        ip addr add 192.169.$i.1/24 dev ${DEV/:*}
+        sleep 1
+        echo -n foobar | nc -uq1 192.169.$i.254 1234
+        echo -n foobar | nc -uq1 192.169.$i.2 1234
+        #tcpdump -v -i ${DEV/:*} &
+        sleep 1
         let i++
     done
     sleep 2
@@ -104,12 +111,12 @@ else
     $SIMULATOR -v1 -V1 -s PROVISIONING -r $RRED/080B -t $RRED/080B provisioning.eth && pass OK || { fail KO; exit 1; }
 
     title starting vpn
-    ip addr add 10.1.0.1/24 dev $DUDP
-    ip link set dev $DUDP up
-    $VPN -v1 -V1 \
+    #ip addr add 192.168.0.1/24 dev eth0 home
+    $VPN -v0 -V0 \
         -d tun://tun0:$MTU \
         -l tun://10.2.0.1 -r tun://10.2.1.0 \
-        -t udp://10.1.0.1:1234 -u udp://10.1.0.2:1234 \
+        -tr udp://192.168.0.5:1185 -ur udp://192.168.0.5:8192 \
+        -tt udp://192.168.0.5:1024 -ut udp://192.168.0.5:1253 \
         -x $RBLK/0809 $RBLK/0809 \
         -y $RRED/0809 $RRED/0809 | \
         awk '{print "vpn:", $0}'