Commit 4bdf1881 authored by Jan Moskyto Matejka's avatar Jan Moskyto Matejka
Browse files

Channelize: rt_notify arg conversion table -> channel

parent 0c8c8151

nest/proto-hooks.c

+1 −1
Original line number Diff line number Diff line
@@ -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

nest/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

nest/rt-table.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

proto/ospf/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

proto/ospf/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE