aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSheldon Hearn <sheldonh@FreeBSD.org>2000-08-10 07:48:06 +0000
committerSheldon Hearn <sheldonh@FreeBSD.org>2000-08-10 07:48:06 +0000
commit8b336df137952a0496f5e8d30747d009c939724e (patch)
tree58eef3fe97fd02c55eac96231a9f56e0cf48b9f6
parentf7434bbd426c21f1c43d81bdb6323110b29955b9 (diff)
downloadsrc-8b336df137952a0496f5e8d30747d009c939724e.tar.gz
src-8b336df137952a0496f5e8d30747d009c939724e.zip
Import routed-2.22.vendor/SGI/vjs_20000806
Notes
Notes: svn path=/vendor/SGI/dist_v_2_21/; revision=64480 svn path=/vendor/SGI/vjs_20000806/; revision=64482; tag=vendor/SGI/vjs_20000806
-rw-r--r--sbin/routed/if.c5
-rw-r--r--sbin/routed/main.c4
-rw-r--r--sbin/routed/rdisc.c4
-rw-r--r--sbin/routed/table.c12
4 files changed, 16 insertions, 9 deletions
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 54228ce24aa8..c72c10ed4804 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -40,7 +40,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)if.c 8.1 (Berkeley) 6/5/93";
#include <sys/cdefs.h>
__RCSID("$NetBSD$");
#endif
-#ident "$Revision: 2.17 $"
+#ident "$Revision: 2.22 $"
struct interface *ifnet; /* all interfaces */
@@ -1126,6 +1126,9 @@ ifinit(void)
continue;
if (ifp1->int_dstaddr == RIP_DEFAULT)
continue;
+ /* ignore aliases on the right network */
+ if (!strcmp(ifp->int_name, ifp1->int_name))
+ continue;
if (on_net(ifp->int_dstaddr,
ifp1->int_net, ifp1->int_mask)
|| on_net(ifp1->int_dstaddr,
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index ae4aaeeb09c5..15ad6ef7ea3c 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -50,7 +50,7 @@ __RCSID("$NetBSD$");
__COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n\
The Regents of the University of California. All rights reserved.\n");
#endif
-#ident "$Revision: 2.21 $"
+#ident "$Revision: 2.22 $"
pid_t mypid;
@@ -221,7 +221,7 @@ main(int argc,
case 'v':
/* display version */
verbose++;
- msglog("version 2.21");
+ msglog("version 2.22");
break;
default:
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 7d992227130b..d76041d60c10 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -39,9 +39,9 @@
#if !defined(sgi) && !defined(__NetBSD__)
static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c 8.1 (Berkeley) x/y/95";
#elif defined(__NetBSD__)
-__RCSID"$NetBSD$");
+__RCSID("$NetBSD$");
#endif
-#ident "$Revision: 2.20 $"
+#ident "$Revision: 2.22 $"
/* router advertisement ICMP packet */
struct icmp_ad {
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 1ec0153c4b75..325139ff21b0 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -38,7 +38,7 @@ static char sccsid[] __attribute__((unused)) = "@(#)tables.c 8.1 (Berkeley) 6/5/
#elif defined(__NetBSD__)
__RCSID("$NetBSD$");
#endif
-#ident "$Revision: 2.20 $"
+#ident "$Revision: 2.22 $"
static struct rt_spare *rts_better(struct rt_entry *);
static struct rt_spare rts_empty = {0,0,0,HOPCNT_INFINITY,0,0,0};
@@ -632,18 +632,22 @@ rtm_type_name(u_char type)
"RTM_RESOLVE",
"RTM_NEWADDR",
"RTM_DELADDR",
- "RTM_IFINFO"
+ "RTM_IFINFO",
+ "RTM_NEWMADDR",
+ "RTM_DELMADDR"
};
- static char name0[10];
+#define NEW_RTM_PAT "RTM type %#x"
+ static char name0[sizeof(NEW_RTM_PAT)+2];
if (type > sizeof(rtm_types)/sizeof(rtm_types[0])
|| type == 0) {
- sprintf(name0, "RTM type %#x", type);
+ snprintf(name0, sizeof(name0), NEW_RTM_PAT, type);
return name0;
} else {
return rtm_types[type-1];
}
+#undef NEW_RTM_PAT
}