From owner-svn-src-user@FreeBSD.ORG Thu Feb 18 04:32:54 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id A39671065670;
Thu, 18 Feb 2010 04:32:54 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 79AAA8FC18;
Thu, 18 Feb 2010 04:32:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1I4WsDt055897;
Thu, 18 Feb 2010 04:32:54 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1I4WsYD055895;
Thu, 18 Feb 2010 04:32:54 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201002180432.o1I4WsYD055895@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 18 Feb 2010 04:32:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r204028 - user/kmacy/head_flowtable_v6/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 04:32:54 -0000
Author: kmacy
Date: Thu Feb 18 04:32:54 2010
New Revision: 204028
URL: http://svn.freebsd.org/changeset/base/204028
Log:
- white space cleanup
- don't use flowtable if src == dst
Modified:
user/kmacy/head_flowtable_v6/sys/net/flowtable.c
Modified: user/kmacy/head_flowtable_v6/sys/net/flowtable.c
==============================================================================
--- user/kmacy/head_flowtable_v6/sys/net/flowtable.c Thu Feb 18 03:32:51 2010 (r204027)
+++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c Thu Feb 18 04:32:54 2010 (r204028)
@@ -1035,14 +1035,15 @@ flowtable_lookup(struct flowtable *ft, s
memcpy(&ro->ro_dst, dsa, sizeof(struct sockaddr_in));
dsin = (struct sockaddr_in *)dsa;
ssin = (struct sockaddr_in *)ssa;
- if ((ntohl(dsin->sin_addr.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET ||
+ if ((dsin->sin_addr.s_addr == ssin->sin_addr.s_addr) ||
+ (ntohl(dsin->sin_addr.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET ||
(ntohl(ssin->sin_addr.s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
return (NULL);
hash = ipv4_flow_lookup_hash_internal(ssin, dsin, key, flags);
}
-#endif
-#ifdef INET6
+#endif
+#ifdef INET6
if (ssa->ss_family == AF_INET6) {
struct sockaddr_in6 *ssin6, *dsin6;
@@ -1111,7 +1112,7 @@ uncached:
if ((ro->ro_dst.sa_family != AF_INET) &&
(ro->ro_dst.sa_family != AF_INET6))
panic("sa_family == %d\n", ro->ro_dst.sa_family);
-
+
ft->ft_rtalloc(ro, hash, fibnum);
if (ro->ro_rt == NULL)
error = ENETUNREACH;
@@ -1126,7 +1127,7 @@ uncached:
ro->ro_rt = NULL;
return (NULL);
}
-#ifdef INET6
+#ifdef INET6
if (ssa->ss_family == AF_INET6) {
if (rt->rt_flags & RTF_GATEWAY)
l3addr = (struct sockaddr_storage *)rt->rt_gateway;
@@ -1136,7 +1137,7 @@ uncached:
llentry_update(&lle, LLTABLE6(ifp), l3addr, ifp);
}
#endif
-#ifdef INET
+#ifdef INET
if (ssa->ss_family == AF_INET) {
if (rt->rt_flags & RTF_GATEWAY)
l3addr = (struct sockaddr_storage *)rt->rt_gateway;
@@ -1154,7 +1155,7 @@ uncached:
return (NULL);
}
error = flowtable_insert(ft, hash, key, fibnum, ro, flags);
-
+
if (error) {
RTFREE(rt);
LLE_FREE(lle);