From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <www-data@comics.unina.it>
Received: from svn.comics.unina.it (unknown [143.225.229.147])
	by huchra.bufferbloat.net (Postfix) with ESMTP id 2DD1D201A79
	for <bismark-commits@lists.bufferbloat.net>;
	Mon, 16 May 2011 08:14:37 -0700 (PDT)
Received: from www-data by svn.comics.unina.it with local (Exim 4.69)
	(envelope-from <www-data@comics.unina.it>) id 1QLziD-00051S-H8
	for bismark-commits@lists.bufferbloat.net;
	Mon, 16 May 2011 17:28:01 +0200
To: bismark-commits@lists.bufferbloat.net
From: walter@svn.comics.unina.it
Message-Id: <E1QLziD-00051S-H8@svn.comics.unina.it>
Date: Mon, 16 May 2011 17:28:01 +0200
Subject: [Bismark-commits] rev 335 - 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
	<bismark-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/bismark-commits>
List-Post: <mailto:bismark-commits@lists.bufferbloat.net>
List-Help: <mailto:bismark-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2011 15:14:38 -0000

Author: walter
Date: 2011-05-16 17:28:01 +0200 (Mon, 16 May 2011)
New Revision: 335

Modified:
   trunk/mserver/etc/mserver.conf
   trunk/mserver/scripts/daemons
   trunk/mserver/scripts/itg_up
Log:
fixed ITGRecv and probeserver

Modified: trunk/mserver/etc/mserver.conf
===================================================================
--- trunk/mserver/etc/mserver.conf	2011-05-13 13:44:21 UTC (rev 334)
+++ trunk/mserver/etc/mserver.conf	2011-05-16 15:28:01 UTC (rev 335)
@@ -7,7 +7,7 @@
 
 # D-ITG options
 ITG_DW_PORT=1430
-ITG_UP_PORT=8889
+ITG_UP_PORT=9000
 
 # Traceroute options
 RTR_PORT=1100

Modified: trunk/mserver/scripts/daemons
===================================================================
--- trunk/mserver/scripts/daemons	2011-05-13 13:44:21 UTC (rev 334)
+++ trunk/mserver/scripts/daemons	2011-05-16 15:28:01 UTC (rev 335)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bashsudo netstat -lntp | grep -q 
 # Script to check/respawn measurement services
 
 # Load configuration
@@ -8,6 +8,6 @@
 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 probeserver >/dev/null || ( ~/bin/probeserver >> /tmp/spserver.log 2>&1 & )
+sudo netstat -lntp | grep -q $ITG_UP_PORT.*ITGRecv || ~/scripts/itg_up
+sudo netstat -lntp | grep -q 55005.*probeserver || ( killall probeserver ; ~/bin/probeserver >> /tmp/spserver.log 2>&1 & )
 

Modified: trunk/mserver/scripts/itg_up
===================================================================
--- trunk/mserver/scripts/itg_up	2011-05-13 13:44:21 UTC (rev 334)
+++ trunk/mserver/scripts/itg_up	2011-05-16 15:28:01 UTC (rev 335)
@@ -6,6 +6,6 @@
 if [ $ITG_UP_PORT -le 1024 ]; then
 	( sudo ~/bin/ITGRecv -Si $IFNAME -Sp $ITG_UP_PORT >> /tmp/itg.log 2>&1 & )
 else
-	( ~/bin/ITGRecv -Si $IFNAME -Sp $ITG_UP_PORT >> /tmp/itg.log 2>&1 & )
+	( ~/bin/ITGRecv -Sp $ITG_UP_PORT >> /tmp/itg.log 2>&1 & )
 fi