All, I know I have sent this a couple of times before, but never got anywhere. This time I am set to commit!
The attached patch (http://people.freebsd.org/~mlaier/in.c.patch) derived from WIDE via OpenBSD in.c, rev 1.21 improves the handling of automatic prefix routes. Right now you can't have two legs into the same network. If you want to, you must give on of the interfaces a host address only (netmask /32). This way it is not possible to hand over the route if one of the interfaces is "removed" (however this is done in the special case). The patch allows to add more than on IPv4 address with the same prefix. In the case that there is a route already, we leave it alone and add the new address without the IFA_ROUTE flag. When we remove an address later on, that has a route associated, we try to find an alternative address to use for the route and hand it over. This is required for CARP, but should be helpful for other situations as well. Any objections? I also plan to merge this back to RELENG_5 after some time. I don't see this breaking assumptions (it was an error case before) - please tell me if you see something. -- /"\ Best regards, | [EMAIL PROTECTED] \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | [EMAIL PROTECTED] / \ ASCII Ribbon Campaign | Against HTML Mail and News
--- ../dist/sys/netinet/in.c Sat Nov 6 21:01:08 2004
+++ sys/netinet/in.c Mon Nov 8 02:05:17 2004
@@ -1,4 +1,32 @@
/*
+ * Copyright (C) 2001 WIDE Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
* Copyright (c) 1982, 1986, 1991, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -55,6 +83,8 @@
static int in_lifaddr_ioctl(struct socket *, u_long, caddr_t,
struct ifnet *, struct thread *);
+static int in_addprefix(struct in_ifaddr *, int);
+static int in_scrubprefix(struct in_ifaddr *);
static void in_socktrim(struct sockaddr_in *);
static int in_ifinit(struct ifnet *,
struct in_ifaddr *, struct sockaddr_in *, int);
@@ -654,14 +684,7 @@
register struct ifnet *ifp;
register struct in_ifaddr *ia;
{
-
- if ((ia->ia_flags & IFA_ROUTE) == 0)
- return;
- if (ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT))
- rtinit(&(ia->ia_ifa), (int)RTM_DELETE, RTF_HOST);
- else
- rtinit(&(ia->ia_ifa), (int)RTM_DELETE, 0);
- ia->ia_flags &= ~IFA_ROUTE;
+ in_scrubprefix(ia);
}
/*
@@ -743,26 +766,7 @@
return (0);
flags |= RTF_HOST;
}
-
- /*-
- * Don't add host routes for interface addresses of
- * 0.0.0.0 --> 0.255.255.255 netmask 255.0.0.0. This makes it
- * possible to assign several such address pairs with consistent
- * results (no host route) and is required by BOOTP.
- *
- * XXX: This is ugly ! There should be a way for the caller to
- * say that they don't want a host route.
- */
- if (ia->ia_addr.sin_addr.s_addr != INADDR_ANY ||
- ia->ia_netmask != IN_CLASSA_NET ||
- ia->ia_dstaddr.sin_addr.s_addr != htonl(IN_CLASSA_HOST)) {
- if ((error = rtinit(&ia->ia_ifa, (int)RTM_ADD, flags)) != 0) {
- ia->ia_addr = oldaddr;
- return (error);
- }
- ia->ia_flags |= IFA_ROUTE;
- }
-
+ error = in_addprefix(ia, flags);
/*
* If the interface supports multicast, join the "all hosts"
* multicast group on that interface.
@@ -776,6 +780,118 @@
return (error);
}
+#define rtinitflags(x) \
+ ((((x)->ia_ifp->if_flags & (IFF_LOOPBACK | IFF_POINTOPOINT)) != 0) \
+ ? RTF_HOST : 0)
+/*
+ * add a route to prefix ("connected route" in cisco terminology).
+ * does nothing if there's some interface address with the same prefix already.
+ */
+static int
+in_addprefix(target, flags)
+ struct in_ifaddr *target;
+ int flags;
+{
+ struct in_ifaddr *ia;
+ struct in_addr prefix, mask, p;
+ int error;
+
+ if ((flags & RTF_HOST) != 0)
+ prefix = target->ia_dstaddr.sin_addr;
+ else {
+ prefix = target->ia_addr.sin_addr;
+ mask = target->ia_sockmask.sin_addr;
+ prefix.s_addr &= mask.s_addr;
+ }
+
+ TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) {
+ if (rtinitflags(ia))
+ p = ia->ia_dstaddr.sin_addr;
+ else {
+ p = ia->ia_addr.sin_addr;
+ p.s_addr &= ia->ia_sockmask.sin_addr.s_addr;
+ }
+
+ if (prefix.s_addr != p.s_addr)
+ continue;
+
+ /*
+ * if we got a matching prefix route inserted by other
+ * interface adderss, we don't need to bother
+ */
+ if (ia->ia_flags & IFA_ROUTE)
+ return 0;
+ }
+
+ /*
+ * noone seem to have prefix route. insert it.
+ */
+ error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
+ if (!error)
+ target->ia_flags |= IFA_ROUTE;
+ return error;
+}
+
+/*
+ * remove a route to prefix ("connected route" in cisco terminology).
+ * re-installs the route by using another interface address, if there's one
+ * with the same prefix (otherwise we lose the route mistakenly).
+ */
+static int
+in_scrubprefix(target)
+ struct in_ifaddr *target;
+{
+ struct in_ifaddr *ia;
+ struct in_addr prefix, mask, p;
+ int error;
+
+ if ((target->ia_flags & IFA_ROUTE) == 0)
+ return 0;
+
+ if (rtinitflags(target))
+ prefix = target->ia_dstaddr.sin_addr;
+ else {
+ prefix = target->ia_addr.sin_addr;
+ mask = target->ia_sockmask.sin_addr;
+ prefix.s_addr &= mask.s_addr;
+ }
+
+ TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) {
+ if (rtinitflags(ia))
+ p = ia->ia_dstaddr.sin_addr;
+ else {
+ p = ia->ia_addr.sin_addr;
+ p.s_addr &= ia->ia_sockmask.sin_addr.s_addr;
+ }
+
+ if (prefix.s_addr != p.s_addr)
+ continue;
+
+ /*
+ * if we got a matching prefix route, move IFA_ROUTE to him
+ */
+ if ((ia->ia_flags & IFA_ROUTE) == 0) {
+ rtinit(&(target->ia_ifa), (int)RTM_DELETE,
+ rtinitflags(target));
+ target->ia_flags &= ~IFA_ROUTE;
+
+ error = rtinit(&ia->ia_ifa, (int)RTM_ADD,
+ rtinitflags(ia) | RTF_UP);
+ if (error == 0)
+ ia->ia_flags |= IFA_ROUTE;
+ return error;
+ }
+ }
+
+ /*
+ * noone seem to have prefix route. remove it.
+ */
+ rtinit(&(target->ia_ifa), (int)RTM_DELETE, rtinitflags(target));
+ target->ia_flags &= ~IFA_ROUTE;
+ return 0;
+}
+
+#undef rtinitflags
/*
* Return 1 if the address might be a local broadcast address.
pgpylyHcAwics.pgp
Description: PGP signature
