New version 10.0.1

0006-noprefixroute-network-manager.patch

@@ -0,0 +1,167 @@
+--- b/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
++++ a/tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
+@@ -144,23 +144,6 @@
+     assert result is None, "Kernel route is missing from zebra"
+ 
+ 
+-def test_zebra_noprefix_connected():
+-    "Test that a noprefixroute created does not create a connected route"
+-
+-    tgen = get_topogen()
+-    if tgen.routers_have_failure():
+-        pytest.skip(tgen.errors)
+-
+-    router = tgen.gears["r1"]
+-    router.run("ip addr add 192.168.44.1/24 dev r1-eth1 noprefixroute")
+-    expected = "% Network not in table"
+-    test_func = partial(
+-        topotest.router_output_cmp, router, "show ip route 192.168.44.0/24", expected
+-    )
+-    result, diff = topotest.run_and_expect(test_func, "", count=20, wait=1)
+-    assert result, "Connected Route should not have been added"
+-
+-
+ if __name__ == "__main__":
+     args = ["-s"] + sys.argv[1:]
+     sys.exit(pytest.main(args))
+--- b/zebra/if_netlink.c
++++ a/zebra/if_netlink.c
+@@ -1423,9 +1423,6 @@
+ 	if (kernel_flags & IFA_F_SECONDARY)
+ 		dplane_ctx_intf_set_secondary(ctx);
+ 
+-	if (kernel_flags & IFA_F_NOPREFIXROUTE)
+-		dplane_ctx_intf_set_noprefixroute(ctx);
+-
+ 	/* Label */
+ 	if (tb[IFA_LABEL]) {
+ 		label = (char *)RTA_DATA(tb[IFA_LABEL]);
+--- b/zebra/zebra_dplane.c
++++ a/zebra/zebra_dplane.c
+@@ -230,7 +230,6 @@
+ #define DPLANE_INTF_BROADCAST   (1 << 2)
+ #define DPLANE_INTF_HAS_DEST    DPLANE_INTF_CONNECTED
+ #define DPLANE_INTF_HAS_LABEL   (1 << 4)
+-#define DPLANE_INTF_NOPREFIXROUTE (1 << 5)
+ 
+ 	/* Interface address/prefix */
+ 	struct prefix prefix;
+@@ -2542,13 +2541,6 @@
+ 	return (ctx->u.intf.flags & DPLANE_INTF_CONNECTED);
+ }
+ 
+-bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx)
+-{
+-	DPLANE_CTX_VALID(ctx);
+-
+-	return (ctx->u.intf.flags & DPLANE_INTF_NOPREFIXROUTE);
+-}
+-
+ bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx)
+ {
+ 	DPLANE_CTX_VALID(ctx);
+@@ -2577,13 +2569,6 @@
+ 	ctx->u.intf.flags |= DPLANE_INTF_SECONDARY;
+ }
+ 
+-void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx)
+-{
+-	DPLANE_CTX_VALID(ctx);
+-
+-	ctx->u.intf.flags |= DPLANE_INTF_NOPREFIXROUTE;
+-}
+-
+ void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx)
+ {
+ 	DPLANE_CTX_VALID(ctx);
+--- b/zebra/zebra_dplane.h
++++ a/zebra/zebra_dplane.h
+@@ -658,8 +658,6 @@
+ void dplane_ctx_intf_set_connected(struct zebra_dplane_ctx *ctx);
+ bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx);
+ void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx);
+-bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx);
+-void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx);
+ bool dplane_ctx_intf_is_broadcast(const struct zebra_dplane_ctx *ctx);
+ void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx);
+ const struct prefix *dplane_ctx_get_intf_addr(
+--- b/lib/if.h
++++ a/lib/if.h
+@@ -434,8 +434,6 @@
+ #define ZEBRA_IFA_SECONDARY    (1 << 0)
+ #define ZEBRA_IFA_PEER         (1 << 1)
+ #define ZEBRA_IFA_UNNUMBERED   (1 << 2)
+-#define ZEBRA_IFA_NOPREFIXROUTE (1 << 3)
+-
+ 	/* N.B. the ZEBRA_IFA_PEER flag should be set if and only if
+ 	   a peer address has been configured.  If this flag is set,
+ 	   the destination field must contain the peer address.
+--- b/zebra/connected.c
++++ a/zebra/connected.c
+@@ -282,15 +282,13 @@
+ 			return;
+ 	}
+ 
++	rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
++		flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0,
++		false);
+-	if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) {
+-		rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
+-			ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0,
+-			zvrf->table_id, metric, 0, 0, 0, false);
+ 
++	rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
++		flags, &p, NULL, &nh, 0, zvrf->table_id, metric, 0, 0, 0,
++		false);
+-		rib_add(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id,
+-			ZEBRA_ROUTE_CONNECT, 0, flags, &p, NULL, &nh, 0,
+-			zvrf->table_id, metric, 0, 0, 0, false);
+-	}
+ 
+ 	if (install_local) {
+ 		rib_add(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_LOCAL,
+@@ -483,15 +481,11 @@
+ 	 * Same logic as for connected_up(): push the changes into the
+ 	 * head.
+ 	 */
++	rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
++		   0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
+-	if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_NOPREFIXROUTE)) {
+-		rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
+-			   ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0,
+-			   zvrf->table_id, 0, 0, false);
+ 
++	rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT,
++		   0, 0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
+-		rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id,
+-			   ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0,
+-			   zvrf->table_id, 0, 0, false);
+-	}
+ 
+ 	if (remove_local) {
+ 		rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
+--- b/zebra/interface.c
++++ a/zebra/interface.c
+@@ -1317,9 +1317,6 @@
+ 	if (dplane_ctx_intf_is_secondary(ctx))
+ 		SET_FLAG(flags, ZEBRA_IFA_SECONDARY);
+ 
+-	if (dplane_ctx_intf_is_noprefixroute(ctx))
+-		SET_FLAG(flags, ZEBRA_IFA_NOPREFIXROUTE);
+-
+ 	/* Label? */
+ 	if (dplane_ctx_intf_has_label(ctx))
+ 		label = dplane_ctx_get_intf_label(ctx);
+@@ -2337,12 +2334,6 @@
+ 	else if (CHECK_FLAG(connected->flags, ZEBRA_IFA_SECONDARY))
+ 		vty_out(vty, " secondary");
+ 
+-	if (json)
+-		json_object_boolean_add(json_addr, "noPrefixRoute",
+-					CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE));
+-	else if (CHECK_FLAG(connected->flags, ZEBRA_IFA_NOPREFIXROUTE))
+-		vty_out(vty, " noprefixroute");
+-
+ 	if (json)
+ 		json_object_boolean_add(
+ 			json_addr, "unnumbered",