[BACK]Return to ansh3d.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / ansh / src

Diff for /ansh/src/ansh3d.c between versions 1.1.1.1 and 1.3

version 1.1.1.1, 2011/10/04 22:37:46 version 1.3, 2012/01/23 10:34:12
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"
   
   
 intptr_t Kill;  intptr_t Kill;
int Verbose, Crypted = 1;int Verbose;
 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 struct tagProc *proc;
   static sched_root_task_t *root;
   
 extern char compiled[], compiledby[], compilehost[];  extern char compiled[], compiledby[], compilehost[];
   
 static void  static void
Line 29  Usage() Line 71  Usage()
                 "\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-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-k <key>\tService cipher key\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"
                 "\t-v\t\tVerbose (more -v, more verbosity ...)\n"                  "\t-v\t\tVerbose (more -v, more verbosity ...)\n"
Line 40  static void Line 83  static void
 sig(int s)  sig(int s)
 {  {
         int state;          int state;
           pid_t pid;
   
         switch (s) {          switch (s) {
                 case SIGHUP:                  case SIGHUP:
Line 54  sig(int s) Line 98  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, icmpTx);
                         break;                          break;
         }          }
 }  }
Line 76  hook_error(void *root, void *arg) Line 121  hook_error(void *root, void *arg)
 int  int
 main(int argc, char **argv)  main(int argc, char **argv)
 {  {
        struct sockaddr sa = { 0 };        io_sockaddr_t sa;
        struct sockaddr_in *sin4 = (struct sockaddr_in*) &sa; 
        struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa; 
         struct hostent *host;          struct hostent *host;
         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;          long id = ANSH_ID;
         char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/";          char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/";
         struct sigaction sact;          struct sigaction sact;
         sched_root_task_t *root = NULL;  
         struct tagProc *proc;  
   
        while ((ch = getopt(argc, argv, "hvubt:a:i:U:C:")) != -1)        memset(&sa, 0, sizeof sa);
         strlcpy(Key, DEFAULT_KEY, sizeof Key);
 
         while ((ch = getopt(argc, argv, "hvubt:a:i:U:C:k:")) != -1)
                 switch (ch) {                  switch (ch) {
                         case 'U':                          case 'U':
                                 pass = getpwnam(optarg);                                  pass = getpwnam(optarg);
Line 115  main(int argc, char **argv) Line 159  main(int argc, char **argv)
                         case 't':                          case 't':
                                 Timeout = abs(strtol(optarg, NULL, 0));                                  Timeout = abs(strtol(optarg, NULL, 0));
                                 break;                                  break;
                           case 'k':
                                   strlcpy(Key, optarg, sizeof Key);
                                   break;
                         case 'a':                          case 'a':
                                 host = gethostbyname(optarg);                                  host = gethostbyname(optarg);
                                 if (!host) {                                  if (!host) {
Line 124  main(int argc, char **argv) Line 171  main(int argc, char **argv)
                                 }                                  }
                                 switch (host->h_addrtype) {                                  switch (host->h_addrtype) {
                                         case AF_INET:                                          case AF_INET:
                                                sin4->sin_len = sizeof(struct sockaddr_in);                                                sa.sin.sin_len = sizeof(struct sockaddr_in);
                                                sin4->sin_family = AF_INET;                                                sa.sin.sin_family = AF_INET;
                                                memcpy(&sin4->sin_addr.s_addr, host->h_addr, host->h_length);                                                memcpy(&sa.sin.sin_addr.s_addr, host->h_addr, host->h_length);
                                                 break;                                                  break;
                                         case AF_INET6:                                          case AF_INET6:
                                                sin6->sin6_len = sizeof(struct sockaddr_in6);                                                sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
                                                sin6->sin6_family = AF_INET6;                                                sa.sin6.sin6_family = AF_INET6;
                                                memcpy(&sin6->sin6_addr.s6_addr, host->h_addr, host->h_length);                                                memcpy(&sa.sin6.sin6_addr.s6_addr, host->h_addr, host->h_length);
                                                 break;                                                  break;
                                         default:                                          default:
                                                 printf("Error:: Unknown address type %d !!!\n", host->h_addrtype);                                                  printf("Error:: Unknown address type %d !!!\n", host->h_addrtype);
Line 156  main(int argc, char **argv) Line 203  main(int argc, char **argv)
         argv += optind;          argv += optind;
   
         /* sanity check for openned descriptor */          /* sanity check for openned descriptor */
        if (!sa.sa_family) {        if (!sa.sa.sa_family) {
                sin4->sin_len = sizeof(struct sockaddr_in);                sa.sin.sin_len = sizeof(struct sockaddr_in);
                sin4->sin_family = AF_INET;                sa.sin.sin_family = AF_INET;
         }          }
   
         /* catch signals */          /* catch signals */
Removed from v.1.1.1.1  
changed lines
  Added in v.1.3

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