diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-09-14 09:59:45 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-09-14 09:59:45 +0200 |
| commit | 1518970c128e6ab68884a7f49e09e2dc2a5d9fe3 (patch) | |
| tree | 37abff70b2edc5fcc34b6f93f75abcbd7bfa335f /nest/protocol.h | |
| parent | 878eeec12bf020c9e7460040d225a929bbbd2bd2 (diff) | |
Revert "Routing tables now have their own loops."
This reverts commit 878eeec12bf020c9e7460040d225a929bbbd2bd2.
These changes have been done in a different way in the other branch of
the future merge.
Diffstat (limited to 'nest/protocol.h')
| -rw-r--r-- | nest/protocol.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nest/protocol.h b/nest/protocol.h index 8d077e44..1647fbba 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -18,6 +18,7 @@ struct iface; struct ifa; +struct rtable; struct rte; struct neighbor; struct rta; @@ -206,7 +207,7 @@ struct proto { * rte_remove Called whenever a rte is removed from the routing table. */ - int (*rte_recalculate)(rtable *, struct network *, struct rte *, struct rte *, struct rte *); + int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *); int (*rte_better)(struct rte *, struct rte *); int (*rte_mergable)(struct rte *, struct rte *); void (*rte_insert)(struct network *, struct rte *); @@ -495,7 +496,7 @@ struct channel { const struct channel_class *channel; struct proto *proto; - rtable *table; + struct rtable *table; const struct filter *in_filter; /* Input filter */ const struct filter *out_filter; /* Output filter */ struct bmap export_map; /* Keeps track which routes were really exported */ @@ -555,7 +556,6 @@ struct channel { btime last_state_change; /* Time of last state transition */ struct channel_aux_table *in_table; /* Internal table for received routes */ - struct event in_stopped; /* Import stop callback */ u8 reload_pending; /* Reloading and another reload is scheduled */ u8 refeed_pending; /* Refeeding and another refeed is scheduled */ @@ -570,7 +570,6 @@ struct channel_aux_table { struct channel *c; struct rt_import_request push; struct rt_export_request get; - event push_stopped; rtable *tab; event *stop; u8 refeed_pending; @@ -634,7 +633,7 @@ struct channel_config *proto_cf_find_channel(struct proto_config *p, uint net_ty static inline struct channel_config *proto_cf_main_channel(struct proto_config *pc) { return proto_cf_find_channel(pc, pc->net_type); } -struct channel *proto_find_channel_by_table(struct proto *p, rtable *t); +struct channel *proto_find_channel_by_table(struct proto *p, struct rtable *t); struct channel *proto_find_channel_by_name(struct proto *p, const char *n); struct channel *proto_add_channel(struct proto *p, struct channel_config *cf); int proto_configure_channel(struct proto *p, struct channel **c, struct channel_config *cf); |