From patchwork Wed Mar 25 20:34:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: holger@eitzenberger.org X-Patchwork-Id: 25102 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id AC9D8DDDA0 for ; Thu, 26 Mar 2009 07:46:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753895AbZCYUqQ (ORCPT ); Wed, 25 Mar 2009 16:46:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753753AbZCYUqO (ORCPT ); Wed, 25 Mar 2009 16:46:14 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:62884 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbZCYUqH (ORCPT ); Wed, 25 Mar 2009 16:46:07 -0400 Received: from kruemel.eitzenberger.org (p54AD0D79.dip0.t-ipconnect.de [84.173.13.121]) by mrelayeu.kundenserver.de (node=mrelayeu7) with ESMTP (Nemesis) id 0ML2xA-1LmZzA07Mw-0007vp; Wed, 25 Mar 2009 21:46:04 +0100 Received: from [192.168.11.10] (helo=jonathan.eitzenberger.org ident=holger) by kruemel.eitzenberger.org with smtp (Exim 4.50) id 1LmZz8-00005T-9T; Wed, 25 Mar 2009 21:46:03 +0100 Received: by jonathan.eitzenberger.org (sSMTP sendmail emulation); Wed, 25 Mar 2009 21:46:01 +0100 Message-Id: <20090325204601.730465387@jonathan.eitzenberger.org> References: <20090325203404.581023828@jonathan.eitzenberger.org> User-Agent: quilt/0.46-1 Date: Wed, 25 Mar 2009 21:34:06 +0100 From: Holger Eitzenberger To: Patrick McHardy Cc: pablo@netfilter.org, netfilter-devel@vger.kernel.org, netdev@vger.kernel.org Subject: [patch 2/3] netfilter: add generic function to get len of generic policy Content-Disposition: inline; filename=netfilter-add-generic-fn-for-generic-policy.diff X-Provags-ID: V01U2FsdGVkX1/eelNIG7TLWQP7DMhht5pP74YXZiUdsHRb883 5+9icTg9tSpcEhNmn+YgjtjYIGd29DNfapycujE5YYgIoHSbhp QO72o1KGKGtnh0st9mHF+MSStQ2DQRSTNMeYjG0QFo= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Usefull for all protocols which do not add additional data, such as GRE or UDPlite. Signed-off-by: Holger Eitzenberger Index: nf-next-2.6/include/net/netfilter/nf_conntrack_l4proto.h =================================================================== --- nf-next-2.6.orig/include/net/netfilter/nf_conntrack_l4proto.h +++ nf-next-2.6/include/net/netfilter/nf_conntrack_l4proto.h @@ -113,6 +113,7 @@ extern int nf_ct_port_tuple_to_nlattr(st const struct nf_conntrack_tuple *tuple); extern int nf_ct_port_nlattr_to_tuple(struct nlattr *tb[], struct nf_conntrack_tuple *t); +extern int nf_ct_port_nlattr_tuple_size(void); extern const struct nla_policy nf_ct_port_nla_policy[]; #ifdef CONFIG_SYSCTL Index: nf-next-2.6/net/netfilter/nf_conntrack_core.c =================================================================== --- nf-next-2.6.orig/net/netfilter/nf_conntrack_core.c +++ nf-next-2.6/net/netfilter/nf_conntrack_core.c @@ -906,6 +906,12 @@ int nf_ct_port_nlattr_to_tuple(struct nl return 0; } EXPORT_SYMBOL_GPL(nf_ct_port_nlattr_to_tuple); + +int nf_ct_port_nlattr_tuple_size(void) +{ + return nla_policy_len(nf_ct_port_nla_policy, CTA_PROTO_MAX + 1); +} +EXPORT_SYMBOL_GPL(nf_ct_port_nlattr_tuple_size); #endif /* Used by ipt_REJECT and ip6t_REJECT. */