From 4bdf1881dc6230b742d7efcaad8eeac4ed25f445 Mon Sep 17 00:00:00 2001 From: Jan Moskyto Matejka Date: Mon, 4 Apr 2016 16:17:11 +0200 Subject: [PATCH] Channelize: rt_notify arg conversion table -> channel --- nest/proto-hooks.c | 2 +- nest/protocol.h | 2 +- nest/rt-table.c | 8 ++++---- proto/ospf/topology.c | 2 +- proto/ospf/topology.h | 2 +- proto/pipe/pipe.c | 8 ++++---- proto/radv/radv.c | 2 +- proto/rip/rip.c | 2 +- sysdep/unix/krt.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nest/proto-hooks.c b/nest/proto-hooks.c index e80f87ea..5923ff67 100644 --- a/nest/proto-hooks.c +++ b/nest/proto-hooks.c @@ -189,7 +189,7 @@ void ifa_notify(struct proto *p, unsigned flags, struct ifa *a) /** * rt_notify - notify instance about routing table change * @p: protocol instance - * @table: a routing table + * @channel: notifying channel * @net: a network entry * @new: new route for the network * @old: old route for the network diff --git a/nest/protocol.h b/nest/protocol.h index 41e31a80..19f5d070 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -184,7 +184,7 @@ struct proto { void (*if_notify)(struct proto *, unsigned flags, struct iface *i); void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a); - void (*rt_notify)(struct proto *, struct rtable *table, struct network *net, struct rte *new, struct rte *old, struct ea_list *attrs); + void (*rt_notify)(struct proto *, struct channel *, struct network *net, struct rte *new, struct rte *old, struct ea_list *attrs); void (*neigh_notify)(struct neighbor *neigh); struct ea_list *(*make_tmp_attrs)(struct rte *rt, struct linpool *pool); void (*store_tmp_attrs)(struct rte *rt, struct ea_list *attrs); diff --git a/nest/rt-table.c b/nest/rt-table.c index 2c9c6e3a..03ab3b92 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -481,18 +481,18 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, ea_list *tmpa, int rte_trace_out(D_ROUTES, p, old, "removed"); } if (!new) - p->rt_notify(p, c->table, net, NULL, old, NULL); + p->rt_notify(p, c, net, NULL, old, NULL); else if (tmpa) { ea_list *t = tmpa; while (t->next) t = t->next; t->next = new->attrs->eattrs; - p->rt_notify(p, c->table, net, new, old, tmpa); + p->rt_notify(p, c, net, new, old, tmpa); t->next = NULL; } else - p->rt_notify(p, c->table, net, new, old, new->attrs->eattrs); + p->rt_notify(p, c, net, new, old, new->attrs->eattrs); } static void @@ -552,7 +552,7 @@ rt_notify_basic(struct channel *c, net *net, rte *new0, rte *old0, int refeed) #ifdef CONFIG_PIPE if ((p->proto == &proto_pipe) && !new0 && (p != old0->sender->proto)) - p->rt_notify(p, c->table, net, NULL, old0, NULL); + p->rt_notify(p, c, net, NULL, old0, NULL); #endif return; diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index 89bf87c7..9d0a93c7 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -1241,7 +1241,7 @@ find_surrogate_fwaddr(struct ospf_proto *p, struct ospf_area *oa) } void -ospf_rt_notify(struct proto *P, rtable *tbl UNUSED, net *n, rte *new, rte *old UNUSED, ea_list *ea) +ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte *old UNUSED, ea_list *ea) { struct ospf_proto *p = (struct ospf_proto *) P; struct ospf_area *oa = NULL; /* non-NULL for NSSA-LSA */ diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h index 1dbee070..38447fdf 100644 --- a/proto/ospf/topology.h +++ b/proto/ospf/topology.h @@ -188,7 +188,7 @@ void ospf_originate_sum_net_lsa(struct ospf_proto *p, struct ospf_area *oa, ort void ospf_originate_sum_rt_lsa(struct ospf_proto *p, struct ospf_area *oa, u32 drid, int metric, u32 options); void ospf_originate_ext_lsa(struct ospf_proto *p, struct ospf_area *oa, ort *nf, u8 mode, u32 metric, u32 ebit, ip_addr fwaddr, u32 tag, int pbit); -void ospf_rt_notify(struct proto *P, rtable *tbl, net *n, rte *new, rte *old, ea_list *attrs); +void ospf_rt_notify(struct proto *P, struct channel *ch, net *n, rte *new, rte *old, ea_list *attrs); void ospf_update_topology(struct ospf_proto *p); struct top_hash_entry *ospf_hash_find(struct top_graph *, u32 domain, u32 lsa, u32 rtr, u32 type); diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c index 57db3e8b..f3df3e71 100644 --- a/proto/pipe/pipe.c +++ b/proto/pipe/pipe.c @@ -44,10 +44,10 @@ #include "pipe.h" static void -pipe_rt_notify(struct proto *P, rtable *src_table, net *n, rte *new, rte *old, ea_list *attrs) +pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *old, ea_list *attrs) { struct pipe_proto *p = (void *) P; - struct channel *dst = (src_table == p->pri->table) ? p->sec : p->pri; + struct channel *dst = (src_ch == p->pri) ? p->sec : p->pri; struct rte_src *src; net *nn; @@ -89,9 +89,9 @@ pipe_rt_notify(struct proto *P, rtable *src_table, net *n, rte *new, rte *old, e src = old->attrs->src; } - src_table->pipe_busy = 1; + src_ch->table->pipe_busy = 1; rte_update2(dst, nn, e, src); - src_table->pipe_busy = 0; + src_ch->table->pipe_busy = 0; } static int diff --git a/proto/radv/radv.c b/proto/radv/radv.c index f9c0940f..4c845f7a 100644 --- a/proto/radv/radv.c +++ b/proto/radv/radv.c @@ -281,7 +281,7 @@ radv_import_control(struct proto *p, rte **new, ea_list **attrs UNUSED, struct l } static void -radv_rt_notify(struct proto *p, rtable *tbl UNUSED, net *n, rte *new, rte *old UNUSED, ea_list *attrs UNUSED) +radv_rt_notify(struct proto *p, struct channel *ch UNUSED, net *n, rte *new, rte *old UNUSED, ea_list *attrs UNUSED) { struct proto_radv *ra = (struct proto_radv *) p; struct radv_config *cf = (struct radv_config *) (p->cf); diff --git a/proto/rip/rip.c b/proto/rip/rip.c index f020bc5b..22023279 100644 --- a/proto/rip/rip.c +++ b/proto/rip/rip.c @@ -309,7 +309,7 @@ rip_withdraw_rte(struct rip_proto *p, net_addr *n, struct rip_neighbor *from) * it into our data structures. */ static void -rip_rt_notify(struct proto *P, struct rtable *table UNUSED, struct network *net, struct rte *new, +rip_rt_notify(struct proto *P, struct channel *ch UNUSED, struct network *net, struct rte *new, struct rte *old UNUSED, struct ea_list *attrs) { struct rip_proto *p = (struct rip_proto *) P; diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index 6af3a84f..6b3b4eee 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -1014,7 +1014,7 @@ krt_import_control(struct proto *P, rte **new, ea_list **attrs, struct linpool * } static void -krt_rt_notify(struct proto *P, struct rtable *table UNUSED, net *net, +krt_rt_notify(struct proto *P, struct channel *ch UNUSED, net *net, rte *new, rte *old, struct ea_list *eattrs) { struct krt_proto *p = (struct krt_proto *) P;