Revision e81b440f nest/rt-table.c

View differences:

nest/rt-table.c
158 158
}
159 159

  
160 160
static inline void
161
do_rte_announce(struct announce_hook *a, int type, net *net, rte *new, rte *old, ea_list *tmpa, int class, int refeed)
161
do_rte_announce(struct announce_hook *a, int type UNUSED, net *net, rte *new, rte *old, ea_list *tmpa, int class, int refeed)
162 162
{
163 163
  struct proto *p = a->proto;
164 164
  struct filter *filter = p->out_filter;
......
196 196
	}
197 197
      else if (ok)
198 198
	rte_trace_out(D_FILTERS, p, new, "forced accept by protocol");
199
      else if (filter == FILTER_REJECT ||
200
	       filter && f_run(filter, &new, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) > F_ACCEPT)
199
      else if ((filter == FILTER_REJECT) ||
200
	       (filter && f_run(filter, &new, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) > F_ACCEPT))
201 201
	{
202 202
	  stats->exp_updates_filtered++;
203 203
	  drop_reason = "filtered out";
......
329 329
 * the protocol gets called.
330 330
 */
331 331
static void
332
rte_announce(rtable *tab, int type, net *net, rte *new, rte *old, ea_list *tmpa)
332
rte_announce(rtable *tab, unsigned type, net *net, rte *new, rte *old, ea_list *tmpa)
333 333
{
334 334
  struct announce_hook *a;
335 335
  int class = ipa_classify(net->n.prefix);
......
1203 1203
		 'configure soft' command may change the export filter
1204 1204
		 and do not update routes */
1205 1205

  
1206
	      if (p1->out_filter == FILTER_REJECT ||
1207
		  p1->out_filter && f_run(p1->out_filter, &e, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) > F_ACCEPT)
1206
	      if ((p1->out_filter == FILTER_REJECT) ||
1207
		  (p1->out_filter && f_run(p1->out_filter, &e, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) > F_ACCEPT))
1208 1208
		ok = 0;
1209 1209
	    }
1210 1210
	}

Also available in: Unified diff