From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from svn.comics.unina.it (unknown [143.225.229.147]) by huchra.bufferbloat.net (Postfix) with ESMTP id ACFBA201A3B for ; Thu, 28 Apr 2011 03:16:30 -0700 (PDT) Received: from www-data by svn.comics.unina.it with local (Exim 4.69) (envelope-from ) id 1QFOLj-0005L1-1v for bismark-commits@lists.bufferbloat.net; Thu, 28 Apr 2011 12:21:31 +0200 To: bismark-commits@lists.bufferbloat.net From: walter@svn.comics.unina.it Message-Id: Date: Thu, 28 Apr 2011 12:21:31 +0200 Subject: [Bismark-commits] rev 330 - trunk/mserver/etc trunk/mserver/scripts X-BeenThere: bismark-commits@lists.bufferbloat.net X-Mailman-Version: 2.1.13 Precedence: list List-Id: Commit log for the bismark source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2011 10:16:31 -0000 Author: walter Date: 2011-04-28 12:21:30 +0200 (Thu, 28 Apr 2011) New Revision: 330 Added: trunk/mserver/scripts/itg_dw Removed: trunk/mserver/scripts/ritg Modified: trunk/mserver/etc/mserver.conf trunk/mserver/scripts/daemons trunk/mserver/scripts/rtr trunk/mserver/scripts/setup_mlab trunk/mserver/scripts/uprate Log: mserver better folder structure (step 2) Modified: trunk/mserver/etc/mserver.conf =================================================================== --- trunk/mserver/etc/mserver.conf 2011-04-27 22:16:58 UTC (rev 329) +++ trunk/mserver/etc/mserver.conf 2011-04-28 10:21:30 UTC (rev 330) @@ -6,11 +6,11 @@ HTTP_PORT=8080 # D-ITG options -ITG_DW_PORT=8889 -ITG_UP_PORT=143 +ITG_DW_PORT=1430 +ITG_UP_PORT=8889 # Traceroute options -RTR_PORT=110 +RTR_PORT=1100 # Uprate options -UPRATE_PORT=777 +UPRATE_PORT=1099 Modified: trunk/mserver/scripts/daemons =================================================================== --- trunk/mserver/scripts/daemons 2011-04-27 22:16:58 UTC (rev 329) +++ trunk/mserver/scripts/daemons 2011-04-28 10:21:30 UTC (rev 330) @@ -1,16 +1,13 @@ #!/bin/bash +# Script to check/respawn measurement services # Load configuration . ~/etc/mserver.conf -# Create log files -touch /tmp/itg.log - -# Check running daemons +# Check running services pgrep -f TCP-LISTEN:$RTR_PORT >/dev/null || ~/scripts/rtr pgrep -f TCP-LISTEN:$ITG_DW_PORT >/dev/null || ~/scripts/itg_dw pgrep -f TCP-LISTEN:$UPRATE_PORT >/dev/null || ~/scripts/uprate pgrep -f ITGRecv >/dev/null || ~/scripts/itg_up -#pgrep -f ITGRecv >/dev/null || ( sudo ./ITGRecv >> /tmp/itg.log 2>&1 & ) pgrep -f probeserver >/dev/null || ( ~/bin/probeserver >> /tmp/spserver.log 2>&1 & ) Copied: trunk/mserver/scripts/itg_dw (from rev 329, trunk/mserver/scripts/ritg) =================================================================== --- trunk/mserver/scripts/itg_dw (rev 0) +++ trunk/mserver/scripts/itg_dw 2011-04-28 10:21:30 UTC (rev 330) @@ -0,0 +1,37 @@ +#!/bin/bash + +# Load configuration +. ~/etc/mserver.conf + +# If launched without options starts the socat listener +if [ ! $1 ]; then + if [ $ITG_DW_PORT -le 1024 ]; then + sudo socat TCP-LISTEN:$ITG_DW_PORT,fork,reuseaddr EXEC:"$0 run",su-d=$LOGNAME,pipes & + else + socat TCP-LISTEN:$ITG_DW_PORT,fork,reuseaddr EXEC:"$0 run",pipes & + fi + exit +fi + +# Parse input +read cmd opt + +case $cmd in +send) + if [ ${opt:0:2} == "-H" ]; then + echo $opt >> /tmp/itg.log + ./ITGSend $opt >> /tmp/itg.log 2>&1 & + fi +;; +log) + echo $cmd - $opt >> /tmp/itg.log + ./ITGDec $opt -j 1000 $opt.jitter -p 1000 $opt.pktloss -b 1000 $opt.bitrate 2> /dev/null + echo bitrate + awk '(NR > 1){ print $3 }' $opt.bitrate + echo jitter + awk '(NR > 1){ print $3 }' $opt.jitter + echo pktloss + awk '(NR > 1){ print $3 }' $opt.pktloss + rm $opt $opt.* +;; +esac Deleted: trunk/mserver/scripts/ritg =================================================================== --- trunk/mserver/scripts/ritg 2011-04-27 22:16:58 UTC (rev 329) +++ trunk/mserver/scripts/ritg 2011-04-28 10:21:30 UTC (rev 330) @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ ! $1 ]; then - sudo socat TCP-LISTEN:143,fork,reuseaddr EXEC:"$0 run",su-d=bismark2,pipes & - exit -fi - -# Parse input -read cmd opt - -case $cmd in -send) - if [ ${opt:0:2} == "-H" ]; then - echo $opt >> /tmp/itg.log - ./ITGSend $opt >> /tmp/itg.log 2>&1 & - fi -;; -log) - echo $cmd - $opt >> /tmp/itg.log - ./ITGDec $opt -j 1000 $opt.jitter -p 1000 $opt.pktloss -b 1000 $opt.bitrate 2> /dev/null - echo bitrate - awk '(NR > 1){ print $3 }' $opt.bitrate - echo jitter - awk '(NR > 1){ print $3 }' $opt.jitter - echo pktloss - awk '(NR > 1){ print $3 }' $opt.pktloss - sudo rm $opt $opt.* -;; -esac Modified: trunk/mserver/scripts/rtr =================================================================== --- trunk/mserver/scripts/rtr 2011-04-27 22:16:58 UTC (rev 329) +++ trunk/mserver/scripts/rtr 2011-04-28 10:21:30 UTC (rev 330) @@ -1,7 +1,15 @@ #!/bin/bash +# Load configuration +. ~/etc/mserver.conf + +# If launched without options starts the socat listener if [ ! $1 ]; then - sudo socat TCP-LISTEN:110,fork,reuseaddr EXEC:"$0 run",pipes & + if [ $RTR_PORT -le 1024 ]; then + sudo socat TCP-LISTEN:$RTR_PORT,fork,reuseaddr EXEC:"$0 run",su-d=$LOGNAME,pipes & + else + socat TCP-LISTEN:$RTR_PORT,fork,reuseaddr EXEC:"$0 run",pipes & + fi exit fi @@ -10,7 +18,7 @@ # Select traceroute type case $type in -ICMP) traceroute -n -q1 -I $SOCAT_PEERADDR ;; +ICMP) sudo traceroute -n -q1 -I $SOCAT_PEERADDR ;; UDP) traceroute -n -q1 $SOCAT_PEERADDR ;; -TCP) traceroute -n -q1 -T $SOCAT_PEERADDR ;; +TCP) sudo traceroute -n -q1 -T $SOCAT_PEERADDR ;; esac Modified: trunk/mserver/scripts/setup_mlab =================================================================== --- trunk/mserver/scripts/setup_mlab 2011-04-27 22:16:58 UTC (rev 329) +++ trunk/mserver/scripts/setup_mlab 2011-04-28 10:21:30 UTC (rev 330) @@ -3,8 +3,8 @@ sudo yum -y install socat # lighttpd php-cli-5.2.6-2.fc8.i386 +# echo "cgi.fix_pathinfo = 1" >> /etc/php.ini -echo "cgi.fix_pathinfo = 1" >> /etc/php.ini - # decommenta fcgi in lighttpd.conf +crontab ~/etc/crontab Modified: trunk/mserver/scripts/uprate =================================================================== --- trunk/mserver/scripts/uprate 2011-04-27 22:16:58 UTC (rev 329) +++ trunk/mserver/scripts/uprate 2011-04-28 10:21:30 UTC (rev 330) @@ -4,7 +4,11 @@ . ~/etc/mserver.conf if [ ! $1 ]; then - ( sudo socat TCP-LISTEN:$UPRATE_PORT,fork,reuseaddr EXEC:"$0 run",su-d=$LOGNAME,pipes ) & + if [ $UPRATE_PORT -le 1024 ]; then + ( sudo socat TCP-LISTEN:$UPRATE_PORT,fork,reuseaddr EXEC:"$0 run",su-d=$LOGNAME,pipes ) & + else + ( socat TCP-LISTEN:$UPRATE_PORT,fork,reuseaddr EXEC:"$0 run",pipes ) & + fi exit fi