d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts.

Browse Source
This commit is contained in:
Sheldon Hearn 2000-08-10 07:54:33 +00:00
commit 6017865885
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=64483
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/routed/if.c
View File

@ -1128,6 +1128,9 @@ ifinit(void)
continue; continue;
if (ifp1->int_dstaddr == RIP_DEFAULT) if (ifp1->int_dstaddr == RIP_DEFAULT)
continue; continue;
/* ignore aliases on the right network */
if (!strcmp(ifp->int_name, ifp1->int_name))
continue;
if (on_net(ifp->int_dstaddr, if (on_net(ifp->int_dstaddr,
ifp1->int_net, ifp1->int_mask) ifp1->int_net, ifp1->int_mask)
|| on_net(ifp1->int_dstaddr, || on_net(ifp1->int_dstaddr,

2
sbin/routed/main.c
View File

@ -223,7 +223,7 @@ main(int argc,
case 'v': case 'v':
/* display version */ /* display version */
verbose++; verbose++;
msglog("version 2.21"); msglog("version 2.22");
break; break;
default: default:

2
sbin/routed/rdisc.c
View File

@ -41,7 +41,7 @@
#if !defined(sgi) && !defined(__NetBSD__) #if !defined(sgi) && !defined(__NetBSD__)
static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c 8.1 (Berkeley) x/y/95"; static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c 8.1 (Berkeley) x/y/95";
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
__RCSID"$NetBSD$"); __RCSID("$NetBSD$");
#endif #endif
#ident "$FreeBSD$" #ident "$FreeBSD$"

6
sbin/routed/table.c
View File

@ -639,16 +639,18 @@ rtm_type_name(u_char type)
"RTM_NEWMADDR", "RTM_NEWMADDR",
"RTM_DELMADDR" "RTM_DELMADDR"
}; };
static char name0[NAME0_LEN]; #define NEW_RTM_PAT "RTM type %#x"
static char name0[sizeof(NEW_RTM_PAT)+2];
if (type > sizeof(rtm_types)/sizeof(rtm_types[0]) if (type > sizeof(rtm_types)/sizeof(rtm_types[0])
|| type == 0) { || type == 0) {
snprintf(name0, NAME0_LEN, "RTM type %#x", type); snprintf(name0, sizeof(name0), NEW_RTM_PAT, type);
return name0; return name0;
} else { } else {
return rtm_types[type-1]; return rtm_types[type-1];
} }
#undef NEW_RTM_PAT
} }