--- embedaddon/quagga/ripd/rip_main.c	2013/07/21 23:54:40	1.1.1.3
+++ embedaddon/quagga/ripd/rip_main.c	2016/11/02 10:09:10	1.1.1.4
@@ -33,6 +33,7 @@
 #include "privs.h"
 #include "sigevent.h"
 #include "zclient.h"
+#include "vrf.h"
 
 #include "ripd/ripd.h"
 
@@ -126,7 +127,7 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
 
   exit (status);
 }
-
+
 /* SIGHUP handler. */
 static void 
 sighup (void)
@@ -183,7 +184,7 @@ static struct quagga_signal_t ripd_signals[] =
     .handler = &sigint,
   },
 };  
-
+
 /* Main routine of ripd. */
 int
 main (int argc, char **argv)
@@ -280,15 +281,13 @@ main (int argc, char **argv)
   vty_init (master);
   memory_init ();
   keychain_init ();
+  vrf_init ();
 
   /* RIP related initialization. */
   rip_init ();
   rip_if_init ();
-  rip_zclient_init ();
+  rip_zclient_init (master);
   rip_peer_init ();
-
-  /* Sort all installed commands. */
-  sort_node ();
 
   /* Get configuration file. */
   vty_read_config (config_file, config_default);