1 files changed, 0 insertions, 174 deletions

diff --git a/programs/starter/invokecharon.c b/programs/starter/invokecharon.c
deleted file mode 100644
index a56a03ba8..000000000
--- a/programs/starter/invokecharon.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* strongSwan charon launcher
- * Copyright (C) 2001-2002 Mathieu Lafon - Arkoon Network Security
- * Copyright (C) 2006 Martin Willi - Hochschule fuer Technik Rapperswil
- *
- * Ported from invokepluto.c to fit charons needs.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * RCSID $Id: invokecharon.c $
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <freeswan.h>
-
-#include "../pluto/constants.h"
-#include "../pluto/defs.h"
-#include "../pluto/log.h"
-
-#include "confread.h"
-#include "invokecharon.h"
-#include "files.h"
-
-static int _charon_pid = 0;
-static int _stop_requested;
-
-pid_t
-starter_charon_pid(void)
-{
-    return _charon_pid;
-}
-
-void
-starter_charon_sigchild(pid_t pid)
-{
-	if (pid == _charon_pid)
-    {
-		_charon_pid = 0;
-	if (!_stop_requested)
-	{
-	    plog("charon has died -- restart scheduled (%dsec)"
-		, CHARON_RESTART_DELAY);
-	    alarm(CHARON_RESTART_DELAY);   // restart in 5 sec
-	}
-	unlink(CHARON_PID_FILE);
-    }
-}
-
-int
-starter_stop_charon (void)
-{
-    pid_t pid;
-    int i;
-
-    pid = _charon_pid;
-    if (pid)
-    {
-	_stop_requested = 1;
-
-	/* be more and more aggressive */
-	for (i = 0; i < 20 && (pid = _charon_pid) != 0; i++)
-	{
-		if (i == 0)
-			kill(pid, SIGINT);
-	    else if (i < 10)
-			kill(pid, SIGTERM);
-	    else
-			kill(pid, SIGKILL);
-	    usleep(20000);
-	}
-	if (_charon_pid == 0)
-	    return 0;
-	plog("starter_stop_charon(): can't stop charon !!!");
-	return -1;
-    }
-    else
-    {
-	plog("stater_stop_charon(): charon is not started...");
-    }
-    return -1;
-}
-
-
-int
-starter_start_charon (starter_config_t *cfg, bool debug)
-{
-    int pid, i;
-    struct stat stb;
-    int argc = 1;
-    char *arg[] = {
-	CHARON_CMD, NULL, NULL,
-    };
-
-    if (!debug)
-    {
-	arg[argc++] = "--use-syslog";
-    }
-	
-    if (_charon_pid)
-    {
-	plog("starter_start_charon(): charon already started...");
-	return -1;
-    }
-    else
-    {
-	unlink(CHARON_CTL_FILE);
-	_stop_requested = 0;
-
-	pid = fork();
-	switch (pid)
-	{
-	case -1:
-	    plog("can't fork(): %s", strerror(errno));
-	    return -1;
-	case 0:
-	    /* child */
-	    setsid();
-	    sigprocmask(SIG_SETMASK, 0, NULL);
-	    execv(arg[0], arg);
-	    plog("can't execv(%s,...): %s", arg[0], strerror(errno));
-	    exit(1);
-	default:
-	    /* father */
-		_charon_pid = pid;
-		for (i = 0; i < 50 && _charon_pid; i++)
-	    {
-		/* wait for charon */
-		usleep(20000);
-		if (stat(CHARON_PID_FILE, &stb) == 0)
-		{
-		    DBG(DBG_CONTROL,
-			DBG_log("charon (%d) started", _charon_pid)
-		    )
-		    return 0;
-		}
-	    }
-	    if (_charon_pid)
-	    {
-		/* If charon is started but with no ctl file, stop it */
-		plog("charon too long to start... - kill kill");
-		for (i = 0; i < 20 && (pid = _charon_pid) != 0; i++)
-		{
-			if (i == 0)
-			kill(pid, SIGINT);
-		    else if (i < 10)
-			kill(pid, SIGTERM);
-		    else
-			kill(pid, SIGKILL);
-		    usleep(20000);
-		}
-	    }
-	    else
-	    {
-		plog("charon refused to be started");
-	    }
-	    return -1;
-	}
-    }
-    return -1;
-}