From 2d9290e973b9cfc909057a0409152e020d1c29db Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Fri, 4 Dec 1998 11:45:51 +0000 Subject: Rip now has configurable per-interface metric (please rewiev), and few more configurable parameters. To do that, union was added into iface_patt. --- proto/rip/config.Y | 57 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 6 deletions(-) (limited to 'proto/rip/config.Y') diff --git a/proto/rip/config.Y b/proto/rip/config.Y index 3e668f4..fbe6fe1 100644 --- a/proto/rip/config.Y +++ b/proto/rip/config.Y @@ -7,17 +7,23 @@ CF_HDR #include "proto/rip/rip.h" +#include "nest/iface.h" + +void rip_dev_add_iface(char *); +struct iface_patt *rip_get_iface(void); + +#define THIS_PROTO ((struct rip_proto *) this_proto) CF_DECLS -CF_KEYWORDS(RIP, INFINITY) +CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME) CF_GRAMMAR CF_ADDTO(proto, rip_proto '}') rip_proto_start: proto_start RIP { - this_proto = proto_new(&proto_rip, sizeof(struct rip_data)); + this_proto = proto_new(&proto_rip, sizeof(struct rip_proto)); rip_init_instance(this_proto); } ; @@ -25,12 +31,51 @@ rip_proto_start: proto_start RIP { rip_proto: rip_proto_start proto_name '{' | rip_proto proto_item ';' - | rip_proto INFINITY expr ';' { - if ($3 < 0 || $3 > 64) cf_error("Invalid infinity"); - ((struct rip_data *) this_proto)->infinity = $3; - } + | rip_proto INFINITY expr ';' { THIS_PROTO->infinity = $3; } + | rip_proto PORT expr ';' { THIS_PROTO->port = $3; } + | rip_proto PERIOD expr ';' { THIS_PROTO->period = $3; } + | rip_proto GARBAGETIME expr ';' { THIS_PROTO->garbage_time = $3; } + | rip_proto rip_iface_list ';' + ; + +rip_iface_item: + | METRIC expr { + struct iface_patt *k = rip_get_iface(); + k->u.rip.metric = $2; + } + ; + +rip_iface_opts: + '{' + | rip_iface_opts rip_iface_item ';' + ; + +rip_iface_empty: /* EMPTY */ | rip_iface_opts '}' ; + +rip_iface_list: + INTERFACE TEXT rip_iface_empty { rip_dev_add_iface($2); } + | dev_iface_list ',' TEXT rip_iface_empty { rip_dev_add_iface($3); } ; CF_CODE +void +rip_dev_add_iface(char *n) +{ + struct iface_patt *k = cfg_alloc(sizeof(struct iface_patt)); + + k->pattern = cfg_strcpy(n); + add_tail(&THIS_PROTO->iface_list, &k->n); +} + +struct iface_patt * +rip_get_iface(void) +{ + struct iface_patt *k = TAIL(THIS_PROTO->iface_list); + if (!k) + cf_error( "This cannot happen" ); + return k; +} + + CF_END -- cgit v1.2.3