diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2021-03-29 14:47:43 +0300 | 
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2021-03-30 11:51:21 +0300 | 
| commit | cbf32f74ef26de9c4b4eaa128b25d35d2c55b809 (patch) | |
| tree | 3784884b4e809eebb8b7df8cc0e911d75c858bfc /ospfd/ospfd.h | |
| parent | 45af60f0bbeadae78ff8f97ea638d3592e7605c9 (diff) | |
ospfd: fix counting of "ip ospf area" commands
Instead of trying to maintain if_ospf_cli_count, let's directly count
the number of configured interfaces when it is needed. Current approach
sometimes leads to an incorrect counter.
Fixes #8321.
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'ospfd/ospfd.h')
| -rw-r--r-- | ospfd/ospfd.h | 6 | 
1 files changed, 1 insertions, 5 deletions
diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h index 5d64ee9ba2..6bf7f4e9fb 100644 --- a/ospfd/ospfd.h +++ b/ospfd/ospfd.h @@ -310,11 +310,6 @@ struct ospf {  	/* Statistics for LSA used for new instantiation. */  	uint32_t rx_lsa_count; -	/* Counter of "ip ospf area x.x.x.x" used -	 * for mutual exclusion of network command under -	 * router ospf or ip ospf area x under interface. */ -	uint32_t if_ospf_cli_count; -  	struct route_table *distance_table;  	/* Used during ospf instance going down send LSDB @@ -650,6 +645,7 @@ extern struct ospf *ospf_new_alloc(unsigned short instance, const char *name);  extern struct ospf *ospf_lookup_by_inst_name(unsigned short instance,  					     const char *name);  extern struct ospf *ospf_lookup_by_vrf_id(vrf_id_t vrf_id); +extern uint32_t ospf_count_area_params(struct ospf *ospf);  extern void ospf_finish(struct ospf *);  extern void ospf_process_refresh_data(struct ospf *ospf, bool reset);  extern void ospf_router_id_update(struct ospf *ospf);  | 
