Diff for /embedaddon/quagga/zebra/main.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/10/09 09:22:29 version 1.1.1.3, 2013/07/21 23:54:41
Line 39 Line 39
 #include "zebra/router-id.h"  #include "zebra/router-id.h"
 #include "zebra/irdp.h"  #include "zebra/irdp.h"
 #include "zebra/rtadv.h"  #include "zebra/rtadv.h"
   #include "zebra/zebra_fpm.h"
   
 /* Zebra instance */  /* Zebra instance */
 struct zebra_t zebrad =  struct zebra_t zebrad =
Line 104  struct zebra_privs_t zserv_privs = Line 105  struct zebra_privs_t zserv_privs =
   .vty_group = VTY_GROUP,    .vty_group = VTY_GROUP,
 #endif  #endif
   .caps_p = _caps_p,    .caps_p = _caps_p,
  .cap_num_p = sizeof(_caps_p)/sizeof(_caps_p[0]),  .cap_num_p = array_size(_caps_p),
   .cap_num_i = 0    .cap_num_i = 0
 };  };
   
Line 313  main (int argc, char **argv) Line 314  main (int argc, char **argv)
   zprivs_init (&zserv_privs);    zprivs_init (&zserv_privs);
   
   /* Vty related initialize. */    /* Vty related initialize. */
  signal_init (zebrad.master, Q_SIGC(zebra_signals), zebra_signals);  signal_init (zebrad.master, array_size(zebra_signals), zebra_signals);
   cmd_init (1);    cmd_init (1);
   vty_init (zebrad.master);    vty_init (zebrad.master);
   memory_init ();    memory_init ();
Line 327  main (int argc, char **argv) Line 328  main (int argc, char **argv)
   zebra_vty_init ();    zebra_vty_init ();
   access_list_init ();    access_list_init ();
   prefix_list_init ();    prefix_list_init ();
   #ifdef RTADV
   rtadv_init ();    rtadv_init ();
   #endif
 #ifdef HAVE_IRDP  #ifdef HAVE_IRDP
   irdp_init();    irdp_init();
 #endif  #endif
Line 346  main (int argc, char **argv) Line 349  main (int argc, char **argv)
 #ifdef HAVE_SNMP  #ifdef HAVE_SNMP
   zebra_snmp_init ();    zebra_snmp_init ();
 #endif /* HAVE_SNMP */  #endif /* HAVE_SNMP */
   
   #ifdef HAVE_FPM
     zfpm_init (zebrad.master, 1, 0);
   #else
     zfpm_init (zebrad.master, 0, 0);
   #endif
   
   /* Process the configuration file. Among other configuration    /* Process the configuration file. Among other configuration
   *  directives we can meet those installing static routes. Such    *  directives we can meet those installing static routes. Such

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


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