Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/sbin/route Pull up revisions 1.56-1.57 (requested by it...



details:   https://anonhg.NetBSD.org/src/rev/383d3ab2e5da
branches:  netbsd-1-6
changeset: 527779:383d3ab2e5da
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jun 06 08:41:51 2002 +0000

description:
Pull up revisions 1.56-1.57 (requested by itojun in ticket #185):
1.56:
        more correct ion to RTF_HOST handling.
1.57:
        if we're unsure about prefixlen, don't say "128".

diffstat:

 sbin/route/route.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r b77bf4d8a438 -r 383d3ab2e5da sbin/route/route.c
--- a/sbin/route/route.c        Thu Jun 06 08:26:37 2002 +0000
+++ b/sbin/route/route.c        Thu Jun 06 08:41:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: route.c,v 1.54.2.1 2002/06/05 04:27:43 lukem Exp $     */
+/*     $NetBSD: route.c,v 1.54.2.2 2002/06/06 08:41:51 lukem Exp $     */
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)route.c    8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.54.2.1 2002/06/05 04:27:43 lukem Exp $");
+__RCSID("$NetBSD: route.c,v 1.54.2.2 2002/06/06 08:41:51 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -1111,12 +1111,13 @@
                        plen = "64";
        }
 
-       if (plen) {
+       if (!plen || strcmp(plen, "128") == 0)
+               return 1;
+       else {
                rtm_addrs |= RTA_NETMASK;
-               return prefixlen(plen);
+               (void)prefixlen(plen);
+               return 0;
        }
-
-       return -1;
 }
 #endif
 
@@ -1212,8 +1213,7 @@
 #endif
                freeaddrinfo(res);
                if (which == RTA_DST)
-                       if (inet6_makenetandmask(&su->sin6) == 128)
-                               return 1;
+                       return inet6_makenetandmask(&su->sin6);
                return 0;
            }
 #endif



Home | Main Index | Thread Index | Old Index