REST/NAMESTORE: rework API

[oweals/gnunet.git] / src / cadet / run_profiler.sh

diff --git a/src/cadet/run_profiler.sh b/src/cadet/run_profiler.sh
index aba6ce4d4a98cf22b824006b85ccd312e135dea5..4273dcd273eb90597224950c9ab26b42dc772045 100755 (executable)
--- a/src/cadet/run_profiler.sh
+++ b/src/cadet/run_profiler.sh
@@ -15,11 +15,11 @@ if [ $PEERS -eq 1 ]; then
     exit 1;
 fi
 
-LINKS=`echo "l($PEERS)/l(2) * $PEERS" | bc -l`
+LINKS=`echo "l($PEERS) * l($PEERS) * $PEERS / 2" | bc -l`
 LINKS=`printf "%.0f" $LINKS`
 NSE=`echo "l($PEERS)/l(2)" | bc -l`
 echo "using $PEERS peers, $LINKS links";
     
 sed -e "s/%LINKS%/$LINKS/;s/%NSE%/$NSE/" profiler.conf > .profiler.conf
 
-./gnunet-mesh-profiler $ROUNDTIME $PEERS $PINGS $4 |& tee log | grep -v DEBUG
+./gnunet-cadet-profiler $ROUNDTIME $PEERS $PINGS $4 2>&1 | tee log | grep -v DEBUG