gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r36196 - gnunet/src/util


From: gnunet
Subject: [GNUnet-SVN] r36196 - gnunet/src/util
Date: Mon, 3 Aug 2015 19:07:38 +0200

Author: burdges
Date: 2015-08-03 19:07:38 +0200 (Mon, 03 Aug 2015)
New Revision: 36196

Modified:
   gnunet/src/util/Makefile.am
   gnunet/src/util/test_socks.c
Log:
Fix the SOCKS proxy test and activate it.  



Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2015-08-03 16:45:43 UTC (rev 36195)
+++ gnunet/src/util/Makefile.am 2015-08-03 17:07:38 UTC (rev 36196)
@@ -257,6 +257,7 @@
 check_PROGRAMS = \
  test_bio \
  test_client.nc \
+ test_socks.nc \
  test_common_allocation \
  test_common_endian \
  test_common_logging \

Modified: gnunet/src/util/test_socks.c
===================================================================
--- gnunet/src/util/test_socks.c        2015-08-03 16:45:43 UTC (rev 36195)
+++ gnunet/src/util/test_socks.c        2015-08-03 17:07:38 UTC (rev 36196)
@@ -183,10 +183,9 @@
   if (pid < 0)
     abort();
   if (pid == 0) {
-    return 0;
-    execlp("ssh","ssh","-D",socksport,"127.0.0.1","-N",(char*)NULL);
-    perror("execlp(\"ssh\",\"ssh\",\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
-    printf(""
+    execlp ("ssh","ssh","-D",socksport,"127.0.0.1","-N",(char*)NULL);
+    perror ("execlp(\"ssh\",\"ssh\",\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
+    printf (""
 "Please ensure you have ssh installed and have sshd installed and running :\n"
 "\tsudo apt-get install openssh-client openssh-server\n"
 "If you run Tor as a network proxy then Tor might prevent ssh from 
connecting\n"
@@ -196,7 +195,7 @@
 "\t  CheckHostIP no\n"
 "\t  Protocol 2\n"
 "\t  ProxyCommand nc 127.0.0.1 22\n");
-    kill(getppid(), SIGTERM);
+    kill (getppid(), SIGTERM);
     return 1;
   }
   sleep(1);
@@ -210,7 +209,7 @@
   GNUNET_SCHEDULER_run (&task, &ok);
   GNUNET_CONFIGURATION_destroy (cfg);
 
-  kill(pid,SIGTERM);
+  kill (pid,SIGTERM);
   return ok;
 }
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]