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

Added timeout for routes (which means proper expiring of routes) added

Browse source 
few fixmes.
This commit is contained in:
Pavel Machek 1999-11-10 11:52:36 +00:00
parent 024dcaaea2
commit 3918b1b050
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
proto/rip/rip.c
View file

@ -8,7 +8,15 @@
FIXME: IpV6 support: packet size FIXME: IpV6 support: packet size
FIXME: IpV6 support: use right address for broadcasts FIXME: IpV6 support: use right address for broadcasts
FIXME: IpV6 support: receive "route using" blocks FIXME: IpV6 support: receive "route using" blocks
1 FIXME FIXME: Do we send "triggered updates" correctly?
FIXME: When route's metric changes to 16, start garbage collection immediately? Do _not_ restart on new updates with metric == 16.
FIXME: When route's 60 seconds old and we get same metric, use that!
FIXME: Triggered updates. When triggered update was sent, don't send new one for something between 1 and 5 seconds (and send one after that).
We are not going to honour requests for sending part of
routing table. That would need to turn split horizont off,
etc.
*/ */
#define LOCAL_DEBUG #define LOCAL_DEBUG
@ -392,12 +400,19 @@ rip_timer(timer *t)
rte = SKIP_BACK( struct rte, u.rip.garbage, e ); rte = SKIP_BACK( struct rte, u.rip.garbage, e );
DBG( "Garbage: " ); rte_dump( rte ); DBG( "Garbage: " ); rte_dump( rte );
if (now - rte->lastmod > P_CF->garbage_time) { if (now - rte->lastmod > P_CF->timeout_time) {
debug( "RIP: entry is too old: " ); rte_dump( rte ); debug( "RIP: entry is too old: " ); rte_dump( rte );
e->metric = P_CF->infinity;
}
if (now - rte->lastmod > P_CF->garbage_time) {
debug( "RIP: entry is much too old: " ); rte_dump( rte );
rte_discard(p->table, rte); rte_discard(p->table, rte);
} }
} }
/* FIXME: we need to do triggered updates */
DBG( "RIP: Broadcasting routing tables\n" ); DBG( "RIP: Broadcasting routing tables\n" );
{ {
struct rip_interface *rif; struct rip_interface *rif;
@ -662,15 +677,17 @@ rip_rt_notify(struct proto *p, struct network *net, struct rte *new, struct rte
static int static int
rip_rte_better(struct rte *new, struct rte *old) rip_rte_better(struct rte *new, struct rte *old)
{ {
if (ipa_equal(old->attrs->from, new->attrs->from))
return 1;
if (old->u.rip.metric < new->u.rip.metric) if (old->u.rip.metric < new->u.rip.metric)
return 0; return 0;
if (old->u.rip.metric > new->u.rip.metric) if (old->u.rip.metric > new->u.rip.metric)
return 1; return 1;
/* FIXME */ if ((old->u.rip.metric == new->u.rip.metric) &&
#define old_metric_is_much_older_than_new_metric 0 ((now - old->lastmod) > 60)) /* FIXME (nonurgent): this probably should be P_CF->timeout_time / 2 if old->attrs->proto == new->attrs->proto, else don't do this check */
if ((old->u.rip.metric == new->u.rip.metric) && (old_metric_is_much_older_than_new_metric))
return 1; return 1;
return 0; return 0;
@ -712,6 +729,7 @@ rip_init_config(struct rip_proto_config *c)
c->port = 520; c->port = 520;
c->period = 30; c->period = 30;
c->garbage_time = 120+180; c->garbage_time = 120+180;
c->timeout_time = 120;
c->passwords = NULL; c->passwords = NULL;
c->authtype = AT_NONE; c->authtype = AT_NONE;
} }

1
proto/rip/rip.h
View file

@ -123,6 +123,7 @@ struct rip_proto_config {
int port; int port;
int period; int period;
int garbage_time; int garbage_time;
int timeout_time;
struct password_item *passwords; struct password_item *passwords;
int authtype; int authtype;