Last changes before demo in the first day

diff --git a/fwp/fwp-demo1 b/fwp/fwp-demo1
index 2ece0dfaea0faa68d63f93ada32899dc2d129799..c947e2246efdf84d7f9e442f0dc3565b11303123 100755 (executable)
--- a/fwp/fwp-demo1
+++ b/fwp/fwp-demo1
@@ -18,8 +18,7 @@ read
 
 (
     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 -e bash -c "sudo fwptester -c 30 -B $((RANDOM%300)) -s $((RANDOM%1400)) 192.168.1.100; echo 'Finished'; sleep 10"
        sleep 10
     done
 
@@ -28,8 +27,7 @@ BG1=$!
 
 (
     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 -e bash -c "sudo fwptester -c 20 -b VO:$((RANDOM%150)),VO:$((RANDOM%150)) -s $((RANDOM%1400)) 192.168.1.100; echo 'Finished'; sleep 10"
        sleep 10
     done
 

diff --git a/fwp/mngr/admtest_utilization.c b/fwp/mngr/admtest_utilization.c
index 74940026acb8293a5881e9e138190b2ba4ef0aed..e23162c6ce7d7c04639dc2079d34db236ad098a5 100644 (file)
--- a/fwp/mngr/admtest_utilization.c
+++ b/fwp/mngr/admtest_utilization.c
@@ -144,6 +144,7 @@ void fwp_admctrl_utilization(fwp_contract_data_t *contdata_new)
 
                /* TODO: If STA-to-STA, multiply it by two. Note that
                 * AP may use different values for backoff. */
+               duration_usec *= 2; /* For demo, we have always STA-to-STA */
                if (contract->period_usec == 0) {
                        if (contdata == contdata_new) {
                                contdata->status = FWP_CONT_NOTNEGOTIATED;