lose the unreachables after one timeout

SCCS-vsn: sbin/routed/input.c 5.8

diff --git a/usr/src/sbin/routed/input.c b/usr/src/sbin/routed/input.c
index d9bc288..b23c941 100644 (file)
--- a/usr/src/sbin/routed/input.c
+++ b/usr/src/sbin/routed/input.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)input.c    5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)input.c    5.8 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -189,7 +189,8 @@ rip_input(from, size)
                        if (equal(from, &rt->rt_router)) {
                                if (n->rip_metric != rt->rt_metric)
                                        rtchange(rt, from, n->rip_metric);
                        if (equal(from, &rt->rt_router)) {
                                if (n->rip_metric != rt->rt_metric)
                                        rtchange(rt, from, n->rip_metric);

-                               rt->rt_timer = 0;
+                               if (rt->rt_metric < HOPCNT_INFINITY)
+                                       rt->rt_timer = 0;

                        } else if ((unsigned) (n->rip_metric) < rt->rt_metric ||
                            (rt->rt_timer > (EXPIRE_TIME/2) &&
                            rt->rt_metric == n->rip_metric)) {
                        } else if ((unsigned) (n->rip_metric) < rt->rt_metric ||
                            (rt->rt_timer > (EXPIRE_TIME/2) &&
                            rt->rt_metric == n->rip_metric)) {