proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 06:34:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a running flag in ospf instance.

Browse Source 
set/reset it on 'router ospf [<instance>]'/'no router ospf [<instance>]'
This commit is contained in:
Donald Sharp 2015-05-19 18:03:54 -07:00
parent 9a233a02be
commit 0bad48516f
3 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ospfd/ospf_vty.c
View File

@ -169,7 +169,13 @@ DEFUN (router_ospf,
if (ospf->instance != instance)
vty->index = NULL;
else
vty->index = ospf;
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Config command 'router ospf %d' received", instance);
ospf->oi_running = 1;
vty->index = ospf;
ospf_router_id_update (ospf);
}
return CMD_SUCCESS;
}
@ -3062,7 +3068,7 @@ DEFUN (show_ip_ospf,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_common(vty, ospf));
@ -3080,7 +3086,7 @@ DEFUN (show_ip_ospf_instance,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance (instance)) == NULL)
if ((ospf = ospf_lookup_instance (instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_common(vty, ospf));
@ -3295,7 +3301,7 @@ DEFUN (show_ip_ospf_interface,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_interface_common(vty, ospf, 0, argc, argv);
@ -3315,7 +3321,7 @@ DEFUN (show_ip_ospf_instance_interface,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance (instance)) == NULL)
if ((ospf = ospf_lookup_instance (instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_interface_common(vty, ospf, 1, argc, argv);
@ -3398,7 +3404,7 @@ DEFUN (show_ip_ospf_neighbor,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_common(vty, ospf);
@ -3418,7 +3424,7 @@ DEFUN (show_ip_ospf_instance_neighbor,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance(instance)) == NULL)
if ((ospf = ospf_lookup_instance(instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_common(vty, ospf);
@ -3473,7 +3479,7 @@ DEFUN (show_ip_ospf_neighbor_all,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_all_common(vty, ospf);
@ -3493,7 +3499,7 @@ DEFUN (show_ip_ospf_instance_neighbor_all,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance(instance)) == NULL)
if ((ospf = ospf_lookup_instance(instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_all_common(vty, ospf);
@ -3542,7 +3548,7 @@ DEFUN (show_ip_ospf_neighbor_int,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_int_common(vty, ospf, 0, argv);
@ -3562,7 +3568,7 @@ DEFUN (show_ip_ospf_instance_neighbor_int,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance(instance)) == NULL)
if ((ospf = ospf_lookup_instance(instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_int_common(vty, ospf, 1, argv);
@ -3717,7 +3723,7 @@ DEFUN (show_ip_ospf_neighbor_id,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_id_common(vty, ospf, 0, argv);
@ -3737,7 +3743,7 @@ DEFUN (show_ip_ospf_instance_neighbor_id,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance(instance)) == NULL)
if ((ospf = ospf_lookup_instance(instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_id_common(vty, ospf, 1, argv);
@ -3779,7 +3785,7 @@ DEFUN (show_ip_ospf_neighbor_detail,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_detail_common(vty, ospf);
@ -3799,7 +3805,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance (instance)) == NULL)
if ((ospf = ospf_lookup_instance (instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_detail_common(vty, ospf);
@ -3853,7 +3859,7 @@ DEFUN (show_ip_ospf_neighbor_detail_all,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_detail_all_common(vty, ospf);
@ -3874,7 +3880,7 @@ DEFUN (show_ip_ospf_instance_neighbor_detail_all,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance(instance)) == NULL)
if ((ospf = ospf_lookup_instance(instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_detail_all_common(vty, ospf);
@ -3923,7 +3929,7 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_int_detail_common(vty, ospf, 0, argv);
@ -3944,7 +3950,7 @@ DEFUN (show_ip_ospf_instance_neighbor_int_detail,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance(instance)) == NULL)
if ((ospf = ospf_lookup_instance(instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_neighbor_int_detail_common(vty, ospf, 1, argv);
@ -4702,7 +4708,7 @@ DEFUN (show_ip_ospf_database,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_database_common(vty, ospf, 0, argc, argv));
@ -4767,7 +4773,7 @@ DEFUN (show_ip_ospf_instance_database,
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance (instance)) == NULL)
if ((ospf = ospf_lookup_instance (instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_database_common(vty, ospf, 1, argc, argv));
@ -4892,7 +4898,7 @@ DEFUN (show_ip_ospf_database_type_adv_router,
{
struct ospf *ospf;
if ((ospf = ospf_lookup()) == NULL)
if ((ospf = ospf_lookup()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_database_type_adv_router_common(vty, ospf, 0, argc, argv));
@ -4925,7 +4931,7 @@ DEFUN (show_ip_ospf_instance_database_type_adv_router,
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance (instance)) == NULL)
if ((ospf = ospf_lookup_instance (instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return (show_ip_ospf_database_type_adv_router_common(vty, ospf, 1, argc, argv));
@ -7620,7 +7626,7 @@ DEFUN (show_ip_ospf_border_routers,
{
struct ospf *ospf;
if ((ospf = ospf_lookup ()) == NULL)
if ((ospf = ospf_lookup ()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_border_routers_common(vty, ospf);
@ -7639,7 +7645,7 @@ DEFUN (show_ip_ospf_instance_border_routers,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance (instance)) == NULL)
if ((ospf = ospf_lookup_instance (instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_border_routers_common(vty, ospf);
@ -7682,7 +7688,7 @@ DEFUN (show_ip_ospf_route,
{
struct ospf *ospf;
if ((ospf = ospf_lookup ()) == NULL)
if ((ospf = ospf_lookup ()) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_route_common(vty, ospf);
@ -7701,7 +7707,7 @@ DEFUN (show_ip_ospf_instance_route,
u_short instance = 0;
VTY_GET_INTEGER ("Instance", instance, argv[0]);
if ((ospf = ospf_lookup_instance (instance)) == NULL)
if ((ospf = ospf_lookup_instance (instance)) == NULL || !ospf->oi_running)
return CMD_SUCCESS;
return show_ip_ospf_route_common(vty, ospf);
@ -8325,7 +8331,7 @@ ospf_config_write (struct vty *vty)
int write = 0;
ospf = ospf_lookup ();
if (ospf != NULL)
if (ospf != NULL && ospf->oi_running)
{
/* `router ospf' print. */
if (ospf->instance)

32
ospfd/ospfd.c
View File

@ -85,6 +85,13 @@ ospf_router_id_update (struct ospf *ospf)
struct interface *ifp;
struct listnode *node;
if (!ospf->oi_running)
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Router ospf not configured -- Router-ID update postponed");
return;
}
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Router-ID[OLD:%s]: Update", inet_ntoa (ospf->router_id));
@ -828,15 +835,6 @@ add_ospf_interface (struct interface *ifp, struct ospf_area *area,
ospf_area_add_if (oi->area, oi);
/* if router_id is not configured, dont bring up
* interfaces.
* ospf_router_id_update() will call ospf_if_update
* whenever r-id is configured instead.
*/
if ((area->ospf->router_id.s_addr != 0)
&& if_is_operative (ifp))
ospf_if_up (oi);
return (oi);
}
@ -989,6 +987,7 @@ ospf_interface_set (struct interface *ifp, struct in_addr area_id)
struct connected *co;
struct ospf *ospf;
struct ospf_if_params *params;
struct ospf_interface *oi;
int ret = OSPF_AREA_ID_FORMAT_ADDRESS;
if ((ospf = ospf_lookup ()) == NULL)
@ -1006,10 +1005,19 @@ ospf_interface_set (struct interface *ifp, struct in_addr area_id)
if (CHECK_FLAG(co->flags,ZEBRA_IFA_SECONDARY))
continue;
if (co->address->family == AF_INET
&& !ospf_if_table_lookup(ifp, co->address))
if (co->address->family == AF_INET)
{
add_ospf_interface(ifp, area, co);
oi = ospf_if_table_lookup(ifp, co->address);
if (!oi)
oi = add_ospf_interface(ifp, area, co);
/* if router_id is not configured, dont bring up
* interfaces.
* ospf_router_id_update() will call ospf_if_update
* whenever r-id is configured instead.
*/
if ((area->ospf->router_id.s_addr != 0) && if_is_operative (ifp))
ospf_if_up (oi);
}
}

3
ospfd/ospfd.h
View File

@ -131,6 +131,9 @@ struct ospf_redist
/* OSPF instance structure. */
struct ospf
{
/* OSPF's running state based on the '[no] router ospf [<instance>]' config. */
u_char oi_running;
/* OSPF instance ID */
u_short instance;