diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-08-02 22:08:59 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-08-02 22:08:59 +0200 |
| commit | 71b434a987067475b517792360f58dbe03bfee9e (patch) | |
| tree | a6bad599a80fd6dd16b0117f16e95a5c213cfe8d /proto/ospf/ospf.c | |
| parent | 0072d11f3431165240656edf6ade473554b8747e (diff) | |
| parent | f0507f05ce57398e135651896dace4cb68eeed54 (diff) | |
Merge commit 'f0507f05ce57398e135651896dace4cb68eeed54' into thread-next
Diffstat (limited to 'proto/ospf/ospf.c')
| -rw-r--r-- | proto/ospf/ospf.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index 9c25f0f0..4e29f960 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -377,8 +377,8 @@ ospf_init(struct proto_config *CF) P->reload_routes = ospf_reload_routes; P->feed_begin = ospf_feed_begin; P->feed_end = ospf_feed_end; - P->rte_better = ospf_rte_better; - P->rte_igp_metric = ospf_rte_igp_metric; + + P->sources.class = &ospf_rte_owner_class; return P; } @@ -492,7 +492,7 @@ ospf_preexport(struct channel *C, rte *e) struct ospf_area *oa = ospf_main_area(p); /* Reject our own routes */ - if (e->src->proto == &p->p) + if (e->sender == C->in_req.hook) return -1; /* Do not export routes to stub areas */ @@ -1506,6 +1506,12 @@ ospf_sh_lsadb(struct lsadb_show_data *ld) } +struct rte_owner_class ospf_rte_owner_class = { + .get_route_info = ospf_get_route_info, + .rte_better = ospf_rte_better, + .rte_igp_metric = ospf_rte_igp_metric, +}; + struct protocol proto_ospf = { .name = "OSPF", .template = "ospf%d", @@ -1519,7 +1525,6 @@ struct protocol proto_ospf = { .shutdown = ospf_shutdown, .reconfigure = ospf_reconfigure, .get_status = ospf_get_status, - .get_route_info = ospf_get_route_info }; struct ea_class ea_ospf_metric1 = { |