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

Diff for /embedaddon/quagga/ospf6d/ospf6_main.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/21 23:54:39 version 1.1.1.4, 2016/11/02 10:09:11
Line 35 Line 35
 #include "privs.h"  #include "privs.h"
 #include "sigevent.h"  #include "sigevent.h"
 #include "zclient.h"  #include "zclient.h"
   #include "vrf.h"
   
 #include "ospf6d.h"  #include "ospf6d.h"
 #include "ospf6_top.h"  #include "ospf6_top.h"
 #include "ospf6_message.h"  #include "ospf6_message.h"
 #include "ospf6_asbr.h"  #include "ospf6_asbr.h"
 #include "ospf6_lsa.h"  #include "ospf6_lsa.h"
   #include "ospf6_interface.h"
   #include "ospf6_zebra.h"
   
 /* Default configuration file name for ospf6d. */  /* Default configuration file name for ospf6d. */
 #define OSPF6_DEFAULT_CONFIG       "ospf6d.conf"  #define OSPF6_DEFAULT_CONFIG       "ospf6d.conf"
Line 125  Daemon which manages OSPF version 3.\n\n\ Line 128  Daemon which manages OSPF version 3.\n\n\
 -C, --dryrun       Check configuration for validity and exit\n\  -C, --dryrun       Check configuration for validity and exit\n\
 -h, --help         Display this help and exit\n\  -h, --help         Display this help and exit\n\
 \n\  \n\
Report bugs to zebra@zebra.org\n", progname);Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
     }      }
   
   exit (status);    exit (status);
Line 134  Report bugs to zebra@zebra.org\n", progname); Line 137  Report bugs to zebra@zebra.org\n", progname);
 static void __attribute__ ((noreturn))  static void __attribute__ ((noreturn))
 ospf6_exit (int status)  ospf6_exit (int status)
 {  {
  extern struct ospf6 *ospf6;  struct listnode *node;
  extern struct zclient *zclient;  struct interface *ifp;
   
   if (ospf6)    if (ospf6)
     ospf6_delete (ospf6);      ospf6_delete (ospf6);
   
     for (ALL_LIST_ELEMENTS_RO(iflist, node, ifp))
       if (ifp->info != NULL)
         ospf6_interface_delete(ifp->info);
   
   ospf6_message_terminate ();    ospf6_message_terminate ();
   ospf6_asbr_terminate ();    ospf6_asbr_terminate ();
   ospf6_lsa_terminate ();    ospf6_lsa_terminate ();
   
  if_terminate ();  vrf_terminate ();
   vty_terminate ();    vty_terminate ();
   cmd_terminate ();    cmd_terminate ();
   
Line 312  main (int argc, char *argv[], char *envp[]) Line 319  main (int argc, char *argv[], char *envp[])
   cmd_init (1);    cmd_init (1);
   vty_init (master);    vty_init (master);
   memory_init ();    memory_init ();
  if_init ();  vrf_init ();
   access_list_init ();    access_list_init ();
   prefix_list_init ();    prefix_list_init ();
   
   /* initialize ospf6 */    /* initialize ospf6 */
   ospf6_init ();    ospf6_init ();
   
   /* sort command vector */  
   sort_node ();  
   
   /* parse config file */    /* parse config file */
   vty_read_config (config_file, config_default);    vty_read_config (config_file, config_default);
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

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