From owner-svn-src-user@FreeBSD.ORG  Wed Oct 29 06:38:09 2008
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 E6FB2106567A;
	Wed, 29 Oct 2008 06:38:09 +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 D286E8FC18;
	Wed, 29 Oct 2008 06:38:09 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9T6c9wB015047;
	Wed, 29 Oct 2008 06:38:09 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9T6c9YQ015046;
	Wed, 29 Oct 2008 06:38:09 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810290638.m9T6c9YQ015046@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 29 Oct 2008 06:38:09 +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: r184433 - user/kmacy/HEAD_fast_xmit/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 &quot; user&quot;
	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: Wed, 29 Oct 2008 06:38:10 -0000

Author: kmacy
Date: Wed Oct 29 06:38:09 2008
New Revision: 184433
URL: http://svn.freebsd.org/changeset/base/184433

Log:
  fix sockaddr copy check in route_to_rtentry_info

Modified:
  user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c

Modified: user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Wed Oct 29 05:51:03 2008	(r184432)
+++ user/kmacy/HEAD_fast_xmit/sys/net/flowtable.c	Wed Oct 29 06:38:09 2008	(r184433)
@@ -531,10 +531,10 @@ route_to_rtentry_info(struct route *ro, 
 	ri->ri_flags = rt->rt_flags;
 	ri->ri_mtu = rt->rt_rmx.rmx_mtu;
 
-	if (rt->rt_flags & RTF_GATEWAY && !IN_MULTICAST(sin->sin_addr.s_addr))
-		memcpy(&ri->ri_dst, sin, sizeof(struct sockaddr));
-	else
+	if ((rt->rt_flags & RTF_GATEWAY) && !IN_MULTICAST(sin->sin_addr.s_addr))
 		memcpy(&ri->ri_dst, rt->rt_gateway, sizeof(struct sockaddr));
+	else
+		memcpy(&ri->ri_dst, sin, sizeof(struct sockaddr));
 
 	((struct sockaddr *)&ri->ri_dst)->sa_family = AF_INET;