31 files changed, 48 insertions, 359 deletions

diff --git a/lib/grammar_sandbox_main.c b/lib/grammar_sandbox_main.c
index abd42f359f..05088d52d1 100644
--- a/lib/grammar_sandbox_main.c
+++ b/lib/grammar_sandbox_main.c
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 
 	vty_init(master, true);
 	lib_cmd_init();
-	nb_init(master, NULL, 0, false);
+	nb_init(master, NULL, 0, false, false);
 
 	vty_stdio(vty_do_exit);
 
diff --git a/lib/libfrr.c b/lib/libfrr.c
index a1982841d3..f2247a48e5 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -820,7 +820,8 @@ struct event_loop *frr_init(void)
 	log_ref_vty_init();
 	lib_error_init();
 
-	nb_init(master, di->yang_modules, di->n_yang_modules, true);
+	nb_init(master, di->yang_modules, di->n_yang_modules, true,
+		(di->flags & FRR_LOAD_YANG_LIBRARY) != 0);
 	if (nb_db_init() != NB_OK)
 		flog_warn(EC_LIB_NB_DATABASE,
 			  "%s: failed to initialize northbound database",
diff --git a/lib/libfrr.h b/lib/libfrr.h
index 7ed7be4d98..df537e2e3b 100644
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -46,6 +46,11 @@ extern "C" {
  * is responsible for calling frr_vty_serv() itself.
  */
 #define FRR_MANUAL_VTY_START (1 << 7)
+/* If FRR_LOAD_YANG_LIBRARY is set then libyang will be told to load and
+ * implement it's internal ietf-yang-library implementation. This should
+ * normally only be done from mgmtd.
+ */
+#define FRR_LOAD_YANG_LIBRARY (1 << 8)
 
 PREDECL_DLIST(log_args);
 struct log_arg {
diff --git a/lib/log.c b/lib/log.c
index 880180ae5a..04b789b5da 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -351,7 +351,6 @@ static const struct zebra_desc_table command_types[] = {
 	DESC_ENTRY(ZEBRA_BFD_DEST_REPLAY),
 	DESC_ENTRY(ZEBRA_REDISTRIBUTE_ROUTE_ADD),
 	DESC_ENTRY(ZEBRA_REDISTRIBUTE_ROUTE_DEL),
-	DESC_ENTRY(ZEBRA_VRF_UNREGISTER),
 	DESC_ENTRY(ZEBRA_VRF_ADD),
 	DESC_ENTRY(ZEBRA_VRF_DELETE),
 	DESC_ENTRY(ZEBRA_VRF_LABEL),
diff --git a/lib/northbound.c b/lib/northbound.c
index 2dae21341e..a385cc9ece 100644
--- a/lib/northbound.c
+++ b/lib/northbound.c
@@ -2701,7 +2701,7 @@ void nb_validate_callbacks(void)
 
 void nb_init(struct event_loop *tm,
 	     const struct frr_yang_module_info *const modules[],
-	     size_t nmodules, bool db_enabled)
+	     size_t nmodules, bool db_enabled, bool load_library)
 {
 	struct yang_module *loaded[nmodules], **loadedp = loaded;
 
@@ -2717,7 +2717,7 @@ void nb_init(struct event_loop *tm,
 
 	nb_db_enabled = db_enabled;
 
-	yang_init(true, explicit_compile);
+	yang_init(true, explicit_compile, load_library);
 
 	/* Load YANG modules and their corresponding northbound callbacks. */
 	for (size_t i = 0; i < nmodules; i++) {
diff --git a/lib/northbound.h b/lib/northbound.h
index dd3fbf8f73..97a1d31e57 100644
--- a/lib/northbound.h
+++ b/lib/northbound.h
@@ -1703,10 +1703,12 @@ void nb_validate_callbacks(void);
  *
  * db_enabled
  *    Set this to record the transactions in the transaction log.
+ *
+ * load_library
+ *    Set this to have libyang to load/implement the ietf-yang-library.
  */
-extern void nb_init(struct event_loop *tm,
-		    const struct frr_yang_module_info *const modules[],
-		    size_t nmodules, bool db_enabled);
+extern void nb_init(struct event_loop *tm, const struct frr_yang_module_info *const modules[],
+		    size_t nmodules, bool db_enabled, bool load_library);
 
 /*
  * Finish the northbound layer gracefully. Should be called only when the daemon
diff --git a/lib/yang.c b/lib/yang.c
index 14d5b118c6..b847b8b77b 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -976,7 +976,7 @@ void yang_debugging_set(bool enable)
 	}
 }
 
-struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile)
+struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile, bool load_library)
 {
 	struct ly_ctx *ctx = NULL;
 	const char *yang_models_path = YANG_MODELS_PATH;
@@ -994,7 +994,9 @@ struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile)
 				     YANG_MODELS_PATH);
 	}
 
-	options = LY_CTX_NO_YANGLIBRARY | LY_CTX_DISABLE_SEARCHDIR_CWD;
+	options = LY_CTX_DISABLE_SEARCHDIR_CWD;
+	if (!load_library)
+		options |= LY_CTX_NO_YANGLIBRARY;
 	if (explicit_compile)
 		options |= LY_CTX_EXPLICIT_COMPILE;
 	err = ly_ctx_new(yang_models_path, options, &ctx);
@@ -1007,7 +1009,7 @@ struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile)
 	return ctx;
 }
 
-void yang_init(bool embedded_modules, bool defer_compile)
+void yang_init(bool embedded_modules, bool defer_compile, bool load_library)
 {
 	/* Initialize libyang global parameters that affect all containers. */
 	ly_set_log_clb(ly_zlog_cb
@@ -1019,7 +1021,7 @@ void yang_init(bool embedded_modules, bool defer_compile)
 	ly_log_options(LY_LOLOG | LY_LOSTORE);
 
 	/* Initialize libyang container for native models. */
-	ly_native_ctx = yang_ctx_new_setup(embedded_modules, defer_compile);
+	ly_native_ctx = yang_ctx_new_setup(embedded_modules, defer_compile, load_library);
 	if (!ly_native_ctx) {
 		flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
 		exit(1);
diff --git a/lib/yang.h b/lib/yang.h
index c4fc78b8ae..52857ecf00 100644
--- a/lib/yang.h
+++ b/lib/yang.h
@@ -607,9 +607,11 @@ extern struct yang_data *yang_data_list_find(const struct list *list,
  * explicit_compile
  *    True if the caller will later call ly_ctx_compile to compile all loaded
  *    modules at once.
+ * load_library
+ *    Set this to have libyang to load/implement the ietf-yang-library.
  */
-extern struct ly_ctx *yang_ctx_new_setup(bool embedded_modules,
-					 bool explicit_compile);
+extern struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile,
+					 bool load_library);
 
 /*
  * Enable or disable libyang verbose debugging.
@@ -727,8 +729,10 @@ extern const char *yang_print_errors(struct ly_ctx *ly_ctx, char *buf,
  *    Specify whether libyang should attempt to look for embedded YANG modules.
  * defer_compile
  *    Hold off on compiling modules until yang_init_loading_complete is called.
+ * load_library
+ *    Set this to have libyang to load/implement the ietf-yang-library.
  */
-extern void yang_init(bool embedded_modules, bool defer_compile);
+extern void yang_init(bool embedded_modules, bool defer_compile, bool load_library);
 
 /*
  * Should be called after yang_init and all yang_module_load()s have been done,
diff --git a/lib/yang_translator.c b/lib/yang_translator.c
index 005f6422f3..b7599e0a71 100644
--- a/lib/yang_translator.c
+++ b/lib/yang_translator.c
@@ -166,7 +166,7 @@ struct yang_translator *yang_translator_load(const char *path)
 	RB_INSERT(yang_translators, &yang_translators, translator);
 
 	/* Initialize the translator libyang context. */
-	translator->ly_ctx = yang_ctx_new_setup(false, false);
+	translator->ly_ctx = yang_ctx_new_setup(false, false, false);
 	if (!translator->ly_ctx) {
 		flog_warn(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
 		goto error;
@@ -512,7 +512,7 @@ static unsigned int yang_module_nodes_count(const struct lys_module *module)
 
 void yang_translator_init(void)
 {
-	ly_translator_ctx = yang_ctx_new_setup(true, false);
+	ly_translator_ctx = yang_ctx_new_setup(true, false, false);
 	if (!ly_translator_ctx) {
 		flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
 		exit(1);
diff --git a/lib/zclient.h b/lib/zclient.h
index 2877b347d8..91c0c9ed6d 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -124,7 +124,6 @@ typedef enum {
 	ZEBRA_BFD_DEST_REPLAY,
 	ZEBRA_REDISTRIBUTE_ROUTE_ADD,
 	ZEBRA_REDISTRIBUTE_ROUTE_DEL,
-	ZEBRA_VRF_UNREGISTER,
 	ZEBRA_VRF_ADD,
 	ZEBRA_VRF_DELETE,
 	ZEBRA_VRF_LABEL,
diff --git a/mgmtd/mgmt.c b/mgmtd/mgmt.c
index 02c54b9215..cfadad4829 100644
--- a/mgmtd/mgmt.c
+++ b/mgmtd/mgmt.c
@@ -57,9 +57,6 @@ void mgmt_init(void)
 	/* Initialize MGMTD Transaction module */
 	mgmt_txn_init(mm, mm->master);
 
-	/* Add yang-library module */
-	yang_module_load("ietf-yang-library", NULL);
-
 	/* Initialize the MGMTD Frontend Adapter Module */
 	mgmt_fe_adapter_init(mm->master);
 
diff --git a/mgmtd/mgmt_main.c b/mgmtd/mgmt_main.c
index e181d0da5e..1880d94415 100644
--- a/mgmtd/mgmt_main.c
+++ b/mgmtd/mgmt_main.c
@@ -214,7 +214,7 @@ FRR_DAEMON_INFO(mgmtd, MGMTD,
 		.n_yang_modules = array_size(mgmt_yang_modules),
 
 		/* avoid libfrr trying to read our config file for us */
-		.flags = FRR_MANUAL_VTY_START | FRR_NO_SPLIT_CONFIG,
+		.flags = FRR_MANUAL_VTY_START | FRR_NO_SPLIT_CONFIG | FRR_LOAD_YANG_LIBRARY,
 	);
 /* clang-format on */
 
diff --git a/pimd/pim_autorp.c b/pimd/pim_autorp.c
index 1f4d0c65af..35347a2790 100644
--- a/pimd/pim_autorp.c
+++ b/pimd/pim_autorp.c
@@ -290,8 +290,8 @@ static bool pim_autorp_add_rp(struct pim_autorp *autorp, pim_addr rpaddr,
 		event_add_timer(router->master, autorp_rp_holdtime, trp,
 				holdtime, &(trp->hold_timer));
 		if (PIM_DEBUG_AUTORP)
-			zlog_debug("%s: Started %u second hold timer for RP %pI4",
-				   __func__, holdtime, &rp->addr);
+			zlog_debug("%s: Started %u second hold timer for RP %pI4", __func__,
+				   holdtime, &trp->addr);
 	} else {
 		/* If hold time is zero, make sure there doesn't exist a hold timer for it already */
 		event_cancel(&trp->hold_timer);
diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c
index d5faa33ca8..17002464e1 100644
--- a/tests/bgpd/test_peer_attr.c
+++ b/tests/bgpd/test_peer_attr.c
@@ -1355,7 +1355,7 @@ static void bgp_startup(void)
 	zprivs_init(&bgpd_privs);
 
 	master = event_master_create(NULL);
-	nb_init(master, NULL, 0, false);
+	nb_init(master, NULL, 0, false, false);
 	bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new());
 	bgp_option_set(BGP_OPT_NO_LISTEN);
 	vrf_init(NULL, NULL, NULL, NULL);
diff --git a/tests/helpers/c/main.c b/tests/helpers/c/main.c
index 9cb395bb1f..344af82fca 100644
--- a/tests/helpers/c/main.c
+++ b/tests/helpers/c/main.c
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
 	vty_init(master, false);
 	lib_cmd_init();
 	debug_init();
-	nb_init(master, NULL, 0, false);
+	nb_init(master, NULL, 0, false, false);
 
 	/* OSPF vty inits. */
 	test_vty_init();
diff --git a/tests/isisd/test_isis_spf.c b/tests/isisd/test_isis_spf.c
index 93009a1b84..e5a8f7a513 100644
--- a/tests/isisd/test_isis_spf.c
+++ b/tests/isisd/test_isis_spf.c
@@ -546,7 +546,7 @@ int main(int argc, char **argv)
 	cmd_init(1);
 	cmd_hostname_set("test");
 	vty_init(master, false);
-	yang_init(true, false);
+	yang_init(true, false, false);
 	if (debug)
 		zlog_aux_init("NONE: ", LOG_DEBUG);
 	else
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 6401971435..342a91cc79 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
 	for (yangcount = 0; test_yang_modules && test_yang_modules[yangcount];
 	     yangcount++)
 		;
-	nb_init(master, test_yang_modules, yangcount, false);
+	nb_init(master, test_yang_modules, yangcount, false, false);
 
 	test_init(argc, argv);
 
diff --git a/tests/lib/cli/test_commands.c b/tests/lib/cli/test_commands.c
index 0034c2af89..9873383fdc 100644
--- a/tests/lib/cli/test_commands.c
+++ b/tests/lib/cli/test_commands.c
@@ -197,7 +197,7 @@ static void test_init(void)
 
 	cmd_init(1);
 	debug_init();
-	nb_init(master, NULL, 0, false);
+	nb_init(master, NULL, 0, false, false);
 
 	install_node(&bgp_node);
 	install_node(&rip_node);
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index 74a0dfe6cc..fdc9e53ca3 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -461,7 +461,7 @@ int main(int argc, char **argv)
 	vty_init(master, false);
 	lib_cmd_init();
 	debug_init();
-	nb_init(master, modules, array_size(modules), false);
+	nb_init(master, modules, array_size(modules), false, false);
 
 	install_element(ENABLE_NODE, &test_rpc_cmd);
 
diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp
index 2f0282704e..379a8688a7 100644
--- a/tests/lib/test_grpc.cpp
+++ b/tests/lib/test_grpc.cpp
@@ -111,8 +111,7 @@ static void static_startup(void)
 	static_debug_init();
 
 	master = event_master_create(NULL);
-	nb_init(master, staticd_yang_modules, array_size(staticd_yang_modules),
-		false);
+	nb_init(master, staticd_yang_modules, array_size(staticd_yang_modules), false, false);
 
 	static_zebra_init();
 	vty_init(master, true);
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index 53bb6513e2..08a1f1e07e 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -1163,7 +1163,12 @@ def pim_delete_move_lines(lines_to_add, lines_to_del):
             ctx_keys[0] in pim_disable
             and ctx_keys[0].startswith("interface")
             and line
-            and (line.startswith("ip pim ") or line.startswith("ip multicast "))
+            and (
+                line.startswith("ip pim ")
+                or line.startswith("no ip pim ")
+                or line.startswith("ip multicast ")
+                or line.startswith("no ip multicast ")
+            )
         ):
             lines_to_del_to_del.append((ctx_keys, line))
 
diff --git a/tools/gen_northbound_callbacks.c b/tools/gen_northbound_callbacks.c
index a879811363..046dc9e99e 100644
--- a/tools/gen_northbound_callbacks.c
+++ b/tools/gen_northbound_callbacks.c
@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
 	if (argc != 1)
 		usage(EXIT_FAILURE);
 
-	yang_init(false, true);
+	yang_init(false, true, false);
 
 	if (search_path)
 		ly_ctx_set_searchdir(ly_native_ctx, search_path);
diff --git a/tools/gen_yang_deviations.c b/tools/gen_yang_deviations.c
index 251643c69e..c2e7fd91c6 100644
--- a/tools/gen_yang_deviations.c
+++ b/tools/gen_yang_deviations.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 	if (argc != 1)
 		usage(EXIT_FAILURE);
 
-	yang_init(false, false);
+	yang_init(false, false, false);
 
 	/* Load YANG module. */
 	module = yang_module_load(argv[0], NULL);
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 5fb908eb0d..8beae125d2 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -1032,212 +1032,6 @@ netlink_put_intf_update_msg(struct nl_batch *bth, struct zebra_dplane_ctx *ctx)
 	return netlink_batch_add_msg(bth, ctx, netlink_intf_msg_encoder, false);
 }
 
-int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
-{
-	int len;
-	struct ifaddrmsg *ifa;
-	struct rtattr *tb[IFA_MAX + 1];
-	struct interface *ifp;
-	void *addr;
-	void *broad;
-	uint8_t flags = 0;
-	char *label = NULL;
-	struct zebra_ns *zns;
-	uint32_t metric = METRIC_MAX;
-	uint32_t kernel_flags = 0;
-
-	frrtrace(3, frr_zebra, netlink_interface_addr, h, ns_id, startup);
-
-	zns = zebra_ns_lookup(ns_id);
-	ifa = NLMSG_DATA(h);
-
-	if (ifa->ifa_family != AF_INET && ifa->ifa_family != AF_INET6) {
-		flog_warn(
-			EC_ZEBRA_UNKNOWN_FAMILY,
-			"Invalid address family: %u received from kernel interface addr change: %s",
-			ifa->ifa_family, nl_msg_type_to_str(h->nlmsg_type));
-		return 0;
-	}
-
-	if (h->nlmsg_type != RTM_NEWADDR && h->nlmsg_type != RTM_DELADDR)
-		return 0;
-
-	len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifaddrmsg));
-	if (len < 0) {
-		zlog_err(
-			"%s: Message received from netlink is of a broken size: %d %zu",
-			__func__, h->nlmsg_len,
-			(size_t)NLMSG_LENGTH(sizeof(struct ifaddrmsg)));
-		return -1;
-	}
-
-	netlink_parse_rtattr(tb, IFA_MAX, IFA_RTA(ifa), len);
-
-	ifp = if_lookup_by_index_per_ns(zns, ifa->ifa_index);
-	if (ifp == NULL) {
-		if (startup) {
-			/* During startup, failure to lookup the referenced
-			 * interface should not be an error, so we have
-			 * downgraded this condition to warning, and we permit
-			 * the startup interface state retrieval to continue.
-			 */
-			flog_warn(EC_LIB_INTERFACE,
-				  "%s: can't find interface by index %d",
-				  __func__, ifa->ifa_index);
-			return 0;
-		} else {
-			flog_err(EC_LIB_INTERFACE,
-				 "%s: can't find interface by index %d",
-				 __func__, ifa->ifa_index);
-			return -1;
-		}
-	}
-
-	/* Flags passed through */
-	if (tb[IFA_FLAGS])
-		kernel_flags = *(int *)RTA_DATA(tb[IFA_FLAGS]);
-	else
-		kernel_flags = ifa->ifa_flags;
-
-	if (IS_ZEBRA_DEBUG_KERNEL) /* remove this line to see initial ifcfg */
-	{
-		char buf[BUFSIZ];
-		zlog_debug("%s %s %s flags 0x%x:", __func__,
-			   nl_msg_type_to_str(h->nlmsg_type), ifp->name,
-			   kernel_flags);
-		if (tb[IFA_LOCAL])
-			zlog_debug("  IFA_LOCAL     %s/%d",
-				   inet_ntop(ifa->ifa_family,
-					     RTA_DATA(tb[IFA_LOCAL]), buf,
-					     BUFSIZ),
-				   ifa->ifa_prefixlen);
-		if (tb[IFA_ADDRESS])
-			zlog_debug("  IFA_ADDRESS   %s/%d",
-				   inet_ntop(ifa->ifa_family,
-					     RTA_DATA(tb[IFA_ADDRESS]), buf,
-					     BUFSIZ),
-				   ifa->ifa_prefixlen);
-		if (tb[IFA_BROADCAST])
-			zlog_debug("  IFA_BROADCAST %s/%d",
-				   inet_ntop(ifa->ifa_family,
-					     RTA_DATA(tb[IFA_BROADCAST]), buf,
-					     BUFSIZ),
-				   ifa->ifa_prefixlen);
-		if (tb[IFA_LABEL] && strcmp(ifp->name, RTA_DATA(tb[IFA_LABEL])))
-			zlog_debug("  IFA_LABEL     %s",
-				   (char *)RTA_DATA(tb[IFA_LABEL]));
-
-		if (tb[IFA_CACHEINFO]) {
-			struct ifa_cacheinfo *ci = RTA_DATA(tb[IFA_CACHEINFO]);
-			zlog_debug("  IFA_CACHEINFO pref %d, valid %d",
-				   ci->ifa_prefered, ci->ifa_valid);
-		}
-	}
-
-	/* logic copied from iproute2/ip/ipaddress.c:print_addrinfo() */
-	if (tb[IFA_LOCAL] == NULL)
-		tb[IFA_LOCAL] = tb[IFA_ADDRESS];
-	if (tb[IFA_ADDRESS] == NULL)
-		tb[IFA_ADDRESS] = tb[IFA_LOCAL];
-
-	/* local interface address */
-	addr = (tb[IFA_LOCAL] ? RTA_DATA(tb[IFA_LOCAL]) : NULL);
-
-	/* is there a peer address? */
-	if (tb[IFA_ADDRESS]
-	    && memcmp(RTA_DATA(tb[IFA_ADDRESS]), RTA_DATA(tb[IFA_LOCAL]),
-		      RTA_PAYLOAD(tb[IFA_ADDRESS]))) {
-		broad = RTA_DATA(tb[IFA_ADDRESS]);
-		SET_FLAG(flags, ZEBRA_IFA_PEER);
-	} else
-		/* seeking a broadcast address */
-		broad = (tb[IFA_BROADCAST] ? RTA_DATA(tb[IFA_BROADCAST])
-					   : NULL);
-
-	/* addr is primary key, SOL if we don't have one */
-	if (addr == NULL) {
-		zlog_debug("%s: Local Interface Address is NULL for %s",
-			   __func__, ifp->name);
-		return -1;
-	}
-
-	/* Flags. */
-	if (kernel_flags & IFA_F_SECONDARY)
-		SET_FLAG(flags, ZEBRA_IFA_SECONDARY);
-
-	/* Label */
-	if (tb[IFA_LABEL])
-		label = (char *)RTA_DATA(tb[IFA_LABEL]);
-
-	if (label && strcmp(ifp->name, label) == 0)
-		label = NULL;
-
-	if (tb[IFA_RT_PRIORITY])
-		metric = *(uint32_t *)RTA_DATA(tb[IFA_RT_PRIORITY]);
-
-	/* Register interface address to the interface. */
-	if (ifa->ifa_family == AF_INET) {
-		if (ifa->ifa_prefixlen > IPV4_MAX_BITLEN) {
-			zlog_err(
-				"Invalid prefix length: %u received from kernel interface addr change: %s",
-				ifa->ifa_prefixlen,
-				nl_msg_type_to_str(h->nlmsg_type));
-			return -1;
-		}
-
-		if (h->nlmsg_type == RTM_NEWADDR)
-			connected_add_ipv4(ifp, flags, (struct in_addr *)addr,
-					   ifa->ifa_prefixlen,
-					   (struct in_addr *)broad, label,
-					   metric);
-		else if (CHECK_FLAG(flags, ZEBRA_IFA_PEER)) {
-			/* Delete with a peer address */
-			connected_delete_ipv4(
-				ifp, flags, (struct in_addr *)addr,
-				ifa->ifa_prefixlen, broad);
-		} else
-			connected_delete_ipv4(
-				ifp, flags, (struct in_addr *)addr,
-				ifa->ifa_prefixlen, NULL);
-	}
-
-	if (ifa->ifa_family == AF_INET6) {
-		if (ifa->ifa_prefixlen > IPV6_MAX_BITLEN) {
-			zlog_err(
-				"Invalid prefix length: %u received from kernel interface addr change: %s",
-				ifa->ifa_prefixlen,
-				nl_msg_type_to_str(h->nlmsg_type));
-			return -1;
-		}
-		if (h->nlmsg_type == RTM_NEWADDR) {
-			/* Only consider valid addresses; we'll not get a
-			 * notification from
-			 * the kernel till IPv6 DAD has completed, but at init
-			 * time, Quagga
-			 * does query for and will receive all addresses.
-			 */
-			if (!(kernel_flags
-			      & (IFA_F_DADFAILED | IFA_F_TENTATIVE)))
-				connected_add_ipv6(ifp, flags,
-						   (struct in6_addr *)addr,
-						   (struct in6_addr *)broad,
-						   ifa->ifa_prefixlen, label,
-						   metric);
-		} else
-			connected_delete_ipv6(ifp, (struct in6_addr *)addr,
-					      NULL, ifa->ifa_prefixlen);
-	}
-
-	/*
-	 * Linux kernel does not send route delete on interface down/addr del
-	 * so we have to re-process routes it owns (i.e. kernel routes)
-	 */
-	if (h->nlmsg_type != RTM_NEWADDR)
-		rib_update(RIB_UPDATE_KERNEL);
-
-	return 0;
-}
-
 /*
  * Parse and validate an incoming interface address change message,
  * generating a dplane context object.
diff --git a/zebra/if_netlink.h b/zebra/if_netlink.h
index 9b31906a17..dc1f71cb77 100644
--- a/zebra/if_netlink.h
+++ b/zebra/if_netlink.h
@@ -12,9 +12,6 @@
 extern "C" {
 #endif
 
-extern int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id,
-				  int startup);
-
 /*
  * Parse an incoming interface address change message, generate a dplane
  * context object for processing.
diff --git a/zebra/rib.h b/zebra/rib.h
index 071cc7b3de..5fedb07335 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -408,9 +408,6 @@ extern struct route_entry *rib_match_multicast(afi_t afi, vrf_id_t vrf_id,
 					       union g_addr *gaddr,
 					       struct route_node **rn_out);
 
-extern struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p,
-					   vrf_id_t vrf_id);
-
 extern void rib_update(enum rib_update_event event);
 extern void rib_update_table(struct route_table *table,
 			     enum rib_update_event event, int rtype);
diff --git a/zebra/tc_netlink.c b/zebra/tc_netlink.c
index 19667e66ac..3c4db0090c 100644
--- a/zebra/tc_netlink.c
+++ b/zebra/tc_netlink.c
@@ -661,27 +661,6 @@ netlink_put_tc_filter_update_msg(struct nl_batch *bth,
 }
 
 /*
- * Request filters from the kernel
- */
-static int netlink_request_filters(struct zebra_ns *zns, int family, int type,
-				   ifindex_t ifindex)
-{
-	struct {
-		struct nlmsghdr n;
-		struct tcmsg tc;
-	} req;
-
-	memset(&req, 0, sizeof(req));
-	req.n.nlmsg_type = type;
-	req.n.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
-	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct tcmsg));
-	req.tc.tcm_family = family;
-	req.tc.tcm_ifindex = ifindex;
-
-	return netlink_request(&zns->netlink_cmd, &req);
-}
-
-/*
  * Request queue discipline from the kernel
  */
 static int netlink_request_qdiscs(struct zebra_ns *zns, int family, int type)
@@ -852,23 +831,4 @@ int netlink_qdisc_read(struct zebra_ns *zns)
 	return 0;
 }
 
-int netlink_tfilter_read_for_interface(struct zebra_ns *zns, ifindex_t ifindex)
-{
-	int ret;
-	struct zebra_dplane_info dp_info;
-
-	zebra_dplane_info_from_zns(&dp_info, zns, true);
-
-	ret = netlink_request_filters(zns, AF_UNSPEC, RTM_GETTFILTER, ifindex);
-	if (ret < 0)
-		return ret;
-
-	ret = netlink_parse_info(netlink_tfilter_change, &zns->netlink_cmd,
-				 &dp_info, 0, true);
-	if (ret < 0)
-		return ret;
-
-	return 0;
-}
-
 #endif /* HAVE_NETLINK */
diff --git a/zebra/tc_netlink.h b/zebra/tc_netlink.h
index 5e95e6c1d8..300c53b6f5 100644
--- a/zebra/tc_netlink.h
+++ b/zebra/tc_netlink.h
@@ -50,8 +50,6 @@ netlink_put_tc_filter_update_msg(struct nl_batch *bth,
  */
 
 extern int netlink_qdisc_read(struct zebra_ns *zns);
-extern int netlink_tfilter_read_for_interface(struct zebra_ns *zns,
-					      ifindex_t ifindex);
 
 extern int netlink_tfilter_change(struct nlmsghdr *h, ns_id_t ns_id,
 				  int startup);
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index c45c61a208..b13d58f99d 100644
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2477,22 +2477,6 @@ stream_failure:
 	return;
 }
 
-/* Unregister all information in a VRF. */
-static void zread_vrf_unregister(ZAPI_HANDLER_ARGS)
-{
-	int i;
-	afi_t afi;
-
-	for (afi = AFI_IP; afi < AFI_MAX; afi++) {
-		for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
-			vrf_bitmap_unset(&client->redist[afi][i],
-					 zvrf_id(zvrf));
-		vrf_bitmap_unset(&client->redist_default[afi], zvrf_id(zvrf));
-		vrf_bitmap_unset(&client->ridinfo[afi], zvrf_id(zvrf));
-		vrf_bitmap_unset(&client->neighinfo[afi], zvrf_id(zvrf));
-	}
-}
-
 /*
  * Validate incoming zapi mpls lsp / labels message
  */
@@ -4055,7 +4039,6 @@ void (*const zserv_handlers[])(ZAPI_HANDLER_ARGS) = {
 #if HAVE_BFDD > 0
 	[ZEBRA_BFD_DEST_REPLAY] = zebra_ptm_bfd_dst_replay,
 #endif /* HAVE_BFDD */
-	[ZEBRA_VRF_UNREGISTER] = zread_vrf_unregister,
 	[ZEBRA_VRF_LABEL] = zread_vrf_label,
 	[ZEBRA_BFD_CLIENT_REGISTER] = zebra_ptm_bfd_client_register,
 	[ZEBRA_INTERFACE_ENABLE_RADV] = zebra_interface_radv_enable,
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 721eca70a4..2d2be4fc78 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -611,45 +611,6 @@ struct route_entry *rib_match_multicast(afi_t afi, vrf_id_t vrf_id,
 	return re;
 }
 
-struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, vrf_id_t vrf_id)
-{
-	struct route_table *table;
-	struct route_node *rn;
-	struct route_entry *match = NULL;
-	rib_dest_t *dest;
-
-	/* Lookup table.  */
-	table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id);
-	if (!table)
-		return 0;
-
-	rn = route_node_lookup(table, (struct prefix *)p);
-
-	/* No route for this prefix. */
-	if (!rn)
-		return NULL;
-
-	/* Unlock node. */
-	route_unlock_node(rn);
-	dest = rib_dest_from_rnode(rn);
-
-	if (dest && dest->selected_fib
-	    && !CHECK_FLAG(dest->selected_fib->status, ROUTE_ENTRY_REMOVED))
-		match = dest->selected_fib;
-
-	if (!match)
-		return NULL;
-
-	if (match->type == ZEBRA_ROUTE_CONNECT ||
-	    match->type == ZEBRA_ROUTE_LOCAL)
-		return match;
-
-	if (CHECK_FLAG(match->status, ROUTE_ENTRY_INSTALLED))
-		return match;
-
-	return NULL;
-}
-
 /*
  * Is this RIB labeled-unicast? It must be of type BGP and all paths
  * (nexthops) must have a label.
diff --git a/zebra/zebra_trace.h b/zebra/zebra_trace.h
index 17528c4bf1..6451562466 100644
--- a/zebra/zebra_trace.h
+++ b/zebra/zebra_trace.h
@@ -70,20 +70,6 @@ TRACEPOINT_EVENT(
 
 TRACEPOINT_EVENT(
 	frr_zebra,
-	netlink_interface_addr,
-	TP_ARGS(
-		struct nlmsghdr *, header,
-		ns_id_t, ns_id,
-		int, startup),
-	TP_FIELDS(
-		ctf_integer_hex(intptr_t, header, header)
-		ctf_integer(uint32_t, ns_id, ns_id)
-		ctf_integer(uint32_t, startup, startup)
-		)
-	)
-
-TRACEPOINT_EVENT(
-	frr_zebra,
 	netlink_route_change_read_unicast,
 	TP_ARGS(
 		struct nlmsghdr *, header,