From: Emanuele Di Pascale Date: Fri, 18 Jan 2019 11:39:28 +0000 (+0100) Subject: ospfd: fix no virtual-link cmd X-Git-Tag: frr-7.1~334^2 X-Git-Url: https://git.proxmox.com/?p=mirror_frr.git;a=commitdiff_plain;h=188823b0809f54158b9565d8284279c0ac12683d ospfd: fix no virtual-link cmd the command was not checking correctly in all cases whether the virtual link existed. This caused bugs in some corner cases, e.g. when two virtual links were created, one of them was deleted, and the second one was reset with no authentication - this would instead create a new virtual link with the area in decimal format. Signed-off-by: Emanuele Di Pascale --- diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 3ab9c018e..c1dc1f0d6 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -1205,14 +1205,17 @@ DEFUN (no_ospf_area_vlink, return CMD_WARNING_CONFIG_FAILED; } + vl_data = ospf_vl_lookup(ospf, area, vl_config.vl_peer); + if (!vl_data) { + vty_out(vty, "Virtual link does not exist\n"); + return CMD_WARNING_CONFIG_FAILED; + } + if (argc <= 5) { /* Basic VLink no command */ /* Thats all folks! - BUGS B. strikes again!!!*/ - if ((vl_data = ospf_vl_lookup(ospf, area, vl_config.vl_peer))) - ospf_vl_delete(ospf, vl_data); - + ospf_vl_delete(ospf, vl_data); ospf_area_check_free(ospf, vl_config.area_id); - return CMD_SUCCESS; }