From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [PATCH 2/5] Add support for SCTP Date: Sun, 09 Dec 2007 19:20:31 +0100 Message-ID: <475C31EF.6040007@netfilter.org> References: <475C3032.5040706@netfilter.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------020605030907000304040204" Cc: Patrick McHardy To: Netfilter Development Mailinglist Return-path: Received: from mail.us.es ([193.147.175.20]:55056 "EHLO us.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750785AbXLISVB (ORCPT ); Sun, 9 Dec 2007 13:21:01 -0500 In-Reply-To: <475C3032.5040706@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --------------020605030907000304040204 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Pablo Neira Ayuso wrote: > Index: net-2.6.git/net/netfilter/nf_conntrack_proto_sctp.c > =================================================================== > --- net-2.6.git.orig/net/netfilter/nf_conntrack_proto_sctp.c 2007-12-08 19:47:47.000000000 +0100 > +++ net-2.6.git/net/netfilter/nf_conntrack_proto_sctp.c 2007-12-08 19:47:52.000000000 +0100 > @@ -619,6 +619,16 @@ static struct nf_conntrack_l4proto nf_co > .packet = sctp_packet, > .new = sctp_new, > .me = THIS_MODULE, > +#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) > + .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, > + .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, > + .nla_policy = nf_ct_port_nla_policy, > +#endif > +#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) > + .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, > + .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, > + .nla_policy = nf_ct_port_nla_policy, > +#endif ^^^ Strange, this patch has been mangled by quilt or something (duplicated #ifdef). Surprisingly, the compiler doesn't warn about it. New patch attached. Sorry. -- "Los honestos son inadaptados sociales" -- Les Luthiers --------------020605030907000304040204 Content-Type: text/x-patch; name="02.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="02.patch" [PATCH][CTNETLINK] Add support for SCTP This patch adds support for SCTP to ctnetlink. Signed-off-by: Pablo Neira Ayuso Index: net-2.6.git/net/netfilter/nf_conntrack_proto_sctp.c =================================================================== --- net-2.6.git.orig/net/netfilter/nf_conntrack_proto_sctp.c 2007-12-08 21:42:27.000000000 +0100 +++ net-2.6.git/net/netfilter/nf_conntrack_proto_sctp.c 2007-12-09 19:18:11.000000000 +0100 @@ -619,6 +619,11 @@ static struct nf_conntrack_l4proto nf_co .packet = sctp_packet, .new = sctp_new, .me = THIS_MODULE, +#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE) + .tuple_to_nlattr = nf_ct_port_tuple_to_nlattr, + .nlattr_to_tuple = nf_ct_port_nlattr_to_tuple, + .nla_policy = nf_ct_port_nla_policy, +#endif #ifdef CONFIG_SYSCTL .ctl_table_users = &sctp_sysctl_table_users, .ctl_table_header = &sctp_sysctl_header, --------------020605030907000304040204--