1 commit d7c4f7c0d34b80c188fa45228ca282fd8771a41d
2 Author: Norman Rasmussen <norman@rasmussen.co.za>
3 Date: Sun Jan 10 21:45:55 2010 +0000
5 Allow 'tunnels' mode when there's an already running instance.
7 diff --git a/unix-console/main.c b/unix-console/main.c
8 index 8a4d9a9..388d988 100755
9 --- a/unix-console/main.c
10 +++ b/unix-console/main.c
11 @@ -50,7 +50,7 @@ int sigrunning(int sig)
12 /* Close the file again */
15 - /* If we can HUP it, it still runs */
16 + /* If we can signal it, it still runs */
17 return (pid > 0 && kill(pid, sig) == 0 ? 1 : 0);
20 @@ -302,20 +302,6 @@ int main(int argc, char *argv[])
25 - /* start or stop? */
26 - if ( mode != A_TEST &&
29 - /* Already running? */
30 - if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
32 - dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n");
38 /* Verify required parameters */
39 if (!g_aiccu->username || !g_aiccu->password)
41 @@ -331,6 +317,20 @@ int main(int argc, char *argv[])
42 return ret == 0 ? -1 : 0;
46 + /* start or stop? */
47 + if ( mode != A_TEST &&
50 + /* Already running? */
51 + if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1)
53 + dolog(LOG_ERR, "Already running instance signaled, exiting\n");
60 hTunnel = get_tunnel();