diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-10-25 14:48:52 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-10-25 14:48:52 +0000 |
| commit | 704e4a3e93ad3f5c9b9b9c30a6766f6abfc58571 (patch) | |
| tree | 7915a6d39304c543ab12ffae66038b0016a164ba /sys/net/route.c | |
| parent | 4aba7b0c5266e46fd43873d08a86479ced44ace1 (diff) | |
Merge rtable_mpath_conflict() into rtable_insert().
ok claudio@
Diffstat (limited to 'sys/net/route.c')
| -rw-r--r-- | sys/net/route.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index 740cf242852..5d0d707913a 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.262 2015/10/25 11:58:11 mpi Exp $ */ +/* $OpenBSD: route.c,v 1.263 2015/10/25 14:48:51 mpi Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -837,15 +837,6 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio, else memcpy(ndst, info->rti_info[RTAX_DST], dlen); -#ifndef SMALL_KERNEL - /* Do not permit exactly the same dst/mask/gw pair. */ - if (rtable_mpath_conflict(tableid, ndst, - info->rti_info[RTAX_NETMASK], info->rti_info[RTAX_GATEWAY], - prio, info->rti_flags & RTF_MPATH)) { - free(ndst, M_RTABLE, dlen); - return (EEXIST); - } -#endif rt = pool_get(&rtentry_pool, PR_NOWAIT | PR_ZERO); if (rt == NULL) { free(ndst, M_RTABLE, dlen); @@ -953,13 +944,15 @@ rtrequest1(int req, struct rt_addrinfo *info, u_int8_t prio, } error = rtable_insert(tableid, ndst, - info->rti_info[RTAX_NETMASK], rt->rt_priority, rt); + info->rti_info[RTAX_NETMASK], info->rti_info[RTAX_GATEWAY], + rt->rt_priority, rt); if (error != 0 && (crt = rtalloc(ndst, 0, tableid)) != NULL) { /* overwrite cloned route */ if ((crt->rt_flags & RTF_CLONED) != 0) { rtdeletemsg(crt, tableid); error = rtable_insert(tableid, ndst, info->rti_info[RTAX_NETMASK], + info->rti_info[RTAX_GATEWAY], rt->rt_priority, rt); } rtfree(crt); |