--- embedaddon/quagga/ripngd/ripng_main.c	2013/07/21 23:54:40	1.1.1.3
+++ embedaddon/quagga/ripngd/ripng_main.c	2016/11/02 10:09:12	1.1.1.4
@@ -34,6 +34,7 @@
 #include "if.h"
 #include "privs.h"
 #include "sigevent.h"
+#include "vrf.h"
 
 #include "ripngd/ripngd.h"
 
@@ -127,7 +128,7 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
     }
   exit (status);
 }
-
+
 /* SIGHUP handler. */
 static void 
 sighup (void)
@@ -182,7 +183,7 @@ struct quagga_signal_t ripng_signals[] =
     .handler = &sigint,
   },
 };
-
+
 /* RIPngd main routine. */
 int
 main (int argc, char **argv)
@@ -276,14 +277,12 @@ main (int argc, char **argv)
   cmd_init (1);
   vty_init (master);
   memory_init ();
+  vrf_init ();
 
   /* RIPngd inits. */
   ripng_init ();
-  zebra_init ();
+  zebra_init (master);
   ripng_peer_init ();
-
-  /* Sort all installed commands. */
-  sort_node ();
 
   /* Get configuration file. */
   vty_read_config (config_file, config_default);