Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes a new bug in the pipe protocol soft reconfiguration.

Browse source 
Also updates route reload for pipes.
This commit is contained in:
Ondrej Zajicek 2009-12-20 14:59:12 +01:00
parent 1a5178587f
commit ea7ada3809
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/bird.sgml
View file

@ -513,7 +513,9 @@ This argument can be omitted if there exists only a single instance.
Re-export always succeeds, but re-import is protocol-dependent Re-export always succeeds, but re-import is protocol-dependent
and might fail (for example, if BGP neighbor does not support and might fail (for example, if BGP neighbor does not support
route-refresh extension). In that case, re-export is also route-refresh extension). In that case, re-export is also
skipped. skipped. Note that for the pipe protocol, both directions are
always reloaded together (<cf/in/ or <cf/out/ options are
ignored in that case).
<tag/down/ <tag/down/
Shut BIRD down. Shut BIRD down.

26
proto/pipe/pipe.c
View file

@ -113,6 +113,19 @@ pipe_import_control(struct proto *P, rte **ee, ea_list **ea UNUSED, struct linpo
return 0; return 0;
} }
static int
pipe_reload_routes(struct proto *P)
{
/*
* Because the pipe protocol feeds routes from both routing tables
* together, both directions are reloaded during refeed and 'reload
* out' command works like 'reload' command. For symmetry, we also
* request refeed when 'reload in' command is used.
*/
proto_request_feeding(P);
return 1;
}
static int static int
pipe_start(struct proto *P) pipe_start(struct proto *P)
{ {
@ -183,6 +196,7 @@ pipe_init(struct proto_config *C)
P->accept_ra_types = (p->mode == PIPE_OPAQUE) ? RA_OPTIMAL : RA_ANY; P->accept_ra_types = (p->mode == PIPE_OPAQUE) ? RA_OPTIMAL : RA_ANY;
P->rt_notify = pipe_rt_notify_pri; P->rt_notify = pipe_rt_notify_pri;
P->import_control = pipe_import_control; P->import_control = pipe_import_control;
P->reload_routes = pipe_reload_routes;
return P; return P;
} }
@ -206,12 +220,18 @@ pipe_get_status(struct proto *P, byte *buf)
} }
static int static int
pipe_reconfigure(struct proto *p, struct proto_config *new) pipe_reconfigure(struct proto *P, struct proto_config *new)
{ {
struct pipe_config *o = (struct pipe_config *) p->cf; struct pipe_proto *p = (struct pipe_proto *) P;
struct pipe_config *o = (struct pipe_config *) P->cf;
struct pipe_config *n = (struct pipe_config *) new; struct pipe_config *n = (struct pipe_config *) new;
return (o->peer->table == n->peer->table) && (o->mode == n->mode); if ((o->peer->table != n->peer->table) || (o->mode != n->mode))
return 0;
/* Update also the filter in the phantom protocol */
p->phantom->p.out_filter = new->in_filter;
return 1;
} }
struct protocol proto_pipe = { struct protocol proto_pipe = {