From owner-svn-src-user@FreeBSD.ORG  Thu Jan  1 03:10:12 2009
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 58D8A106566B;
	Thu,  1 Jan 2009 03:10:12 +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 47C028FC1F;
	Thu,  1 Jan 2009 03:10:12 +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 n013ACns042822;
	Thu, 1 Jan 2009 03:10:12 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n013ACBm042821;
	Thu, 1 Jan 2009 03:10:12 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200901010310.n013ACBm042821@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 1 Jan 2009 03:10:12 +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: r186673 -
	user/kmacy/HEAD_fast_net/contrib/ipfilter/tools
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: Thu, 01 Jan 2009 03:10:12 -0000

Author: kmacy
Date: Thu Jan  1 03:10:11 2009
New Revision: 186673
URL: http://svn.freebsd.org/changeset/base/186673

Log:
  update if_output call

Modified:
  user/kmacy/HEAD_fast_net/contrib/ipfilter/tools/ipftest.c

Modified: user/kmacy/HEAD_fast_net/contrib/ipfilter/tools/ipftest.c
==============================================================================
--- user/kmacy/HEAD_fast_net/contrib/ipfilter/tools/ipftest.c	Thu Jan  1 03:08:34 2009	(r186672)
+++ user/kmacy/HEAD_fast_net/contrib/ipfilter/tools/ipftest.c	Thu Jan  1 03:10:11 2009	(r186673)
@@ -9,6 +9,9 @@
 #include "ipt.h"
 #include <sys/ioctl.h>
 #include <sys/file.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/route.h>
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipt.c	1.19 6/3/96 (C) 1993-2000 Darren Reed";
@@ -282,16 +285,20 @@ char *argv[];
 			printf("--------------");
 		} else if ((opts & (OPT_BRIEF|OPT_NAT)) == (OPT_NAT|OPT_BRIEF))
 			printpacket(ip);
-		if (dir && (ifp != NULL) && IP_V(ip) && (m != NULL))
+		if (dir && (ifp != NULL) && IP_V(ip) && (m != NULL)) {
+			struct route ro;
+			bzero(&ro, sizeof(ro));
 #if  defined(__sgi) && (IRIX < 60500)
 			(*ifp->if_output)(ifp, (void *)m, NULL);
 #else
 # if TRU64 >= 1885
 			(*ifp->if_output)(ifp, (void *)m, NULL, 0, 0);
 # else
-			(*ifp->if_output)(ifp, (void *)m, NULL, 0);
+			(*ifp->if_output)(ifp, (void *)m, &ro);
 # endif
 #endif
+		}
+		
 		if ((opts & (OPT_BRIEF|OPT_NAT)) != (OPT_NAT|OPT_BRIEF))
 			putchar('\n');
 		dir = 0;