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

Hopefully ended translating to new interface

Browse source
This commit is contained in:
Pavel Machek 1999-03-01 21:18:01 +00:00
parent bdb95a21a4
commit c748cdb9ec
3 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
proto/rip/config.Y
View file

@ -24,7 +24,7 @@ CF_HDR
void rip_dev_add_iface(char *); void rip_dev_add_iface(char *);
struct rip_patt *rip_get_iface(void); struct rip_patt *rip_get_iface(void);
#define RIP_PROTO ((struct rip_proto_config *) this_proto) #define RIP_CFG ((struct rip_proto_config *) this_proto)
CF_DECLS CF_DECLS
@ -34,22 +34,22 @@ CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME, MODE, MULTICAST, B
CF_GRAMMAR CF_GRAMMAR
CF_ADDTO(proto, rip_proto '}') CF_ADDTO(proto, RIP_CFG '}')
rip_proto_start: proto_start RIP { RIP_CFG_start: proto_start RIP {
RIP_PROTO = proto_new(&proto_rip, sizeof(struct rip_proto)); RIP_CFG = proto_config_new(&proto_rip, sizeof(struct rip_proto_config));
rip_init_instance(RIP_PROTO); rip_init_config(RIP_CFG);
} }
; ;
rip_proto: RIP_CFG:
rip_proto_start proto_name '{' RIP_CFG_start proto_name '{'
| rip_proto proto_item ';' | RIP_CFG proto_item ';'
| rip_proto INFINITY expr ';' { RIP_PROTO->infinity = $3; } | RIP_CFG INFINITY expr ';' { RIP_CFG->infinity = $3; }
| rip_proto PORT expr ';' { RIP_PROTO->port = $3; } | RIP_CFG PORT expr ';' { RIP_CFG->port = $3; }
| rip_proto PERIOD expr ';' { RIP_PROTO->period = $3; } | RIP_CFG PERIOD expr ';' { RIP_CFG->period = $3; }
| rip_proto GARBAGETIME expr ';' { RIP_PROTO->garbage_time = $3; } | RIP_CFG GARBAGETIME expr ';' { RIP_CFG->garbage_time = $3; }
| rip_proto rip_iface_list ';' | RIP_CFG rip_iface_list ';'
; ;
@ -91,13 +91,13 @@ rip_dev_add_iface(char *n)
struct rip_patt *k = cfg_alloc(sizeof(struct rip_patt)); struct rip_patt *k = cfg_alloc(sizeof(struct rip_patt));
k->i.pattern = cfg_strdup(n); k->i.pattern = cfg_strdup(n);
add_tail(&RIP_PROTO->iface_list, &k->i.n); add_tail(&RIP_CFG->iface_list, &k->i.n);
} }
struct rip_patt * struct rip_patt *
rip_get_iface(void) rip_get_iface(void)
{ {
struct rip_patt *k = TAIL(RIP_PROTO->iface_list); struct rip_patt *k = TAIL(RIP_CFG->iface_list);
if (!k) if (!k)
cf_error( "This cannot happen" ); cf_error( "This cannot happen" );
return k; return k;

20
proto/rip/rip.c
View file

@ -410,7 +410,7 @@ rip_start(struct proto *p)
static struct proto * static struct proto *
rip_init(struct proto_config *cfg) rip_init(struct proto_config *cfg)
{ {
struct proto *p = proto_new(cfg, sizeof(struct proto)); struct proto *p = proto_new(cfg, sizeof(struct rip_proto));
return p; return p;
} }
@ -422,6 +422,8 @@ rip_dump(struct proto *p)
node *w, *e; node *w, *e;
struct rip_interface *rif; struct rip_interface *rif;
i = 0; i = 0;
CHK_MAGIC;
WALK_LIST( w, P->connections ) { WALK_LIST( w, P->connections ) {
struct rip_connection *n = (void *) w; struct rip_connection *n = (void *) w;
debug( "RIP: connection #%d: %I\n", n->num, n->addr ); debug( "RIP: connection #%d: %I\n", n->num, n->addr );
@ -598,14 +600,16 @@ rip_init_instance(struct proto *p)
p->rta_same = rip_rta_same; p->rta_same = rip_rta_same;
p->rte_insert = rip_rte_insert; p->rte_insert = rip_rte_insert;
p->rte_remove = rip_rte_remove; p->rte_remove = rip_rte_remove;
}
#warning FIXME: this is almost certianly wrong, I need to setup config elsewhere void
P_CF->infinity = 16; rip_init_config(struct rip_proto_config *c)
P_CF->port = 520; {
P_CF->period = 30; init_list(&c->iface_list);
P_CF->garbage_time = 120+180; c->infinity = 16;
c->port = 520;
init_list(&P_CF->iface_list); c->period = 30;
c->garbage_time = 120+180;
} }
static void static void

2
proto/rip/rip.h
View file

@ -83,6 +83,7 @@ struct rip_patt {
}; };
struct rip_proto_config { struct rip_proto_config {
struct proto_config c;
list iface_list; /* Patterns configured */ list iface_list; /* Patterns configured */
int infinity; /* User configurable data */ int infinity; /* User configurable data */
@ -106,4 +107,5 @@ struct rip_proto {
#define CHK_MAGIC do { if (P->magic != RIP_MAGIC) bug( "Not enough magic\n" ); } while (0) #define CHK_MAGIC do { if (P->magic != RIP_MAGIC) bug( "Not enough magic\n" ); } while (0)
void rip_init_instance(struct proto *p); void rip_init_instance(struct proto *p);
void rip_init_config(struct rip_proto_config *c);
struct rip_interface *new_iface(struct proto *p, struct iface *new, unsigned long flags); struct rip_interface *new_iface(struct proto *p, struct iface *new, unsigned long flags);