Merge branch 'master' of rtime.felk.cvut.cz:frescor/fwp

[frescor/fwp.git] / fwp / fwp-demo1

diff --git a/fwp/fwp-demo1 b/fwp/fwp-demo1
index 2ece0dfaea0faa68d63f93ada32899dc2d129799..32a40bbe7f9a4788777958d73578c189307df142 100755 (executable)
--- a/fwp/fwp-demo1
+++ b/fwp/fwp-demo1
@@ -1,35 +1,46 @@
-#!/bin/sh
+#!/bin/bash
+
+KONSOLE=${KONSOLE:-"konsole --profile bigfont"}
+TARGET=${TARGET:-192.168.1.100}
+#TARGET=localhost
 
 sudo iwconfig wlan0 rate 1M
 
 #export FWP_MNGR_ADDR=192.168.1.100
 
-konsole -e bash -c "_compiled/bin/fwpmngr" &
+$KONSOLE --geometry +0+0 --vt_sz 80x13 --noclose -e bash -c "_compiled/bin/fwpmngr" &
 BGM=$!
 
+sleep 1
 echo "Press a key..."
 read
 
-konsole -e bash -c "sudo fwptester 192.168.1.100; sleep 10"&
+$KONSOLE --geometry +0+430 --vt_sz 80x2 -e bash -c "sudo fwptester $TARGET; sleep 10"&
 BG0=$!
 
 echo "Press a key..."
 read
 
+$KONSOLE --geometry +0+550 --vt_sz 80x2 -e bash -c "sudo fwptester -B 1000 $TARGET; sleep 10" &
+
+echo "Press a key..."
+read
+
 (
+    RANDOM=5
     while true; do
-        konsole -e bash -c "sudo fwptester -c 30 -B $((RANDOM%500)) -s $((RANDOM%1400)) 192.168.1.100; sleep 10"
-       echo "Finished"
+        $KONSOLE --geometry +0+550 --vt_sz 80x3 -e bash -c "sudo fwptester -c 30 -B $((RANDOM%200)) -s $((RANDOM%1300+40)) $TARGET; echo Finished; sleep 10"
        sleep 10
     done
 
 ) &
+
 BG1=$!
 
 (
+    RANDOM=3
     while true; do
-        konsole -e bash -c "sudo fwptester -c 20 -b VO:$((RANDOM%200)),VO:$((RANDOM%200)) -s $((RANDOM%1400)) 192.168.1.100; sleep 10"
-       echo "Finished"
+        $KONSOLE --geometry +0+700 --vt_sz 80x3 -e bash -c "sudo fwptester -c 20 -b VO:$((RANDOM%100)),VO:$((RANDOM%100)) -s $((RANDOM%1300+40)) $TARGET; echo Finished; sleep 10"
        sleep 10
     done