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

Merge pull request #1477 from chiragshah6/ospf_vrf_dev

Browse Source 
ospfd: Forward reference ospf area config
This commit is contained in:
Russ White 2017-11-29 07:39:35 -05:00 committed by GitHub
commit 074f2a3789
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ospfd/ospf_vty.c
View File

@ -201,6 +201,9 @@ DEFUN_NOSH (router_ospf,
struct ospf *ospf = NULL; struct ospf *ospf = NULL;
int ret = CMD_SUCCESS; int ret = CMD_SUCCESS;
u_short instance = 0; u_short instance = 0;
struct vrf *vrf = NULL;
struct route_node *rn;
struct interface *ifp;
ospf = ospf_cmd_lookup_ospf(vty, argv, argc, 1, &instance); ospf = ospf_cmd_lookup_ospf(vty, argv, argc, 1, &instance);
if (!ospf) if (!ospf)
@ -219,6 +222,34 @@ DEFUN_NOSH (router_ospf,
instance, ospf->name ? ospf->name : "NIL", instance, ospf->name ? ospf->name : "NIL",
ospf->vrf_id, ospf->oi_running); ospf->vrf_id, ospf->oi_running);
VTY_PUSH_CONTEXT(OSPF_NODE, ospf); VTY_PUSH_CONTEXT(OSPF_NODE, ospf);
/* Activate 'ip ospf area x' configured interfaces for given
* vrf. Activate area on vrf x aware interfaces.
* vrf_enable callback calls router_id_update which
* internally will call ospf_if_update to trigger
* network_run_state
*/
vrf = vrf_lookup_by_id(ospf->vrf_id);
FOR_ALL_INTERFACES (vrf, ifp) {
struct ospf_if_params *params;
params = IF_DEF_PARAMS(ifp);
if (OSPF_IF_PARAM_CONFIGURED(params, if_area)) {
for (rn = route_top(ospf->networks); rn;
rn = route_next(rn)) {
if (rn->info != NULL) {
vty_out(vty,
"Interface %s has area config but please remove all network commands first.\n",
ifp->name);
return ret;
}
}
ospf_interface_area_set(ospf, ifp);
ospf->if_ospf_cli_count++;
}
}
ospf_router_id_update(ospf); ospf_router_id_update(ospf);
} }
@ -570,6 +601,11 @@ DEFUN (ospf_network_area,
if (ospf->if_ospf_cli_count > 0) { if (ospf->if_ospf_cli_count > 0) {
vty_out(vty, vty_out(vty,
"Please remove all ip ospf area x.x.x.x commands first.\n"); "Please remove all ip ospf area x.x.x.x commands first.\n");
if (IS_DEBUG_OSPF_EVENT)
zlog_debug("%s ospf vrf %s num of %u ip osp area x config",
__PRETTY_FUNCTION__,
ospf->name ? ospf->name : "NIL",
ospf->if_ospf_cli_count);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -7926,7 +7962,7 @@ DEFUN (ip_ospf_area,
else else
ospf = ospf_lookup_instance(instance); ospf = ospf_lookup_instance(instance);
if (ospf == NULL) { if (instance && ospf == NULL) {
params = IF_DEF_PARAMS(ifp); params = IF_DEF_PARAMS(ifp);
if (OSPF_IF_PARAM_CONFIGURED(params, if_area)) { if (OSPF_IF_PARAM_CONFIGURED(params, if_area)) {
UNSET_IF_PARAM(params, if_area); UNSET_IF_PARAM(params, if_area);
@ -7971,6 +8007,7 @@ DEFUN (ip_ospf_area,
ospf_if_update_params((ifp), (addr)); ospf_if_update_params((ifp), (addr));
} }
if (ospf) {
for (rn = route_top(ospf->networks); rn; rn = route_next(rn)) { for (rn = route_top(ospf->networks); rn; rn = route_next(rn)) {
if (rn->info != NULL) { if (rn->info != NULL) {
vty_out(vty, vty_out(vty,
@ -7978,6 +8015,7 @@ DEFUN (ip_ospf_area,
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
} }
}
/* enable ospf on this interface with area_id */ /* enable ospf on this interface with area_id */
if (params) { if (params) {
@ -7985,8 +8023,11 @@ DEFUN (ip_ospf_area,
params->if_area = area_id; params->if_area = area_id;
params->if_area_id_fmt = format; params->if_area_id_fmt = format;
} }
if (ospf) {
ospf_interface_area_set(ospf, ifp); ospf_interface_area_set(ospf, ifp);
ospf->if_ospf_cli_count++; ospf->if_ospf_cli_count++;
}
return CMD_SUCCESS; return CMD_SUCCESS;
} }

4
ospfd/ospfd.h
View File

@ -300,7 +300,9 @@ struct ospf {
/* Statistics for LSA used for new instantiation. */ /* Statistics for LSA used for new instantiation. */
u_int32_t rx_lsa_count; u_int32_t rx_lsa_count;
/* Counter of "ip ospf area x.x.x.x" */ /* Counter of "ip ospf area x.x.x.x" used
* for multual exclusion of network command under
* router ospf or ip ospf area x under interface. */
u_int32_t if_ospf_cli_count; u_int32_t if_ospf_cli_count;
struct route_table *distance_table; struct route_table *distance_table;