proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 23:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: clarify interface-level mpls config

Browse Source 
We have both interface-level configuration to enable mpls,
and runtime mpls status. They need to be distinct.

Signed-off-by: Mark Stapp <mjs@labn.net>
This commit is contained in:
Mark Stapp 2023-04-26 15:55:32 -04:00
parent 3895ea777b
commit a32d40a676
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zebra/interface.c
View File

@ -135,6 +135,7 @@ static int if_zebra_new_hook(struct interface *ifp)
zebra_if->ifp = ifp; zebra_if->ifp = ifp;
zebra_if->multicast = IF_ZEBRA_DATA_UNSPEC; zebra_if->multicast = IF_ZEBRA_DATA_UNSPEC;
zebra_if->mpls_config = IF_ZEBRA_DATA_UNSPEC;
zebra_if->shutdown = IF_ZEBRA_DATA_OFF; zebra_if->shutdown = IF_ZEBRA_DATA_OFF;
zebra_if->link_nsid = NS_UNKNOWN; zebra_if->link_nsid = NS_UNKNOWN;
@ -3016,10 +3017,10 @@ DEFPY (mpls,
if (no) { if (no) {
dplane_intf_mpls_modify_state(ifp, false); dplane_intf_mpls_modify_state(ifp, false);
if_data->mpls = IF_ZEBRA_DATA_UNSPEC; if_data->mpls_config = IF_ZEBRA_DATA_UNSPEC;
} else { } else {
dplane_intf_mpls_modify_state(ifp, true); dplane_intf_mpls_modify_state(ifp, true);
if_data->mpls = IF_ZEBRA_DATA_ON; if_data->mpls_config = IF_ZEBRA_DATA_ON;
} }
return CMD_SUCCESS; return CMD_SUCCESS;
@ -4859,7 +4860,8 @@ static int if_config_write(struct vty *vty)
IF_ZEBRA_DATA_ON IF_ZEBRA_DATA_ON
? "" ? ""
: "no "); : "no ");
if (if_data->mpls == IF_ZEBRA_DATA_ON)
if (if_data->mpls_config == IF_ZEBRA_DATA_ON)
vty_out(vty, " mpls enable\n"); vty_out(vty, " mpls enable\n");
} }

3
zebra/interface.h
View File

@ -114,6 +114,9 @@ struct zebra_if {
/* MPLS status. */ /* MPLS status. */
bool mpls; bool mpls;
/* MPLS configuration */
uint8_t mpls_config;
/* Linkdown status */ /* Linkdown status */
bool linkdown, linkdownv6; bool linkdown, linkdownv6;