proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 10:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15188 from opensourcerouting/fix/revert_noprefixroute_9.1

Browse Source 
Revert noprefixroute stuff
This commit is contained in:
Donald Sharp 2024-01-23 13:58:02 -05:00 committed by GitHub
commit b1107dcbac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/if.h
View File

@ -420,8 +420,6 @@ struct connected {
#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.

17
tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
View File

@ -144,23 +144,6 @@ def test_zebra_system_recursion():
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))

26
zebra/connected.c
View File

@ -276,15 +276,13 @@ void connected_up(struct interface *ifp, struct connected *ifc)
return;
}
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_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);
/* Schedule LSP forwarding entries for processing, if appropriate. */
if (zvrf->vrf->vrf_id == VRF_DEFAULT) {
@ -459,15 +457,11 @@ void connected_down(struct interface *ifp, struct connected *ifc)
* Same logic as for connected_up(): push the changes into the
* head.
*/
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_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);
/* Schedule LSP forwarding entries for processing, if appropriate. */
if (zvrf->vrf->vrf_id == VRF_DEFAULT) {

3
zebra/if_netlink.c
View File

@ -1474,9 +1474,6 @@ int netlink_interface_addr_dplane(struct nlmsghdr *h, ns_id_t ns_id,
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]);

9
zebra/interface.c
View File

@ -1331,9 +1331,6 @@ static void zebra_if_addr_update_ctx(struct zebra_dplane_ctx *ctx,
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);
@ -2410,12 +2407,6 @@ static void connected_dump_vty(struct vty *vty, json_object *json,
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",

15
zebra/zebra_dplane.c
View File

@ -230,7 +230,6 @@ struct dplane_intf_info {
#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 @@ bool dplane_ctx_intf_is_connected(const struct zebra_dplane_ctx *ctx)
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 @@ void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx)
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);

2
zebra/zebra_dplane.h
View File

@ -658,8 +658,6 @@ bool dplane_ctx_intf_is_connected(const struct zebra_dplane_ctx *ctx);
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(