diff options
Diffstat (limited to 'proto')
-rw-r--r-- | proto/ospf/topology.c | 2 | ||||
-rw-r--r-- | proto/ospf/topology.h | 2 | ||||
-rw-r--r-- | proto/pipe/pipe.c | 8 | ||||
-rw-r--r-- | proto/radv/radv.c | 2 | ||||
-rw-r--r-- | proto/rip/rip.c | 2 |
5 files changed, 8 insertions, 8 deletions
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; |