summaryrefslogtreecommitdiffstats
path: root/pbrd
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2021-08-08 21:38:50 +0200
committerIgor Ryzhov <iryzhov@nfware.com>2021-08-23 21:08:20 +0200
commit07679ad98ab97a4b783f7ae54f88d4d70a5729de (patch)
treee2a670c3a68fb5b856cd52426c2f0b972a414bcb /pbrd
parentpathd: rework config printing code (diff)
downloadfrr-07679ad98ab97a4b783f7ae54f88d4d70a5729de.tar.xz
frr-07679ad98ab97a4b783f7ae54f88d4d70a5729de.zip
*: explicitly print "exit" at the end of every node config
There is a possibility that the same line can be matched as a command in some node and its parent node. In this case, when reading the config, this line is always executed as a command of the child node. For example, with the following config: ``` router ospf network 193.168.0.0/16 area 0 ! mpls ldp discovery hello interval 111 ! ``` Line `mpls ldp` is processed as command `mpls ldp-sync` inside the `router ospf` node. This leads to a complete loss of `mpls ldp` node configuration. To eliminate this issue and all possible similar issues, let's print an explicit "exit" at the end of every node config. This commit also changes indentation for a couple of existing exit commands so that all existing commands are on the same level as their corresponding node-entering commands. Fixes #9206. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'pbrd')
-rw-r--r--pbrd/pbr_vty.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
index 2936d1e34..6c007acb5 100644
--- a/pbrd/pbr_vty.c
+++ b/pbrd/pbr_vty.c
@@ -1118,7 +1118,7 @@ static int pbr_interface_config_write(struct vty *vty)
pbr_map_write_interfaces(vty, ifp);
- vty_endframe(vty, "!\n");
+ vty_endframe(vty, "exit\n!\n");
}
}
@@ -1184,6 +1184,7 @@ static int pbr_vty_map_config_write_sequence(struct vty *vty,
pbrms_nexthop_group_write_individual_nexthop(vty, pbrms);
}
+ vty_out(vty, "exit\n");
vty_out(vty, "!\n");
return 1;
}