diff options
| author | David Lamparter <equinox@diac24.net> | 2019-07-29 12:27:25 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-08-02 11:29:03 +0200 |
| commit | fa3c7c7e95638fcafef24fffcd0c49f1b11cc64d (patch) | |
| tree | 30a2e1660dd70b3c3f44f33bcdeeddf87e5a036e /ospfd/ospf_zebra.c | |
| parent | e8a2cc5323a369d9da23336063c3ee4f73fed6a1 (diff) | |
ospfd: kill totally misnamed "timers"
Neither ospf_external_lsa_originate_timer() nor
ospf_default_originate_timer() are actually timers. They're only
executed on router-ID changes to refresh a particular LSA type.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'ospfd/ospf_zebra.c')
| -rw-r--r-- | ospfd/ospf_zebra.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 951402f47f..c72e5c2d37 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -765,8 +765,6 @@ int ospf_redistribute_default_set(struct ospf *ospf, int originate, int mtype, metric_type(ospf, DEFAULT_ROUTE, 0), metric_value(ospf, DEFAULT_ROUTE, 0)); - if (ospf->router_id.s_addr == 0) - ospf->external_origin |= (1 << DEFAULT_ROUTE); if ((originate == DEFAULT_ORIGINATE_ALWAYS) && (ospf->router_id.s_addr)) { @@ -1067,11 +1065,7 @@ static int ospf_zebra_read_route(ZAPI_CALLBACK_ARGS) /* Nothing has changed, so nothing to do; return */ return 0; } - if (ospf->router_id.s_addr == 0) - /* Set flags to generate AS-external-LSA originate event - for each redistributed protocols later. */ - ospf->external_origin |= (1 << rt_type); - else { + if (ospf->router_id.s_addr != 0) { if (ei) { if (is_prefix_default(&p)) ospf_external_lsa_refresh_default(ospf); |