From owner-svn-src-user@FreeBSD.ORG Mon Apr 13 09:45:04 2009 Return-Path: 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 351D01065670; Mon, 13 Apr 2009 09:45:04 +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 0A0BF8FC0A; Mon, 13 Apr 2009 09:45:04 +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 n3D9j33G064994; Mon, 13 Apr 2009 09:45:03 GMT (envelope-from piso@svn.freebsd.org) Received: (from piso@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3D9j3Y1064992; Mon, 13 Apr 2009 09:45:03 GMT (envelope-from piso@svn.freebsd.org) Message-Id: <200904130945.n3D9j3Y1064992@svn.freebsd.org> From: Paolo Pisati Date: Mon, 13 Apr 2009 09:45:03 +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: r190994 - 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Apr 2009 09:45:04 -0000 Author: piso Date: Mon Apr 13 09:45:03 2009 New Revision: 190994 URL: http://svn.freebsd.org/changeset/base/190994 Log: Remove megapullup() from main libalias since it is not used anymore. Modified: user/piso/ipfw/sys/netinet/libalias/alias.c user/piso/ipfw/sys/netinet/libalias/alias.h Modified: user/piso/ipfw/sys/netinet/libalias/alias.c ============================================================================== --- user/piso/ipfw/sys/netinet/libalias/alias.c Mon Apr 13 09:23:20 2009 (r190993) +++ user/piso/ipfw/sys/netinet/libalias/alias.c Mon Apr 13 09:45:03 2009 (r190994) @@ -1742,40 +1742,3 @@ LibAliasUnLoadAllModule(void) } #endif - -#ifdef _KERNEL -/* - * m_megapullup() - this function is a big hack. - * Thankfully, it's only used in ng_nat and ipfw+nat. - * - * It allocates an mbuf with cluster and copies the whole chain into cluster, - * so that it is all contiguous and the whole packet can be accessed via a - * plain (char *) pointer. This is required, because libalias doesn't know - * how to handle mbuf chains. - * - * On success, m_megapullup returns an mbuf with cluster containing the input - * packet, on failure NULL. In both cases, the input packet is consumed. - */ -struct mbuf * -m_megapullup(struct mbuf *m, int len) { - struct mbuf *mcl; - caddr_t cp; - - if (len > MCLBYTES) - goto bad; - - if ((mcl = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR)) == NULL) - goto bad; - - cp = mtod(mcl, caddr_t); - m_copydata(m, 0, len, cp); - m_move_pkthdr(mcl, m); - mcl->m_len = mcl->m_pkthdr.len; - m_freem(m); - - return (mcl); -bad: - m_freem(m); - return (NULL); -} -#endif Modified: user/piso/ipfw/sys/netinet/libalias/alias.h ============================================================================== --- user/piso/ipfw/sys/netinet/libalias/alias.h Mon Apr 13 09:23:20 2009 (r190993) +++ user/piso/ipfw/sys/netinet/libalias/alias.h Mon Apr 13 09:45:03 2009 (r190994) @@ -207,9 +207,6 @@ int LibAliasLoadModule(char int LibAliasUnLoadAllModule(void); int LibAliasRefreshModules(void); -/* Mbuf helper function. */ -struct mbuf *m_megapullup(struct mbuf *, int); - /* * Mode flags and other constants. */