From 523105fb00372d2cb95a1b20aed78115aef4ab9a Mon Sep 17 00:00:00 2001 From: Norman Rasmussen Date: Sun, 10 Jan 2010 21:45:55 +0000 Subject: [PATCH] allow tunnels Allow 'tunnels' mode when there's an already running instance. Signed-off-by: Stefan Schantl --- unix-console/main.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/unix-console/main.c b/unix-console/main.c index 1e7b4b4..375b61c 100755 --- a/unix-console/main.c +++ b/unix-console/main.c @@ -50,7 +50,7 @@ int sigrunning(int sig) /* Close the file again */ fclose(f); - /* If we can HUP it, it still runs */ + /* If we can signal it, it still runs */ return (pid > 0 && kill(pid, sig) == 0 ? 1 : 0); } @@ -302,20 +302,6 @@ int main(int argc, char *argv[]) return -1; } -#ifndef _WIN32 - /* start or stop? */ - if ( mode != A_TEST && - mode != A_AUTOTEST) - { - /* Already running? */ - if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1) - { - dolog(LOG_ERR, "Already running instance HUP'ed, exiting\n"); - return 0; - } - } -#endif - /* Verify required parameters */ if (!g_aiccu->username || !g_aiccu->password) { @@ -331,6 +317,20 @@ int main(int argc, char *argv[]) return ret == 0 ? -1 : 0; } +#ifndef _WIN32 + /* start or stop? */ + if ( mode != A_TEST && + mode != A_AUTOTEST) + { + /* Already running? */ + if (sigrunning(mode == A_STOP ? SIGTERM : 0) == 1) + { + dolog(LOG_ERR, "Already running instance signaled, exiting\n"); + return 0; + } + } +#endif + /* Get our tunnel */ hTunnel = get_tunnel(); -- 2.47.3