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.4 and 1.1.1.1.2.7

version 1.1.1.1.2.4, 2011/10/13 16:08:52	version 1.1.1.1.2.7, 2011/10/17 09:28:19
Line 53 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 65 Usage()	Line 69 Usage()
"\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-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 77 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 91 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 117 main(int argc, char **argv)	Line 124 main(int argc, char **argv)
int fd, h = 0, uid = 0, gid = 0;	int fd, h = 0, uid = 0, gid = 0;
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: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 148 main(int argc, char **argv)	Line 155 main(int argc, char **argv)
break;	break;
case 'd':	case 'd':
strlcpy(szDev, optarg, sizeof szDev);	strlcpy(szDev, optarg, sizeof szDev);
	break;
	case 'k':
	strlcpy(Key, optarg, sizeof Key);
break;	break;
case 'u':	case 'u':
Crypted ^= Crypted;	Crypted ^= Crypted;

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

Removed from v.1.1.1.1.2.4
changed lines
	Added in v.1.1.1.1.2.7