diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-22 17:12:15 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-05-22 17:12:15 +0200 |
| commit | ea2ae6dd0ae3f5dd8cd41c1e5a1170a163027725 (patch) | |
| tree | bfad8e3665598cedc1a099b9d37571a924e3564f /nest/rt-table.c | |
| parent | d72a0ac2396471ffb2b3a580ee986f950e4d23ae (diff) | |
Change import/preimport to export/preexport to be consistent with filters.
Diffstat (limited to 'nest/rt-table.c')
| -rw-r--r-- | nest/rt-table.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nest/rt-table.c b/nest/rt-table.c index 4a04a0ae..b0781a33 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -978,7 +978,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) { struct ea_list *tmpa, *old_tmpa; struct proto *p0 = e->attrs->proto; - struct proto *p1 = d->import_protocol; + struct proto *p1 = d->export_protocol; struct proto *p2 = d->show_protocol; d->rt_counter++; ee = e; @@ -986,12 +986,12 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) old_tmpa = tmpa = p0->make_tmp_attrs ? p0->make_tmp_attrs(e, rte_update_pool) : NULL; ok = (d->filter == FILTER_ACCEPT || f_run(d->filter, &e, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) <= F_ACCEPT); if (p2 && p2 != p0) ok = 0; - if (ok && d->import_mode) + if (ok && d->export_mode) { int ic = (p1->import_control ? p1->import_control(p1, &e, &tmpa, rte_update_pool) : 0); if (ic < 0) ok = 0; - else if (!ic && d->import_mode > 1) + else if (!ic && d->export_mode > 1) { if (p1->out_filter == FILTER_REJECT || p1->out_filter && f_run(p1->out_filter, &e, &tmpa, rte_update_pool, FF_FORCE_TMPATTR) > F_ACCEPT) @@ -1033,9 +1033,9 @@ rt_show_cont(struct cli *c) cli_printf(c, 8004, "Stopped due to reconfiguration"); goto done; } - if (d->import_protocol && - d->import_protocol->core_state != FS_HAPPY && - d->import_protocol->core_state != FS_FEEDING) + if (d->export_protocol && + d->export_protocol->core_state != FS_HAPPY && + d->export_protocol->core_state != FS_FEEDING) { cli_printf(c, 8005, "Protocol is down"); goto done; |