ansh/src/anshd.c - diff

Return to anshd.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / ansh / src

Diff for /ansh/src/anshd.c between versions 1.1.1.1.2.2 and 1.2

version 1.1.1.1.2.2, 2011/10/10 09:11:48	version 1.2, 2011/10/17 20:14:02
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $Id$
*	*
*************************************************************************/	*************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"
#include "anshd.h"	#include "anshd.h"
#include "proc.h"	#include "proc.h"
Line 16 int Verbose;	Line 53 int Verbose;
u_int Crypted = 1;	u_int Crypted = 1;
proc_head_t pH;	proc_head_t pH;
int bpfLEN, Timeout, Daemon = 1;	int bpfLEN, Timeout, Daemon = 1;
	char Key[STRSIZ];

	static sched_root_task_t *root = NULL;
	static struct tagProc *proc;

extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];

static void	static void
Line 26 Usage()	Line 67 Usage()
"=== %s === %s@%s ===\n\n"	"=== %s === %s@%s ===\n\n"
" Syntax: anshd [options]\n\n"	" Syntax: anshd [options]\n\n"
"\t-d <dev>\tBind to host interface, like 'em0' (default is first host interface)\n"	"\t-d <dev>\tBind to host interface, like 'em0' (default is first host interface)\n"
"\t-i <id>\tService ID (default is 42)\n"
"\t-U <user>\tRun service with other user\n"	"\t-U <user>\tRun service with other user\n"
"\t-C <dir>\tRun service into chroot directory\n"	"\t-C <dir>\tRun service into chroot directory\n"
	"\t-k <key>\tService cipher key\n"
"\t-t <timeout>\tTimeout of login if no activity (default is 0 sec)\n"	"\t-t <timeout>\tTimeout of login if no activity (default is 0 sec)\n"
"\t-u\t\tSwitch to unencrypted traffic between hosts\n"	"\t-u\t\tSwitch to unencrypted traffic between hosts\n"
"\t-b\t\tRun into batch mode (default is daemon mode)\n"	"\t-b\t\tRun into batch mode (default is daemon mode)\n"
Line 41 static void	Line 82 static void
sig(int s)	sig(int s)
{	{
int state;	int state;
	pid_t pid;

switch (s) {	switch (s) {
case SIGHUP:	case SIGHUP:
Line 55 sig(int s)	Line 97 sig(int s)
break;	break;
case SIGCHLD:	case SIGCHLD:
VERB(1) LOG("Got SIGCHLD!\n");	VERB(1) LOG("Got SIGCHLD!\n");
while (waitpid(-1, &state, WNOHANG) > 0);	while ((pid = waitpid(-1, &state, WNOHANG)) > 0)
	stopProcess(root, &pH, pid, pktTx);
break;	break;
}	}
}	}
Line 79 main(int argc, char **argv)	Line 122 main(int argc, char **argv)
{	{
struct passwd *pass;	struct passwd *pass;
int fd, h = 0, uid = 0, gid = 0;	int fd, h = 0, uid = 0, gid = 0;
long id = ANSH_ID;
char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/", szDev[STRSIZ] = { 0 };	char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/", szDev[STRSIZ] = { 0 };
struct sigaction sact;	struct sigaction sact;
sched_root_task_t *root = NULL;
struct tagProc *proc;

Get1stEth(szDev, STRSIZ);	Get1stEth(szDev, STRSIZ);

while ((ch = getopt(argc, argv, "hvubt:d:i:U:C:")) != -1)	strlcpy(Key, DEFAULT_KEY, sizeof Key);

	while ((ch = getopt(argc, argv, "hvubt:d:U:C:k:")) != -1)
switch (ch) {	switch (ch) {
case 'U':	case 'U':
pass = getpwnam(optarg);	pass = getpwnam(optarg);
Line 108 main(int argc, char **argv)	Line 150 main(int argc, char **argv)
} else	} else
strlcpy(szChroot, optarg, sizeof szChroot);	strlcpy(szChroot, optarg, sizeof szChroot);
break;	break;
case 'i':
id = strtol(optarg, NULL, 0);
break;
case 't':	case 't':
Timeout = abs(strtol(optarg, NULL, 0));	Timeout = abs(strtol(optarg, NULL, 0));
break;	break;
case 'd':	case 'd':
strlcpy(szDev, optarg, sizeof szDev);	strlcpy(szDev, optarg, sizeof szDev);
break;	break;
	case 'k':
	strlcpy(Key, optarg, sizeof Key);
	break;
case 'u':	case 'u':
Crypted ^= Crypted;	Crypted ^= Crypted;
break;	break;
Line 187 main(int argc, char **argv)	Line 229 main(int argc, char **argv)
}	}

SLIST_INIT(&pH);	SLIST_INIT(&pH);
if (!(proc = InitProc(h, NULL, id, bpfLEN))) {	if (!(proc = InitProc(h, NULL, ANSH_ID, bpfLEN))) {
ERR("Error:: Not enough memory ...\n");	ERR("Error:: Not enough memory ...\n");
close(h);	close(h);
unlink(PIDFILE_ANSHD);	unlink(PIDFILE_ANSHD);
Line 198 main(int argc, char **argv)	Line 240 main(int argc, char **argv)
root = schedBegin();	root = schedBegin();
if (!root) {	if (!root) {
ERR("Scheduler not init #%d - %s\n", sched_GetErrno(), sched_GetError());	ERR("Scheduler not init #%d - %s\n", sched_GetErrno(), sched_GetError());
DestroyProc(id);	DestroyProc(ANSH_ID);
close(h);	close(h);
unlink(PIDFILE_ANSHD);	unlink(PIDFILE_ANSHD);
closelog();	closelog();
Line 212 main(int argc, char **argv)	Line 254 main(int argc, char **argv)
setgid(gid);	setgid(gid);
setuid(uid);	setuid(uid);

if (schedRead(root, pktRx, (void*) id, h)) {	if (schedRead(root, pktRx, (void*) ANSH_ID, h)) {
schedRun(root, &Kill);	schedRun(root, &Kill);
} else	} else
ERR("Failed to add reader task #%d - %s\n", sched_GetErrno(), sched_GetError());	ERR("Failed to add reader task #%d - %s\n", sched_GetErrno(), sched_GetError());

VERB(1) LOG("Finish process.");	VERB(1) LOG("Finish process.");
schedEnd(&root);	schedEnd(&root);
DestroyProc(id);	DestroyProc(ANSH_ID);
close(h);	close(h);
unlink(PIDFILE_ANSHD);	unlink(PIDFILE_ANSHD);
closelog();	closelog();

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1.2.2
changed lines
	Added in v.1.2