--- ansh/src/anshd.c 2011/10/04 22:37:46 1.1 +++ ansh/src/anshd.c 2011/10/17 20:14:02 1.2 @@ -3,19 +3,61 @@ * by Michael Pounov * * $Author: misho $ - * $Id: anshd.c,v 1.1 2011/10/04 22:37:46 misho Exp $ + * $Id: anshd.c,v 1.2 2011/10/17 20:14:02 misho Exp $ * - *************************************************************************/ + ************************************************************************* +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 + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . 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 +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 "anshd.h" #include "proc.h" intptr_t Kill; -int bpfLEN, Verbose, Crypted = 1; +int Verbose; +u_int Crypted = 1; proc_head_t pH; -int 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[]; static void @@ -25,9 +67,10 @@ Usage() "=== %s === %s@%s ===\n\n" " Syntax: anshd [options]\n\n" "\t-d \tBind to host interface, like 'em0' (default is first host interface)\n" - "\t-i \tService ID (default is 42)\n" "\t-U \tRun service with other user\n" "\t-C \tRun service into chroot directory\n" + "\t-k \tService cipher key\n" + "\t-t \tTimeout of login if no activity (default is 0 sec)\n" "\t-u\t\tSwitch to unencrypted traffic between hosts\n" "\t-b\t\tRun into batch mode (default is daemon mode)\n" "\t-v\t\tVerbose (more -v, more verbosity ...)\n" @@ -39,38 +82,54 @@ static void sig(int s) { int state; + pid_t pid; switch (s) { case SIGHUP: - LOG("Got SIGHUP!\n"); + VERB(1) LOG("Got SIGHUP!\n"); break; case SIGTERM: - LOG("Got SIGTERM!\n"); Kill++; + VERB(1) LOG("Got SIGTERM!\n"); break; case SIGPIPE: - LOG("Got SIGPIPE!\n"); + VERB(1) LOG("Got SIGPIPE!\n"); break; case SIGCHLD: - while (waitpid(-1, &state, WNOHANG) > 0); + VERB(1) LOG("Got SIGCHLD!\n"); + while ((pid = waitpid(-1, &state, WNOHANG)) > 0) + stopProcess(root, &pH, pid, pktTx); break; } } +static void * +hook_error(void *root, void *arg) +{ +/* sched_root_task_t *r = root; */ + + if (!root) + return (void*) -1; + + if (arg == (void*) EINTR) + return (void*) -1; + + return NULL; +} + int main(int argc, char **argv) { struct passwd *pass; int fd, h = 0, uid = 0, gid = 0; - long id = ANSH_ID; char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/", szDev[STRSIZ] = { 0 }; struct sigaction sact; - sched_root_task_t *root = NULL; - struct tagProc *proc; Get1stEth(szDev, STRSIZ); - while ((ch = getopt(argc, argv, "hvulbd:U:C:")) != -1) + strlcpy(Key, DEFAULT_KEY, sizeof Key); + + while ((ch = getopt(argc, argv, "hvubt:d:U:C:k:")) != -1) switch (ch) { case 'U': pass = getpwnam(optarg); @@ -91,12 +150,15 @@ main(int argc, char **argv) } else strlcpy(szChroot, optarg, sizeof szChroot); break; - case 'i': - id = strtol(optarg, NULL, 0); + case 't': + Timeout = abs(strtol(optarg, NULL, 0)); break; case 'd': strlcpy(szDev, optarg, sizeof szDev); break; + case 'k': + strlcpy(Key, optarg, sizeof Key); + break; case 'u': Crypted ^= Crypted; break; @@ -152,17 +214,25 @@ main(int argc, char **argv) } } + if (ioCreatePIDFile(PIDFILE_ANSHD, 42)) { + ERR("Error:: already started anshd service ...\n"); + closelog(); + return 1; + } + h = PrepareL2(szDev, &bpfLEN); if (h == -1) { ERR("Error:: Descriptor not opened ... abort!\n"); + unlink(PIDFILE_ANSHD); closelog(); return 2; } SLIST_INIT(&pH); - if (!(proc = InitProc(h, NULL, id, bpfLEN))) { + if (!(proc = InitProc(h, NULL, ANSH_ID, bpfLEN))) { ERR("Error:: Not enough memory ...\n"); close(h); + unlink(PIDFILE_ANSHD); closelog(); return 3; } @@ -170,11 +240,13 @@ main(int argc, char **argv) root = schedBegin(); if (!root) { ERR("Scheduler not init #%d - %s\n", sched_GetErrno(), sched_GetError()); - DestroyProc(id); + DestroyProc(ANSH_ID); close(h); + unlink(PIDFILE_ANSHD); closelog(); return 4; - } + } else + root->root_hooks.hook_root.error = hook_error; chdir("/"); chroot(szChroot); @@ -182,15 +254,16 @@ main(int argc, char **argv) setgid(gid); setuid(uid); - if (schedRead(root, pktRx, (void*) id, h)) { + if (schedRead(root, pktRx, (void*) ANSH_ID, h)) { schedRun(root, &Kill); } else ERR("Failed to add reader task #%d - %s\n", sched_GetErrno(), sched_GetError()); VERB(1) LOG("Finish process."); schedEnd(&root); - DestroyProc(id); + DestroyProc(ANSH_ID); close(h); + unlink(PIDFILE_ANSHD); closelog(); return 0; }