From owner-svn-src-user@FreeBSD.ORG  Sun Feb  7 00:26:48 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 15770106566B;
	Sun,  7 Feb 2010 00:26:48 +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 067738FC0A;
	Sun,  7 Feb 2010 00:26:48 +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 o170QlcE083601;
	Sun, 7 Feb 2010 00:26:47 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o170Qlux083599;
	Sun, 7 Feb 2010 00:26:47 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201002070026.o170Qlux083599@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 7 Feb 2010 00:26:47 +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: r203583 - 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 &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: Sun, 07 Feb 2010 00:26:48 -0000

Author: kmacy
Date: Sun Feb  7 00:26:47 2010
New Revision: 203583
URL: http://svn.freebsd.org/changeset/base/203583

Log:
  simplify print_tuple
  fix call

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	Sun Feb  7 00:08:26 2010	(r203582)
+++ user/kmacy/head_flowtable_v6/sys/net/flowtable.c	Sun Feb  7 00:26:47 2010	(r203583)
@@ -459,8 +459,8 @@ ipv4_flow_print_tuple(int flags, int pro
 	char saddr[4*sizeof "123"], daddr[4*sizeof "123"];
 
 	if (flags & FL_HASH_ALL) {
-		inet_ntoa_r(*(struct in_addr *) &dsin->sin_addr, daddr);
-		inet_ntoa_r(*(struct in_addr *) &ssin->sin_addr, saddr);
+		inet_ntoa_r(ssin->sin_addr, saddr);
+		inet_ntoa_r(dsin->sin_addr, daddr);
 		printf("proto=%d %s:%d->%s:%d\n",
 		    proto, saddr, ntohs(ssin->sin_port), daddr,
 		    ntohs(dsin->sin_port));
@@ -967,9 +967,9 @@ kern_flowtable_insert(struct flowtable *
 	    "kern_flowtable_insert: hash=0x%x fibnum=%d flags=0x%x\n",
 	    hash, fibnum, flags);
 #ifdef FLOWTABLE_DEBUG
-	if (*flags & FL_DEBUG)
+	if (flags & FL_DEBUG)
 		ipv4_flow_print_tuple(flags, flags_to_proto(flags),
-		    (struct sockaddr_in *)&ssa, (struct sockaddr_in *)&dsa);
+		    (struct sockaddr_in *)ssa, (struct sockaddr_in *)dsa);
 #endif	
 	return (flowtable_insert(ft, hash, key, fibnum, ro, flags));
 }