diff options
| -rw-r--r-- | ospfd/ospf_vty.c | 2 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index dab7bd4944..0541bfeee7 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -619,7 +619,7 @@ DEFUN (ospf_network_area, ret = ospf_network_set(ospf, &p, area_id, format); if (ret == 0) { vty_out(vty, "There is already same network statement.\n"); - return CMD_WARNING; + return CMD_WARNING_CONFIG_FAILED; } return CMD_SUCCESS; diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index ceb8440eeb..1926197430 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -1031,9 +1031,15 @@ int ospf_network_set(struct ospf *ospf, struct prefix_ipv4 *p, rn = route_node_get(ospf->networks, (struct prefix *)p); if (rn->info) { - /* There is already same network statement. */ + network = rn->info; route_unlock_node(rn); - return 0; + + if (IPV4_ADDR_SAME(&area_id, &network->area_id)) { + return 1; + } else { + /* There is already same network statement. */ + return 0; + } } rn->info = network = ospf_network_new(area_id); |