proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 11:18:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ospfd] misc small fixes. Fix default stub router setting. no opaque compile.

Browse Source 
2005-11-14 Paul Jakma <paul.jakma@sun.com>

	* ospfd.c: (ospf_new) stub-shutdown should just default to
	  unconfigured, too strange otherwise.
	  (ospf_finish_final) t_opaque_lsa_self TIMER_OFF should be
	  preprocessor conditional on HAVE_OPAQUE_LSA.
	* ospfd.h: (struct ospf) remove the SHUTDOWN_DEFAULT define.
	  no longer used, plus it wasn't in range that the command
	  accepted.
	* ospf_zebra.h: Depends on vty.h, include it.
This commit is contained in:
paul 2005-11-14 11:11:11 +00:00
parent 6fe70d1b35
commit 31a5976bb9
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ospfd/ChangeLog
View File

@ -1,3 +1,14 @@
2005-11-14 Paul Jakma <paul.jakma@sun.com>
* ospfd.c: (ospf_new) stub-shutdown should just default to
unconfigured, too strange otherwise.
(ospf_finish_final) t_opaque_lsa_self TIMER_OFF should be
preprocessor conditional on HAVE_OPAQUE_LSA.
* ospfd.h: (struct ospf) remove the SHUTDOWN_DEFAULT define.
no longer used, plus it wasn't in range that the command
accepted.
* ospf_zebra.h: Depends on vty.h, include it.
2005-11-11 Paul Jakma <paul.jakma@sun.com> 2005-11-11 Paul Jakma <paul.jakma@sun.com>
* ospf_spf.c: (ospf_canonical_nexthops_free) Free only * ospf_spf.c: (ospf_canonical_nexthops_free) Free only

2
ospfd/ospf_zebra.h
View File

@ -23,6 +23,8 @@
#ifndef _ZEBRA_OSPF_ZEBRA_H #ifndef _ZEBRA_OSPF_ZEBRA_H
#define _ZEBRA_OSPF_ZEBRA_H #define _ZEBRA_OSPF_ZEBRA_H
#include "vty.h"
#define EXTERNAL_METRIC_TYPE_1 0 #define EXTERNAL_METRIC_TYPE_1 0
#define EXTERNAL_METRIC_TYPE_2 1 #define EXTERNAL_METRIC_TYPE_2 1

4
ospfd/ospfd.c
View File

@ -175,7 +175,7 @@ ospf_new (void)
new->external_lsas = route_table_init (); new->external_lsas = route_table_init ();
new->stub_router_startup_time = OSPF_STUB_ROUTER_UNCONFIGURED; new->stub_router_startup_time = OSPF_STUB_ROUTER_UNCONFIGURED;
new->stub_router_shutdown_time = OSPF_STUB_ROUTER_SHUTDOWN_DEFAULT; new->stub_router_shutdown_time = OSPF_STUB_ROUTER_UNCONFIGURED;
/* Distribute parameter init. */ /* Distribute parameter init. */
for (i = 0; i <= ZEBRA_ROUTE_MAX; i++) for (i = 0; i <= ZEBRA_ROUTE_MAX; i++)
@ -466,7 +466,9 @@ ospf_finish_final (struct ospf *ospf)
OSPF_TIMER_OFF (ospf->t_lsa_refresher); OSPF_TIMER_OFF (ospf->t_lsa_refresher);
OSPF_TIMER_OFF (ospf->t_read); OSPF_TIMER_OFF (ospf->t_read);
OSPF_TIMER_OFF (ospf->t_write); OSPF_TIMER_OFF (ospf->t_write);
#ifdef HAVE_OPAQUE_LSA
OSPF_TIMER_OFF (ospf->t_opaque_lsa_self); OSPF_TIMER_OFF (ospf->t_opaque_lsa_self);
#endif
close (ospf->fd); close (ospf->fd);
stream_free(ospf->ibuf); stream_free(ospf->ibuf);

1
ospfd/ospfd.h
View File

@ -198,7 +198,6 @@ struct ospf
unsigned int stub_router_startup_time; /* seconds */ unsigned int stub_router_startup_time; /* seconds */
unsigned int stub_router_shutdown_time; /* seconds */ unsigned int stub_router_shutdown_time; /* seconds */
#define OSPF_STUB_ROUTER_UNCONFIGURED 0 #define OSPF_STUB_ROUTER_UNCONFIGURED 0
#define OSPF_STUB_ROUTER_SHUTDOWN_DEFAULT 2
/* SPF parameters */ /* SPF parameters */
unsigned int spf_delay; /* SPF delay time. */ unsigned int spf_delay; /* SPF delay time. */