Import routed-2.22.
This commit is contained in:
parent
f7434bbd42
commit
8b336df137
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/vendor/SGI/dist_v_2_21/; revision=64480 svn path=/vendor/SGI/vjs_20000806/; revision=64482; tag=vendor/SGI/vjs_20000806
@ -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,
|
||||
|
@ -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:
|
||||
|
@ -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 {
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user