From 8300f2f56cd30ad8d82ca6738c1417e0ee49800b Mon Sep 17 00:00:00 2001 From: Louis Scalbert Date: Mon, 7 Nov 2022 11:16:36 +0100 Subject: [PATCH] isisd: add affinity-map support Add the support of the affinity-map command to isisd. Signed-off-by: Louis Scalbert --- isisd/isis_main.c | 6 ++++++ vtysh/vtysh.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/isisd/isis_main.c b/isisd/isis_main.c index fb4237f002..607661b540 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -40,6 +40,7 @@ #include "qobj.h" #include "libfrr.h" #include "routemap.h" +#include "affinitymap.h" #include "isisd/isis_constants.h" #include "isisd/isis_common.h" @@ -167,6 +168,7 @@ struct frr_signal_t isisd_signals[] = { }; +/* clang-format off */ static const struct frr_yang_module_info *const isisd_yang_modules[] = { &frr_filter_info, &frr_interface_info, @@ -174,8 +176,10 @@ static const struct frr_yang_module_info *const isisd_yang_modules[] = { &frr_isisd_info, #endif /* ifndef FABRICD */ &frr_route_map_info, + &frr_affinity_map_info, &frr_vrf_info, }; +/* clang-format on */ #ifdef FABRICD FRR_DAEMON_INFO(fabricd, OPEN_FABRIC, .vty_port = FABRICD_VTY_PORT, @@ -264,6 +268,8 @@ int main(int argc, char **argv, char **envp) lsp_init(); mt_init(); + affinity_map_init(); + isis_zebra_init(master, instance); isis_bfd_init(master); isis_ldp_sync_init(); diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h index e551f4e9fc..5e050bde99 100644 --- a/vtysh/vtysh.h +++ b/vtysh/vtysh.h @@ -59,7 +59,7 @@ extern struct thread_master *master; * 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_PIM6D|VTYSH_NHRPD|VTYSH_EIGRPD|VTYSH_BABELD|VTYSH_SHARPD|VTYSH_PBRD|VTYSH_STATICD|VTYSH_BFDD|VTYSH_FABRICD|VTYSH_VRRPD|VTYSH_PATHD #define VTYSH_ACL VTYSH_BFDD|VTYSH_BABELD|VTYSH_BGPD|VTYSH_EIGRPD|VTYSH_ISISD|VTYSH_FABRICD|VTYSH_LDPD|VTYSH_NHRPD|VTYSH_OSPF6D|VTYSH_OSPFD|VTYSH_PBRD|VTYSH_PIMD|VTYSH_PIM6D|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_VRRPD|VTYSH_ZEBRA -#define VTYSH_AFFMAP VTYSH_ZEBRA +#define VTYSH_AFFMAP VTYSH_ZEBRA | VTYSH_ISISD #define VTYSH_RMAP VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_FABRICD #define VTYSH_INTERFACE_SUBSET \ VTYSH_ZEBRA | VTYSH_RIPD | VTYSH_RIPNGD | VTYSH_OSPFD | VTYSH_OSPF6D | \ -- 2.39.5