diff options
| author | David Lamparter <equinox@diac24.net> | 2017-07-25 16:15:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 16:15:54 +0200 |
| commit | 533450e4b94fc9f2c0737555a8caf16cf8fa00dd (patch) | |
| tree | b56d8144a755694d69ef7fb5938992af5e3dbee5 | |
| parent | c8ac4457c02863fe838bf17658a09c2c606aac79 (diff) | |
| parent | a72730d34a8ca9ecd91b356c8e70914ccbccc8a7 (diff) | |
Merge pull request #837 from qlyoung/fix-eigrp-routemap-cli
eigrpd, vtysh: add dummy route-map cli
| -rw-r--r-- | eigrpd/eigrp_main.c | 7 | ||||
| -rw-r--r-- | vtysh/vtysh.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index bc8bbb4450..4c99821d3c 100644 --- 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 67ee8898c9..bef4b82d3f 100644 --- 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 |