validate signal test

diff --git a/test-rb.sh b/test-rb.sh
index 5c1fdb52c72babeb0dd3c3c20495da58922059a3..9b473d15cbc9183f6de34de93d7229bc474728ff 100755 (executable)
--- a/test-rb.sh
+++ b/test-rb.sh
@@ -74,8 +74,7 @@ $@ \
   -l tun://10.2.0.1 -r tun://10.2.1.0 \
   -n udp \
   -n black \
-  -y $DEV://00:00:00:00:00:00/0829 $DEV://00:00:00:00:00:00/0839 | \
-  awk '{ print "red:", $0 }' &
+  -y $DEV://00:00:00:00:00:00/0829 $DEV://00:00:00:00:00:00/0839 > ulvpn-red.log &
 pids="$pids $!"
 
 $@ \
@@ -83,8 +82,10 @@ $@ \
   -n tun \
   -t udp://10.1.0.1:1234 -u udp://10.1.0.1:1234 \
   -x $DEV://00:00:00:00:00:00/0809 $DEV://00:00:00:00:00:00/0819 \
-  -n red | \
-  awk '{ print "black:", $0 }' &
+  -n red > ulvpn-black.log &
+pids="$pids $!"
+
+tail -f ulvpn-red.log ulvpn-black.log &
 pids="$pids $!"
 
 sleep 4

diff --git a/test.sh b/test.sh
index 9a11104ed1fea956fb48d5117909f82b6524c2bc..53e5f9146103e8f6704d72dae8dea54ff65b124a 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -75,8 +75,7 @@ $@ \
   -t udp://10.1.0.1:1234 -u udp://10.1.0.1:1234 \
   -x $DEV://00:00:00:00:00:00/0809 $DEV://00:00:00:00:00:00/0819 \
   -y $DEV://00:00:00:00:00:00/0829 $DEV://00:00:00:00:00:00/0839 &
-vpn=$!
-pids="$pids $vpn"
+pids="$pids $!"
 
 sleep 4
 

diff --git a/ulvpn.c b/ulvpn.c
index d39c61f58aa5dd7083f8fce8cf6d94dfff58cd96..112f397e4dcfb3e02a1834681f766039d5d02014 100644 (file)
--- a/ulvpn.c
+++ b/ulvpn.c
@@ -70,7 +70,7 @@ int raise_stat_sig = 0;
 
 void sig_handler (int sig)
 {
-    VERBOSE (ulvpn, WARNING, PRINTF ("signal: %d\n", sig));
+    VERBOSE (ulvpn, DEBUG, PRINTF ("signal: %d\n", sig));
     switch (sig) {
     case SIGHUP:
         stat_tun_fd.rx = stat_tun_fd.tx = 0;
@@ -110,6 +110,8 @@ void usage (void)
     printf (" -V: library verbose level [%d..%d] (%d)\n", ERROR, TRACE, GET_VERBOSE_LEVEL (mapec));
     printf (" -x: black CM service (%s|%s)\n", cmlocblack, cmremblack);
     printf (" -y: red CM service (%s|%s)\n", cmlocred, cmremred);
+    printf ("send signal TRAP to get statistics\n");
+    printf ("send signal HUP to reset statistics\n");
     printf ("%s version %s\n", progname, version);
 }
 
@@ -687,6 +689,6 @@ int main (int argc, char **argv)
 /* test: ./test.sh ulvpn.exe */
 /* test: ./test-rb.sh ulvpn.exe */
 
-/* test: ulvpn.exe -v 5 -n black -n red -t udp://\*:1234 -u udp://localhost:1235 > ulvpn.log & pid=$!; sleep 1; echo TEST | nc -Nuq0 10.2.1.1 3000; kill -USR1 $pid; sleep 1; kill -HUP $pid; sleep 1; echo TEST | nc -Nuq0 10.2.1.1 3000; kill -USR1 $pid; sleep 1; kill -TERM $pid; grep 'tun: RX' ulvpn.log | wc -l | xargs test 2 -eq */
+/* test: ulvpn.exe -v 5 -n black -n red -t udp://\*:1234 -u udp://localhost:1235 > ulvpn.log & pid=$!; sleep 1; echo TEST | nc -Nuq0 10.2.1.1 3000; kill -TRAP $pid; sleep 1; kill -HUP $pid; sleep 1; echo TEST | nc -Nuq0 10.2.1.1 3000; kill -TRAP $pid; sleep 1; kill -TERM $pid; grep 'tun: RX' ulvpn.log | wc -l | xargs test 2 -eq */
 
 /* vim: set ts=4 sw=4 si et: */