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

Adds opaque/transparent pipe mode selection.

Browse source
This commit is contained in:
Ondrej Zajicek 2009-06-01 12:10:10 +02:00
parent 23ac9e9a9e
commit 2d45e09f58
3 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
proto/pipe/config.Y
View file

@ -10,9 +10,13 @@ CF_HDR
#include "proto/pipe/pipe.h" #include "proto/pipe/pipe.h"
CF_DEFINES
#define PIPE_CFG ((struct pipe_config *) this_proto)
CF_DECLS CF_DECLS
CF_KEYWORDS(PIPE, PEER, TABLE) CF_KEYWORDS(PIPE, PEER, TABLE, MODE, OPAQUE, TRANSPARENT)
CF_GRAMMAR CF_GRAMMAR
@ -21,6 +25,7 @@ CF_ADDTO(proto, pipe_proto '}')
pipe_proto_start: proto_start PIPE { pipe_proto_start: proto_start PIPE {
this_proto = proto_config_new(&proto_pipe, sizeof(struct pipe_config)); this_proto = proto_config_new(&proto_pipe, sizeof(struct pipe_config));
this_proto->preference = DEF_PREF_PIPE; this_proto->preference = DEF_PREF_PIPE;
PIPE_CFG->mode = PIPE_OPAQUE;
} }
; ;
@ -30,8 +35,10 @@ pipe_proto:
| pipe_proto PEER TABLE SYM ';' { | pipe_proto PEER TABLE SYM ';' {
if ($4->class != SYM_TABLE) if ($4->class != SYM_TABLE)
cf_error("Routing table name expected"); cf_error("Routing table name expected");
((struct pipe_config *) this_proto)->peer = $4->def; PIPE_CFG->peer = $4->def;
} }
| pipe_proto MODE OPAQUE ';' { PIPE_CFG->mode = PIPE_OPAQUE; }
| pipe_proto MODE TRANSPARENT ';' { PIPE_CFG->mode = PIPE_TRANSPARENT; }
; ;
CF_CODE CF_CODE

25
proto/pipe/pipe.c
View file

@ -51,13 +51,23 @@ pipe_send(struct pipe_proto *p, rtable *dest, net *n, rte *new, rte *old, ea_lis
if (new) if (new)
{ {
memcpy(&a, new->attrs, sizeof(rta)); memcpy(&a, new->attrs, sizeof(rta));
if (p->mode == PIPE_OPAQUE)
{
a.proto = &p->p;
a.source = RTS_PIPE;
}
a.aflags = 0; a.aflags = 0;
a.eattrs = attrs; a.eattrs = attrs;
e = rte_get_temp(&a); e = rte_get_temp(&a);
e->net = nn; e->net = nn;
/* Copy protocol specific embedded attributes. */ if (p->mode == PIPE_TRANSPARENT)
memcpy(&(e->u), &(new->u), sizeof(e->u)); {
/* Copy protocol specific embedded attributes. */
memcpy(&(e->u), &(new->u), sizeof(e->u));
}
src = new->attrs->proto; src = new->attrs->proto;
} }
@ -68,7 +78,7 @@ pipe_send(struct pipe_proto *p, rtable *dest, net *n, rte *new, rte *old, ea_lis
} }
dest->pipe_busy = 1; dest->pipe_busy = 1;
rte_update2(dest, nn, &p->p, src, e); rte_update2(dest, nn, &p->p, (p->mode == PIPE_OPAQUE) ? &p->p : src, e);
dest->pipe_busy = 0; dest->pipe_busy = 0;
} }
@ -117,7 +127,7 @@ pipe_start(struct proto *P)
memcpy(ph, p, sizeof(struct pipe_proto)); memcpy(ph, p, sizeof(struct pipe_proto));
p->phantom = ph; p->phantom = ph;
ph->phantom = p; ph->phantom = p;
ph->p.accept_ra_types = RA_ANY; ph->p.accept_ra_types = (p->mode == PIPE_OPAQUE) ? RA_OPTIMAL : RA_ANY;
ph->p.rt_notify = pipe_rt_notify_sec; ph->p.rt_notify = pipe_rt_notify_sec;
ph->p.proto_state = PS_UP; ph->p.proto_state = PS_UP;
ph->p.core_state = ph->p.core_goal = FS_HAPPY; ph->p.core_state = ph->p.core_goal = FS_HAPPY;
@ -153,7 +163,8 @@ pipe_init(struct proto_config *C)
struct pipe_proto *p = (struct pipe_proto *) P; struct pipe_proto *p = (struct pipe_proto *) P;
p->peer = c->peer->table; p->peer = c->peer->table;
P->accept_ra_types = RA_ANY; p->mode = c->mode;
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;
return P; return P;
@ -175,7 +186,7 @@ pipe_get_status(struct proto *P, byte *buf)
{ {
struct pipe_proto *p = (struct pipe_proto *) P; struct pipe_proto *p = (struct pipe_proto *) P;
bsprintf(buf, "-> %s", p->peer->name); bsprintf(buf, "%c> %s", (p->mode == PIPE_OPAQUE) ? '-' : '=', p->peer->name);
} }
static int static int
@ -184,7 +195,7 @@ pipe_reconfigure(struct proto *p, struct proto_config *new)
struct pipe_config *o = (struct pipe_config *) p->cf; 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 == n->peer; return (o->peer == n->peer) && (o->mode == n->mode);
} }
struct protocol proto_pipe = { struct protocol proto_pipe = {

5
proto/pipe/pipe.h
View file

@ -9,14 +9,19 @@
#ifndef _BIRD_PIPE_H_ #ifndef _BIRD_PIPE_H_
#define _BIRD_PIPE_H_ #define _BIRD_PIPE_H_
#define PIPE_OPAQUE 0
#define PIPE_TRANSPARENT 1
struct pipe_config { struct pipe_config {
struct proto_config c; struct proto_config c;
struct rtable_config *peer; /* Table we're connected to */ struct rtable_config *peer; /* Table we're connected to */
int mode; /* PIPE_OPAQUE or PIPE_TRANSPARENT */
}; };
struct pipe_proto { struct pipe_proto {
struct proto p; struct proto p;
struct rtable *peer; struct rtable *peer;
int mode; /* PIPE_OPAQUE or PIPE_TRANSPARENT */
struct pipe_proto *phantom; struct pipe_proto *phantom;
}; };