From owner-svn-src-user@FreeBSD.ORG Wed Apr 15 20:55:20 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 631441065741;
Wed, 15 Apr 2009 20:55:20 +0000 (UTC)
(envelope-from piso@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 4FC7D8FC1B;
Wed, 15 Apr 2009 20:55:20 +0000 (UTC)
(envelope-from piso@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 n3FKtKd1054540;
Wed, 15 Apr 2009 20:55:20 GMT (envelope-from piso@svn.freebsd.org)
Received: (from piso@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3FKtKhh054539;
Wed, 15 Apr 2009 20:55:20 GMT (envelope-from piso@svn.freebsd.org)
Message-Id: <200904152055.n3FKtKhh054539@svn.freebsd.org>
From: Paolo Pisati <piso@FreeBSD.org>
Date: Wed, 15 Apr 2009 20:55:20 +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: r191122 - user/piso/ipfw/sys/netinet/libalias
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: Wed, 15 Apr 2009 20:55:21 -0000
Author: piso
Date: Wed Apr 15 20:55:20 2009
New Revision: 191122
URL: http://svn.freebsd.org/changeset/base/191122
Log:
Make alias_dummy mbuf safe.
Modified:
user/piso/ipfw/sys/netinet/libalias/alias_dummy.c
Modified: user/piso/ipfw/sys/netinet/libalias/alias_dummy.c
==============================================================================
--- user/piso/ipfw/sys/netinet/libalias/alias_dummy.c Wed Apr 15 20:53:34 2009 (r191121)
+++ user/piso/ipfw/sys/netinet/libalias/alias_dummy.c Wed Apr 15 20:55:20 2009 (r191122)
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
#endif
static void
-AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah);
+AliasHandleDummy(struct libalias *la, pkt_t ptr, struct alias_data *ah);
static int
fingerprint(struct libalias *la, struct alias_data *ah)
@@ -92,15 +92,8 @@ fingerprint(struct libalias *la, struct
static int
protohandler(struct libalias *la, pkt_t ptr, struct alias_data *ah)
{
- struct ip *pip;
-#ifdef _KERNEL
- if (ptr == NULL)
- pip = (struct ip *)la->buf;
- else
-#endif
- PULLUP_IPHDR(pip, ptr);
- AliasHandleDummy(la, pip, ah);
+ AliasHandleDummy(la, ptr, ah);
return (0);
}
@@ -117,7 +110,7 @@ struct proto_handler handlers [] = {
.pri = 666,
.dir = IN|OUT,
.proto = UDP|TCP,
- .legacy = 1,
+ .legacy = 0,
.fingerprint = &fingerprint,
.protohandler = &protohandler
},
@@ -158,8 +151,7 @@ MODULE_DEPEND(alias_dummy, libalias, 1,
#endif
static void
-AliasHandleDummy(struct libalias *la, struct ip *ip, struct alias_data *ah)
+AliasHandleDummy(struct libalias *la, pkt_t ptr, struct alias_data *ah)
{
; /* Dummy. */
}
-