From 289582b3dcbeb23328325d224c7db7de66a3a55f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 5 Aug 2024 11:56:25 +0200 Subject: Merging upstream version 10.1. Signed-off-by: Daniel Baumann --- eigrpd/eigrp_main.c | 8 +++++++- eigrpd/eigrp_pkt_tlv1.c | 0 eigrpd/eigrp_pkt_tlv2.c | 0 eigrpd/eigrp_routemap.h | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 eigrpd/eigrp_pkt_tlv1.c delete mode 100644 eigrpd/eigrp_pkt_tlv2.c (limited to 'eigrpd') diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c index 552ba7c..319ac92 100644 --- a/eigrpd/eigrp_main.c +++ b/eigrpd/eigrp_main.c @@ -36,6 +36,7 @@ #include "distribute.h" #include "libfrr.h" #include "routemap.h" +#include "libagentx.h" //#include "if_rmap.h" #include "eigrpd/eigrp_structs.h" @@ -94,10 +95,11 @@ static void sighup(void) static void sigint(void) { zlog_notice("Terminating on signal"); - eigrp_terminate(); keychain_terminate(); + eigrp_terminate(); + exit(0); } @@ -132,6 +134,8 @@ static const struct frr_yang_module_info *const eigrpd_yang_modules[] = { &frr_interface_info, &frr_route_map_info, &frr_vrf_info, + &ietf_key_chain_info, + &ietf_key_chain_deviation_info, }; /* clang-format off */ @@ -175,9 +179,11 @@ int main(int argc, char **argv, char **envp) /* EIGRP master init. */ eigrp_master_init(); + eigrp_om->master = frr_init(); master = eigrp_om->master; + libagentx_init(); eigrp_error_init(); eigrp_vrf_init(); vrf_init(NULL, NULL, NULL, NULL); diff --git a/eigrpd/eigrp_pkt_tlv1.c b/eigrpd/eigrp_pkt_tlv1.c deleted file mode 100644 index e69de29..0000000 diff --git a/eigrpd/eigrp_pkt_tlv2.c b/eigrpd/eigrp_pkt_tlv2.c deleted file mode 100644 index e69de29..0000000 diff --git a/eigrpd/eigrp_routemap.h b/eigrpd/eigrp_routemap.h index c471679..c797d10 100644 --- a/eigrpd/eigrp_routemap.h +++ b/eigrpd/eigrp_routemap.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + /* * eigrp_routemap.h * -- cgit v1.2.3