Merge pull request #837 from qlyoung/fix-eigrp-routemap-cli

eigrpd, vtysh: add dummy route-map cli

diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c
index bc8bbb445042ffa67ff60cda241a100d43a2447d..4c99821d3c4b98ab8a5aca3e2c7820218621c785 100644 (file)
--- a/eigrpd/eigrp_main.c
+++ b/eigrpd/eigrp_main.c
@@ -50,7 +50,7 @@
 #include "keychain.h"
 #include "distribute.h"
 #include "libfrr.h"
-//#include "routemap.h"
+#include "routemap.h"
 //#include "if_rmap.h"
 
 #include "eigrpd/eigrp_structs.h"
@@ -192,6 +192,11 @@ int main(int argc, char **argv, char **envp)
        prefix_list_add_hook(eigrp_distribute_update_all);
        prefix_list_delete_hook(eigrp_distribute_update_all);
 
+       /*
+        * XXX: This is just to get the CLI installed to suppress VTYSH errors.
+        * Routemaps in EIGRP are not yet functional.
+        */
+       route_map_init();
        /*eigrp_route_map_init();
          route_map_add_hook (eigrp_rmap_update);
          route_map_delete_hook (eigrp_rmap_update);*/

diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index 67ee8898c98e779fb660c7542c55a1b5cf131003..bef4b82d3fb3f336f2bb0c48ca60284163973c61 100644 (file)
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -44,7 +44,7 @@ DECLARE_MGROUP(MVTYSH)
  * run on it (logging & co. should stay in a fixed/frozen config, and
  * things like prefix lists are not even initialised) */
 #define VTYSH_ALL        VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD
-#define VTYSH_RMAP       VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD
+#define VTYSH_RMAP       VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_PIMD|VTYSH_EIGRPD
 #define VTYSH_INTERFACE          VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_ISISD|VTYSH_PIMD|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD
 #define VTYSH_NS          VTYSH_ZEBRA
 #define VTYSH_VRF        VTYSH_ZEBRA