[BACK]Return to rip_main.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / ripd

Diff for /embedaddon/quagga/ripd/rip_main.c between versions 1.1.1.1 and 1.1.1.3

version 1.1.1.1, 2012/02/21 17:26:12 version 1.1.1.3, 2013/07/21 23:54:40
Line 32 Line 32
 #include "log.h"  #include "log.h"
 #include "privs.h"  #include "privs.h"
 #include "sigevent.h"  #include "sigevent.h"
   #include "zclient.h"
   
 #include "ripd/ripd.h"  #include "ripd/ripd.h"
   
Line 41  static struct option longopts[] =  Line 42  static struct option longopts[] = 
   { "daemon",      no_argument,       NULL, 'd'},    { "daemon",      no_argument,       NULL, 'd'},
   { "config_file", required_argument, NULL, 'f'},    { "config_file", required_argument, NULL, 'f'},
   { "pid_file",    required_argument, NULL, 'i'},    { "pid_file",    required_argument, NULL, 'i'},
     { "socket",      required_argument, NULL, 'z'},
   { "help",        no_argument,       NULL, 'h'},    { "help",        no_argument,       NULL, 'h'},
   { "dryrun",      no_argument,       NULL, 'C'},    { "dryrun",      no_argument,       NULL, 'C'},
   { "vty_addr",    required_argument, NULL, 'A'},    { "vty_addr",    required_argument, NULL, 'A'},
Line 109  Daemon which manages RIP version 1 and 2.\n\n\ Line 111  Daemon which manages RIP version 1 and 2.\n\n\
 -d, --daemon       Runs in daemon mode\n\  -d, --daemon       Runs in daemon mode\n\
 -f, --config_file  Set configuration file name\n\  -f, --config_file  Set configuration file name\n\
 -i, --pid_file     Set process identifier file name\n\  -i, --pid_file     Set process identifier file name\n\
   -z, --socket       Set path of zebra socket\n\
 -A, --vty_addr     Set vty's bind address\n\  -A, --vty_addr     Set vty's bind address\n\
 -P, --vty_port     Set vty's port number\n\  -P, --vty_port     Set vty's port number\n\
 -C, --dryrun       Check configuration for validity and exit\n\  -C, --dryrun       Check configuration for validity and exit\n\
Line 206  main (int argc, char **argv) Line 209  main (int argc, char **argv)
     {      {
       int opt;        int opt;
   
      opt = getopt_long (argc, argv, "df:i:hA:P:u:g:rvC", longopts, 0);      opt = getopt_long (argc, argv, "df:i:z:hA:P:u:g:rvC", longopts, 0);
           
       if (opt == EOF)        if (opt == EOF)
         break;          break;
Line 227  main (int argc, char **argv) Line 230  main (int argc, char **argv)
         case 'i':          case 'i':
           pid_file = optarg;            pid_file = optarg;
           break;            break;
           case 'z':
             zclient_serv_path_set (optarg);
             break;
         case 'P':          case 'P':
           /* Deal with atoi() returning 0 on failure, and ripd not            /* Deal with atoi() returning 0 on failure, and ripd not
              listening on rip port... */               listening on rip port... */
Line 269  main (int argc, char **argv) Line 275  main (int argc, char **argv)
   
   /* Library initialization. */    /* Library initialization. */
   zprivs_init (&ripd_privs);    zprivs_init (&ripd_privs);
  signal_init (master, Q_SIGC(ripd_signals), ripd_signals);  signal_init (master, array_size(ripd_signals), ripd_signals);
   cmd_init (1);    cmd_init (1);
   vty_init (master);    vty_init (master);
   memory_init ();    memory_init ();
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.3

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