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

Patterns expanded in the right way

Browse source
This commit is contained in:
Pavel Machek 1999-01-12 16:40:55 +00:00
parent 18fff6a197
commit 50e89a6ea2
3 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
proto/rip/config.Y
View file

@ -8,8 +8,12 @@
To add: To add:
passive option (== do not send routing updates to this interface) passive option (== do not send routing updates to this interface)
version1 switch
multicast off option for interface
interface mode broadcast/multicast/quiet
*/
CF_HDR CF_HDR
@ -18,13 +22,15 @@ CF_HDR
#include "nest/iface.h" #include "nest/iface.h"
void rip_dev_add_iface(char *); void rip_dev_add_iface(char *);
struct iface_patt *rip_get_iface(void); struct rip_patt *rip_get_iface(void);
#define THIS_PROTO ((struct rip_proto *) this_proto) #define THIS_PROTO ((struct rip_proto *) this_proto)
CF_DECLS CF_DECLS
CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME) CF_KEYWORDS(RIP, INFINITY, METRIC, PORT, PERIOD, GARBAGETIME, MODE, MULTICAST, BROADCAST, QUIET, DEFAULT)
%type <i> rip_mode
CF_GRAMMAR CF_GRAMMAR
@ -46,10 +52,22 @@ rip_proto:
| rip_proto rip_iface_list ';' | rip_proto rip_iface_list ';'
; ;
rip_mode:
MULTICAST { $$=IM_MULTICAST; }
| BROADCAST { $$=IM_BROADCAST; }
| QUIET { $$=IM_QUIET; }
| DEFAULT { $$=IM_DEFAULT; }
;
rip_iface_item: rip_iface_item:
| METRIC expr { | METRIC expr {
struct iface_patt *k = rip_get_iface(); struct rip_patt *k = rip_get_iface();
k->u.rip.metric = $2; k->metric = $2;
}
| MODE rip_mode {
struct rip_patt *k = rip_get_iface();
k->mode = $2;
} }
; ;
@ -70,16 +88,16 @@ CF_CODE
void void
rip_dev_add_iface(char *n) rip_dev_add_iface(char *n)
{ {
struct iface_patt *k = cfg_alloc(sizeof(struct iface_patt)); struct rip_patt *k = cfg_alloc(sizeof(struct rip_patt));
k->pattern = cfg_strdup(n); k->i.pattern = cfg_strdup(n);
add_tail(&THIS_PROTO->iface_list, &k->n); add_tail(&THIS_PROTO->iface_list, &k->i.n);
} }
struct iface_patt * struct rip_patt *
rip_get_iface(void) rip_get_iface(void)
{ {
struct iface_patt *k = TAIL(THIS_PROTO->iface_list); struct rip_patt *k = TAIL(THIS_PROTO->iface_list);
if (!k) if (!k)
cf_error( "This cannot happen" ); cf_error( "This cannot happen" );
return k; return k;

1
proto/rip/rip.c
View file

@ -455,6 +455,7 @@ new_iface(struct proto *p, struct iface *new, unsigned long flags)
want_multicast = 0 && (flags & IF_MULTICAST); want_multicast = 0 && (flags & IF_MULTICAST);
/* FIXME: should have config option to disable this one */ /* FIXME: should have config option to disable this one */
/* FIXME: lookup multicasts over unnumbered links */
rif->sock = sk_new( p->pool ); rif->sock = sk_new( p->pool );
rif->sock->type = want_multicast?SK_UDP_MC:SK_UDP; rif->sock->type = want_multicast?SK_UDP_MC:SK_UDP;

13
proto/rip/rip.h
View file

@ -66,7 +66,20 @@ struct rip_interface {
sock *sock; sock *sock;
struct rip_connection *busy; struct rip_connection *busy;
int metric; /* User configurable data */ int metric; /* User configurable data */
int mode;
#define IM_DEFAULT 0
#define IM_QUIET 1
#define IM_MULTICAST 2
#define IM_BROADCAST 3
};
struct rip_patt {
struct iface_patt i;
int metric;
int mode;
}; };
struct rip_proto { struct rip_proto {