diff options
author | Jeff Burdges <burdges@gnunet.org> | 2015-08-03 17:07:38 +0000 |
---|---|---|
committer | Jeff Burdges <burdges@gnunet.org> | 2015-08-03 17:07:38 +0000 |
commit | d2e6e5311751441108b6da66919ad1c6e4e77b91 (patch) | |
tree | 99510916aa5aacb6edcd97893d07b1c3f4a37f20 /src/util/test_socks.c | |
parent | 45a6ea3dae757da8479a80efca11e4fcc32e3321 (diff) | |
download | gnunet-d2e6e5311751441108b6da66919ad1c6e4e77b91.tar.gz gnunet-d2e6e5311751441108b6da66919ad1c6e4e77b91.zip |
Fix the SOCKS proxy test and activate it.
Diffstat (limited to 'src/util/test_socks.c')
-rw-r--r-- | src/util/test_socks.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/util/test_socks.c b/src/util/test_socks.c index 120a1cb6a..a1ebb9af8 100644 --- a/src/util/test_socks.c +++ b/src/util/test_socks.c | |||
@@ -183,10 +183,9 @@ main (int argc, char *argv[]) | |||
183 | if (pid < 0) | 183 | if (pid < 0) |
184 | abort(); | 184 | abort(); |
185 | if (pid == 0) { | 185 | if (pid == 0) { |
186 | return 0; | 186 | execlp ("ssh","ssh","-D",socksport,"127.0.0.1","-N",(char*)NULL); |
187 | execlp("ssh","ssh","-D",socksport,"127.0.0.1","-N",(char*)NULL); | 187 | perror ("execlp(\"ssh\",\"ssh\",\"-D\",\"1081\",\"127.0.0.1\",\"-N\") "); |
188 | perror("execlp(\"ssh\",\"ssh\",\"-D\",\"1081\",\"127.0.0.1\",\"-N\") "); | 188 | printf ("" |
189 | printf("" | ||
190 | "Please ensure you have ssh installed and have sshd installed and running :\n" | 189 | "Please ensure you have ssh installed and have sshd installed and running :\n" |
191 | "\tsudo apt-get install openssh-client openssh-server\n" | 190 | "\tsudo apt-get install openssh-client openssh-server\n" |
192 | "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n" | 191 | "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n" |
@@ -196,7 +195,7 @@ main (int argc, char *argv[]) | |||
196 | "\t CheckHostIP no\n" | 195 | "\t CheckHostIP no\n" |
197 | "\t Protocol 2\n" | 196 | "\t Protocol 2\n" |
198 | "\t ProxyCommand nc 127.0.0.1 22\n"); | 197 | "\t ProxyCommand nc 127.0.0.1 22\n"); |
199 | kill(getppid(), SIGTERM); | 198 | kill (getppid(), SIGTERM); |
200 | return 1; | 199 | return 1; |
201 | } | 200 | } |
202 | sleep(1); | 201 | sleep(1); |
@@ -210,7 +209,7 @@ main (int argc, char *argv[]) | |||
210 | GNUNET_SCHEDULER_run (&task, &ok); | 209 | GNUNET_SCHEDULER_run (&task, &ok); |
211 | GNUNET_CONFIGURATION_destroy (cfg); | 210 | GNUNET_CONFIGURATION_destroy (cfg); |
212 | 211 | ||
213 | kill(pid,SIGTERM); | 212 | kill (pid,SIGTERM); |
214 | return ok; | 213 | return ok; |
215 | } | 214 | } |
216 | 215 | ||