netfilter: merge udp and udplite conntrack helpers
authorFlorian Westphal <fw@strlen.de>
Tue, 20 Dec 2016 20:57:02 +0000 (21:57 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 3 Jan 2017 13:33:25 +0000 (14:33 +0100)
udplite was copied from udp, they are virtually 100% identical.

This adds udplite tracker to udp instead, removes udplite module,
and then makes the udplite tracker builtin.

udplite will then simply re-use udp timeout settings.
It makes little sense to add separate sysctls, nowadays we have
fine-grained timeout policy support via the CT target.

old:
 text    data     bss     dec     hex filename
 1633     672       0    2305     901 nf_conntrack_proto_udp.o
 1756     672       0    2428     97c nf_conntrack_proto_udplite.o
69526   17937     268   87731   156b3 nf_conntrack.ko

new:
 text    data     bss     dec     hex filename
 2442    1184       0    3626     e2a nf_conntrack_proto_udp.o
68565   17721     268   86554   1521a nf_conntrack.ko

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/ipv4/nf_conntrack_ipv4.h
include/net/netfilter/ipv6/nf_conntrack_ipv6.h
include/net/netns/conntrack.h
net/netfilter/Makefile
net/netfilter/nf_conntrack_proto_udp.c
net/netfilter/nf_conntrack_proto_udplite.c [deleted file]

index 919e4e8..6ff3281 100644 (file)
@@ -14,6 +14,7 @@ extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
 
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
+extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
 #ifdef CONFIG_NF_CT_PROTO_DCCP
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4;
index eaea968..c59b824 100644 (file)
@@ -5,6 +5,7 @@ extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
 
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
+extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6;
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
 #ifdef CONFIG_NF_CT_PROTO_DCCP
 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6;
index cf799fc..17724c6 100644 (file)
@@ -69,19 +69,6 @@ struct nf_sctp_net {
 };
 #endif
 
-#ifdef CONFIG_NF_CT_PROTO_UDPLITE
-enum udplite_conntrack {
-       UDPLITE_CT_UNREPLIED,
-       UDPLITE_CT_REPLIED,
-       UDPLITE_CT_MAX
-};
-
-struct nf_udplite_net {
-       struct nf_proto_net pn;
-       unsigned int timeouts[UDPLITE_CT_MAX];
-};
-#endif
-
 struct nf_ip_net {
        struct nf_generic_net   generic;
        struct nf_tcp_net       tcp;
@@ -94,9 +81,6 @@ struct nf_ip_net {
 #ifdef CONFIG_NF_CT_PROTO_SCTP
        struct nf_sctp_net      sctp;
 #endif
-#ifdef CONFIG_NF_CT_PROTO_UDPLITE
-       struct nf_udplite_net   udplite;
-#endif
 };
 
 struct ct_pcpu {
index ca30d19..bf5c577 100644 (file)
@@ -7,7 +7,6 @@ nf_conntrack-$(CONFIG_NF_CONNTRACK_EVENTS) += nf_conntrack_ecache.o
 nf_conntrack-$(CONFIG_NF_CONNTRACK_LABELS) += nf_conntrack_labels.o
 nf_conntrack-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o
 nf_conntrack-$(CONFIG_NF_CT_PROTO_SCTP) += nf_conntrack_proto_sctp.o
-nf_conntrack-$(CONFIG_NF_CT_PROTO_UDPLITE) += nf_conntrack_proto_udplite.o
 
 obj-$(CONFIG_NETFILTER) = netfilter.o
 
index 20f35ed..ae63944 100644 (file)
@@ -108,6 +108,59 @@ static bool udp_new(struct nf_conn *ct, const struct sk_buff *skb,
        return true;
 }
 
+#ifdef CONFIG_NF_CT_PROTO_UDPLITE
+static int udplite_error(struct net *net, struct nf_conn *tmpl,
+                        struct sk_buff *skb,
+                        unsigned int dataoff,
+                        enum ip_conntrack_info *ctinfo,
+                        u8 pf, unsigned int hooknum)
+{
+       unsigned int udplen = skb->len - dataoff;
+       const struct udphdr *hdr;
+       struct udphdr _hdr;
+       unsigned int cscov;
+
+       /* Header is too small? */
+       hdr = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr);
+       if (!hdr) {
+               if (LOG_INVALID(net, IPPROTO_UDPLITE))
+                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
+                                     "nf_ct_udplite: short packet ");
+               return -NF_ACCEPT;
+       }
+
+       cscov = ntohs(hdr->len);
+       if (cscov == 0) {
+               cscov = udplen;
+       } else if (cscov < sizeof(*hdr) || cscov > udplen) {
+               if (LOG_INVALID(net, IPPROTO_UDPLITE))
+                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
+                                     "nf_ct_udplite: invalid checksum coverage ");
+               return -NF_ACCEPT;
+       }
+
+       /* UDPLITE mandates checksums */
+       if (!hdr->check) {
+               if (LOG_INVALID(net, IPPROTO_UDPLITE))
+                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
+                                     "nf_ct_udplite: checksum missing ");
+               return -NF_ACCEPT;
+       }
+
+       /* Checksum invalid? Ignore. */
+       if (net->ct.sysctl_checksum && hooknum == NF_INET_PRE_ROUTING &&
+           nf_checksum_partial(skb, hooknum, dataoff, cscov, IPPROTO_UDP,
+                               pf)) {
+               if (LOG_INVALID(net, IPPROTO_UDPLITE))
+                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
+                                     "nf_ct_udplite: bad UDPLite checksum ");
+               return -NF_ACCEPT;
+       }
+
+       return NF_ACCEPT;
+}
+#endif
+
 static int udp_error(struct net *net, struct nf_conn *tmpl, struct sk_buff *skb,
                     unsigned int dataoff, enum ip_conntrack_info *ctinfo,
                     u_int8_t pf,
@@ -290,6 +343,41 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp4);
 
+#ifdef CONFIG_NF_CT_PROTO_UDPLITE
+struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =
+{
+       .l3proto                = PF_INET,
+       .l4proto                = IPPROTO_UDPLITE,
+       .name                   = "udplite",
+       .allow_clash            = true,
+       .pkt_to_tuple           = udp_pkt_to_tuple,
+       .invert_tuple           = udp_invert_tuple,
+       .print_tuple            = udp_print_tuple,
+       .packet                 = udp_packet,
+       .get_timeouts           = udp_get_timeouts,
+       .new                    = udp_new,
+       .error                  = udplite_error,
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
+       .tuple_to_nlattr        = nf_ct_port_tuple_to_nlattr,
+       .nlattr_to_tuple        = nf_ct_port_nlattr_to_tuple,
+       .nlattr_tuple_size      = nf_ct_port_nlattr_tuple_size,
+       .nla_policy             = nf_ct_port_nla_policy,
+#endif
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+       .ctnl_timeout           = {
+               .nlattr_to_obj  = udp_timeout_nlattr_to_obj,
+               .obj_to_nlattr  = udp_timeout_obj_to_nlattr,
+               .nlattr_max     = CTA_TIMEOUT_UDP_MAX,
+               .obj_size       = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX,
+               .nla_policy     = udp_timeout_nla_policy,
+       },
+#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+       .init_net               = udp_init_net,
+       .get_net_proto          = udp_get_net_proto,
+};
+EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udplite4);
+#endif
+
 struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =
 {
        .l3proto                = PF_INET6,
@@ -322,3 +410,38 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =
        .get_net_proto          = udp_get_net_proto,
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp6);
+
+#ifdef CONFIG_NF_CT_PROTO_UDPLITE
+struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =
+{
+       .l3proto                = PF_INET6,
+       .l4proto                = IPPROTO_UDPLITE,
+       .name                   = "udplite",
+       .allow_clash            = true,
+       .pkt_to_tuple           = udp_pkt_to_tuple,
+       .invert_tuple           = udp_invert_tuple,
+       .print_tuple            = udp_print_tuple,
+       .packet                 = udp_packet,
+       .get_timeouts           = udp_get_timeouts,
+       .new                    = udp_new,
+       .error                  = udplite_error,
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
+       .tuple_to_nlattr        = nf_ct_port_tuple_to_nlattr,
+       .nlattr_to_tuple        = nf_ct_port_nlattr_to_tuple,
+       .nlattr_tuple_size      = nf_ct_port_nlattr_tuple_size,
+       .nla_policy             = nf_ct_port_nla_policy,
+#endif
+#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
+       .ctnl_timeout           = {
+               .nlattr_to_obj  = udp_timeout_nlattr_to_obj,
+               .obj_to_nlattr  = udp_timeout_obj_to_nlattr,
+               .nlattr_max     = CTA_TIMEOUT_UDP_MAX,
+               .obj_size       = sizeof(unsigned int) * CTA_TIMEOUT_UDP_MAX,
+               .nla_policy     = udp_timeout_nla_policy,
+       },
+#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
+       .init_net               = udp_init_net,
+       .get_net_proto          = udp_get_net_proto,
+};
+EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udplite6);
+#endif
diff --git a/net/netfilter/nf_conntrack_proto_udplite.c b/net/netfilter/nf_conntrack_proto_udplite.c
deleted file mode 100644 (file)
index c35f7bf..0000000
+++ /dev/null
@@ -1,324 +0,0 @@
-/* (C) 1999-2001 Paul `Rusty' Russell
- * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
- * (C) 2007 Patrick McHardy <kaber@trash.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/types.h>
-#include <linux/timer.h>
-#include <linux/udp.h>
-#include <linux/seq_file.h>
-#include <linux/skbuff.h>
-#include <linux/ipv6.h>
-#include <net/ip6_checksum.h>
-#include <net/checksum.h>
-
-#include <linux/netfilter.h>
-#include <linux/netfilter_ipv4.h>
-#include <linux/netfilter_ipv6.h>
-#include <net/netfilter/nf_conntrack_l4proto.h>
-#include <net/netfilter/nf_conntrack_ecache.h>
-#include <net/netfilter/nf_log.h>
-
-static unsigned int udplite_timeouts[UDPLITE_CT_MAX] = {
-       [UDPLITE_CT_UNREPLIED]  = 30*HZ,
-       [UDPLITE_CT_REPLIED]    = 180*HZ,
-};
-
-static inline struct nf_udplite_net *udplite_pernet(struct net *net)
-{
-       return &net->ct.nf_ct_proto.udplite;
-}
-
-static bool udplite_pkt_to_tuple(const struct sk_buff *skb,
-                                unsigned int dataoff,
-                                struct net *net,
-                                struct nf_conntrack_tuple *tuple)
-{
-       const struct udphdr *hp;
-       struct udphdr _hdr;
-
-       /* Actually only need first 4 bytes to get ports. */
-       hp = skb_header_pointer(skb, dataoff, 4, &_hdr);
-       if (hp == NULL)
-               return false;
-
-       tuple->src.u.udp.port = hp->source;
-       tuple->dst.u.udp.port = hp->dest;
-       return true;
-}
-
-static bool udplite_invert_tuple(struct nf_conntrack_tuple *tuple,
-                                const struct nf_conntrack_tuple *orig)
-{
-       tuple->src.u.udp.port = orig->dst.u.udp.port;
-       tuple->dst.u.udp.port = orig->src.u.udp.port;
-       return true;
-}
-
-/* Print out the per-protocol part of the tuple. */
-static void udplite_print_tuple(struct seq_file *s,
-                               const struct nf_conntrack_tuple *tuple)
-{
-       seq_printf(s, "sport=%hu dport=%hu ",
-                  ntohs(tuple->src.u.udp.port),
-                  ntohs(tuple->dst.u.udp.port));
-}
-
-static unsigned int *udplite_get_timeouts(struct net *net)
-{
-       return udplite_pernet(net)->timeouts;
-}
-
-/* Returns verdict for packet, and may modify conntracktype */
-static int udplite_packet(struct nf_conn *ct,
-                         const struct sk_buff *skb,
-                         unsigned int dataoff,
-                         enum ip_conntrack_info ctinfo,
-                         u_int8_t pf,
-                         unsigned int hooknum,
-                         unsigned int *timeouts)
-{
-       /* If we've seen traffic both ways, this is some kind of UDP
-          stream.  Extend timeout. */
-       if (test_bit(IPS_SEEN_REPLY_BIT, &ct->status)) {
-               nf_ct_refresh_acct(ct, ctinfo, skb,
-                                  timeouts[UDPLITE_CT_REPLIED]);
-               /* Also, more likely to be important, and not a probe */
-               if (!test_and_set_bit(IPS_ASSURED_BIT, &ct->status))
-                       nf_conntrack_event_cache(IPCT_ASSURED, ct);
-       } else {
-               nf_ct_refresh_acct(ct, ctinfo, skb,
-                                  timeouts[UDPLITE_CT_UNREPLIED]);
-       }
-       return NF_ACCEPT;
-}
-
-/* Called when a new connection for this protocol found. */
-static bool udplite_new(struct nf_conn *ct, const struct sk_buff *skb,
-                       unsigned int dataoff, unsigned int *timeouts)
-{
-       return true;
-}
-
-static int udplite_error(struct net *net, struct nf_conn *tmpl,
-                        struct sk_buff *skb,
-                        unsigned int dataoff,
-                        enum ip_conntrack_info *ctinfo,
-                        u_int8_t pf,
-                        unsigned int hooknum)
-{
-       unsigned int udplen = skb->len - dataoff;
-       const struct udphdr *hdr;
-       struct udphdr _hdr;
-       unsigned int cscov;
-
-       /* Header is too small? */
-       hdr = skb_header_pointer(skb, dataoff, sizeof(_hdr), &_hdr);
-       if (hdr == NULL) {
-               if (LOG_INVALID(net, IPPROTO_UDPLITE))
-                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
-                                     "nf_ct_udplite: short packet ");
-               return -NF_ACCEPT;
-       }
-
-       cscov = ntohs(hdr->len);
-       if (cscov == 0)
-               cscov = udplen;
-       else if (cscov < sizeof(*hdr) || cscov > udplen) {
-               if (LOG_INVALID(net, IPPROTO_UDPLITE))
-                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
-                               "nf_ct_udplite: invalid checksum coverage ");
-               return -NF_ACCEPT;
-       }
-
-       /* UDPLITE mandates checksums */
-       if (!hdr->check) {
-               if (LOG_INVALID(net, IPPROTO_UDPLITE))
-                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
-                                     "nf_ct_udplite: checksum missing ");
-               return -NF_ACCEPT;
-       }
-
-       /* Checksum invalid? Ignore. */
-       if (net->ct.sysctl_checksum && hooknum == NF_INET_PRE_ROUTING &&
-           nf_checksum_partial(skb, hooknum, dataoff, cscov, IPPROTO_UDP,
-                               pf)) {
-               if (LOG_INVALID(net, IPPROTO_UDPLITE))
-                       nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
-                                     "nf_ct_udplite: bad UDPLite checksum ");
-               return -NF_ACCEPT;
-       }
-
-       return NF_ACCEPT;
-}
-
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
-
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_cttimeout.h>
-
-static int udplite_timeout_nlattr_to_obj(struct nlattr *tb[],
-                                        struct net *net, void *data)
-{
-       unsigned int *timeouts = data;
-       struct nf_udplite_net *un = udplite_pernet(net);
-
-       /* set default timeouts for UDPlite. */
-       timeouts[UDPLITE_CT_UNREPLIED] = un->timeouts[UDPLITE_CT_UNREPLIED];
-       timeouts[UDPLITE_CT_REPLIED] = un->timeouts[UDPLITE_CT_REPLIED];
-
-       if (tb[CTA_TIMEOUT_UDPLITE_UNREPLIED]) {
-               timeouts[UDPLITE_CT_UNREPLIED] =
-                 ntohl(nla_get_be32(tb[CTA_TIMEOUT_UDPLITE_UNREPLIED])) * HZ;
-       }
-       if (tb[CTA_TIMEOUT_UDPLITE_REPLIED]) {
-               timeouts[UDPLITE_CT_REPLIED] =
-                 ntohl(nla_get_be32(tb[CTA_TIMEOUT_UDPLITE_REPLIED])) * HZ;
-       }
-       return 0;
-}
-
-static int
-udplite_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data)
-{
-       const unsigned int *timeouts = data;
-
-       if (nla_put_be32(skb, CTA_TIMEOUT_UDPLITE_UNREPLIED,
-                        htonl(timeouts[UDPLITE_CT_UNREPLIED] / HZ)) ||
-           nla_put_be32(skb, CTA_TIMEOUT_UDPLITE_REPLIED,
-                        htonl(timeouts[UDPLITE_CT_REPLIED] / HZ)))
-               goto nla_put_failure;
-       return 0;
-
-nla_put_failure:
-       return -ENOSPC;
-}
-
-static const struct nla_policy
-udplite_timeout_nla_policy[CTA_TIMEOUT_UDPLITE_MAX+1] = {
-       [CTA_TIMEOUT_UDPLITE_UNREPLIED] = { .type = NLA_U32 },
-       [CTA_TIMEOUT_UDPLITE_REPLIED]   = { .type = NLA_U32 },
-};
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-
-#ifdef CONFIG_SYSCTL
-static struct ctl_table udplite_sysctl_table[] = {
-       {
-               .procname       = "nf_conntrack_udplite_timeout",
-               .maxlen         = sizeof(unsigned int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_jiffies,
-       },
-       {
-               .procname       = "nf_conntrack_udplite_timeout_stream",
-               .maxlen         = sizeof(unsigned int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_jiffies,
-       },
-       { }
-};
-#endif /* CONFIG_SYSCTL */
-
-static int udplite_kmemdup_sysctl_table(struct nf_proto_net *pn,
-                                       struct nf_udplite_net *un)
-{
-#ifdef CONFIG_SYSCTL
-       if (pn->ctl_table)
-               return 0;
-
-       pn->ctl_table = kmemdup(udplite_sysctl_table,
-                               sizeof(udplite_sysctl_table),
-                               GFP_KERNEL);
-       if (!pn->ctl_table)
-               return -ENOMEM;
-
-       pn->ctl_table[0].data = &un->timeouts[UDPLITE_CT_UNREPLIED];
-       pn->ctl_table[1].data = &un->timeouts[UDPLITE_CT_REPLIED];
-#endif
-       return 0;
-}
-
-static int udplite_init_net(struct net *net, u_int16_t proto)
-{
-       struct nf_udplite_net *un = udplite_pernet(net);
-       struct nf_proto_net *pn = &un->pn;
-
-       if (!pn->users) {
-               int i;
-
-               for (i = 0 ; i < UDPLITE_CT_MAX; i++)
-                       un->timeouts[i] = udplite_timeouts[i];
-       }
-
-       return udplite_kmemdup_sysctl_table(pn, un);
-}
-
-struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4 __read_mostly =
-{
-       .l3proto                = PF_INET,
-       .l4proto                = IPPROTO_UDPLITE,
-       .name                   = "udplite",
-       .allow_clash            = true,
-       .pkt_to_tuple           = udplite_pkt_to_tuple,
-       .invert_tuple           = udplite_invert_tuple,
-       .print_tuple            = udplite_print_tuple,
-       .packet                 = udplite_packet,
-       .get_timeouts           = udplite_get_timeouts,
-       .new                    = udplite_new,
-       .error                  = udplite_error,
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
-       .tuple_to_nlattr        = nf_ct_port_tuple_to_nlattr,
-       .nlattr_tuple_size      = nf_ct_port_nlattr_tuple_size,
-       .nlattr_to_tuple        = nf_ct_port_nlattr_to_tuple,
-       .nla_policy             = nf_ct_port_nla_policy,
-#endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
-       .ctnl_timeout           = {
-               .nlattr_to_obj  = udplite_timeout_nlattr_to_obj,
-               .obj_to_nlattr  = udplite_timeout_obj_to_nlattr,
-               .nlattr_max     = CTA_TIMEOUT_UDPLITE_MAX,
-               .obj_size       = sizeof(unsigned int) *
-                                       CTA_TIMEOUT_UDPLITE_MAX,
-               .nla_policy     = udplite_timeout_nla_policy,
-       },
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-       .init_net               = udplite_init_net,
-};
-EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udplite4);
-
-struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =
-{
-       .l3proto                = PF_INET6,
-       .l4proto                = IPPROTO_UDPLITE,
-       .name                   = "udplite",
-       .allow_clash            = true,
-       .pkt_to_tuple           = udplite_pkt_to_tuple,
-       .invert_tuple           = udplite_invert_tuple,
-       .print_tuple            = udplite_print_tuple,
-       .packet                 = udplite_packet,
-       .get_timeouts           = udplite_get_timeouts,
-       .new                    = udplite_new,
-       .error                  = udplite_error,
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK)
-       .tuple_to_nlattr        = nf_ct_port_tuple_to_nlattr,
-       .nlattr_tuple_size      = nf_ct_port_nlattr_tuple_size,
-       .nlattr_to_tuple        = nf_ct_port_nlattr_to_tuple,
-       .nla_policy             = nf_ct_port_nla_policy,
-#endif
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
-       .ctnl_timeout           = {
-               .nlattr_to_obj  = udplite_timeout_nlattr_to_obj,
-               .obj_to_nlattr  = udplite_timeout_obj_to_nlattr,
-               .nlattr_max     = CTA_TIMEOUT_UDPLITE_MAX,
-               .obj_size       = sizeof(unsigned int) *
-                                       CTA_TIMEOUT_UDPLITE_MAX,
-               .nla_policy     = udplite_timeout_nla_policy,
-       },
-#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
-       .init_net               = udplite_init_net,
-};
-EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udplite6);