Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ad652f authored by Davide Caratti's avatar Davide Caratti Committed by Pablo Neira Ayuso
Browse files

netfilter: built-in NAT support for UDPlite 



CONFIG_NF_NAT_PROTO_UDPLITE is no more a tristate. When set to y, NAT
support for UDPlite protocol is built-in into nf_nat.ko.

footprint test:

(nf_nat_proto_)           |udplite || nf_nat
--------------------------+--------++--------
no builtin                | 408048 || 2241312
UDPLITE builtin           |   -    || 2577256

Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 7a2dd28c

include/net/netfilter/nf_nat_l4proto.h

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ extern const struct nf_nat_l4proto nf_nat_l4proto_dccp; 
#ifdef CONFIG_NF_NAT_PROTO_SCTP

extern const struct nf_nat_l4proto nf_nat_l4proto_sctp;

#endif

#ifdef CONFIG_NF_NAT_PROTO_UDPLITE

extern const struct nf_nat_l4proto nf_nat_l4proto_udplite;

#endif



bool nf_nat_l4proto_in_range(const struct nf_conntrack_tuple *tuple,

			     enum nf_nat_manip_type maniptype,

net/netfilter/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ config NF_NAT_PROTO_DCCP 
	default NF_NAT && NF_CT_PROTO_DCCP



config NF_NAT_PROTO_UDPLITE

	tristate

	bool

	depends on NF_NAT && NF_CT_PROTO_UDPLITE

	default NF_NAT && NF_CT_PROTO_UDPLITE

net/netfilter/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o 
nf_nat-y	:= nf_nat_core.o nf_nat_proto_unknown.o nf_nat_proto_common.o \

		   nf_nat_proto_udp.o nf_nat_proto_tcp.o nf_nat_helper.o



# NAT protocols (nf_nat)

nf_nat-$(CONFIG_NF_NAT_PROTO_DCCP) += nf_nat_proto_dccp.o

nf_nat-$(CONFIG_NF_NAT_PROTO_SCTP) += nf_nat_proto_sctp.o

nf_nat-$(CONFIG_NF_NAT_PROTO_UDPLITE) += nf_nat_proto_udplite.o



# generic transport layer logging

obj-$(CONFIG_NF_LOG_COMMON) += nf_log_common.o
@@ -57,9 +59,6 @@ obj-$(CONFIG_NF_LOG_NETDEV) += nf_log_netdev.o 
obj-$(CONFIG_NF_NAT) += nf_nat.o

obj-$(CONFIG_NF_NAT_REDIRECT) += nf_nat_redirect.o



# NAT protocols (nf_nat)

obj-$(CONFIG_NF_NAT_PROTO_UDPLITE) += nf_nat_proto_udplite.o



# NAT helpers

obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o

obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o

net/netfilter/nf_nat_core.c

+4 −0
Original line number Diff line number Diff line
@@ -689,6 +689,10 @@ int nf_nat_l3proto_register(const struct nf_nat_l3proto *l3proto) 
#ifdef CONFIG_NF_NAT_PROTO_SCTP

	RCU_INIT_POINTER(nf_nat_l4protos[l3proto->l3proto][IPPROTO_SCTP],

			 &nf_nat_l4proto_sctp);

#endif

#ifdef CONFIG_NF_NAT_PROTO_UDPLITE

	RCU_INIT_POINTER(nf_nat_l4protos[l3proto->l3proto][IPPROTO_UDPLITE],

			 &nf_nat_l4proto_udplite);

#endif

	mutex_unlock(&nf_nat_proto_mutex);

net/netfilter/nf_nat_proto_udplite.c

+1 −34
Original line number Diff line number Diff line
@@ -8,11 +8,9 @@ 
 */



#include <linux/types.h>

#include <linux/init.h>

#include <linux/udp.h>



#include <linux/netfilter.h>

#include <linux/module.h>

#include <net/netfilter/nf_nat.h>

#include <net/netfilter/nf_nat_l3proto.h>

#include <net/netfilter/nf_nat_l4proto.h>
@@ -64,7 +62,7 @@ udplite_manip_pkt(struct sk_buff *skb, 
	return true;

}



static const struct nf_nat_l4proto nf_nat_l4proto_udplite = {

const struct nf_nat_l4proto nf_nat_l4proto_udplite = {

	.l4proto		= IPPROTO_UDPLITE,

	.manip_pkt		= udplite_manip_pkt,

	.in_range		= nf_nat_l4proto_in_range,
@@ -73,34 +71,3 @@ static const struct nf_nat_l4proto nf_nat_l4proto_udplite = { 
	.nlattr_to_range	= nf_nat_l4proto_nlattr_to_range,

#endif

};
 


static int __init nf_nat_proto_udplite_init(void)

{

	int err;



	err = nf_nat_l4proto_register(NFPROTO_IPV4, &nf_nat_l4proto_udplite);

	if (err < 0)

		goto err1;

	err = nf_nat_l4proto_register(NFPROTO_IPV6, &nf_nat_l4proto_udplite);

	if (err < 0)

		goto err2;

	return 0;



err2:

	nf_nat_l4proto_unregister(NFPROTO_IPV4, &nf_nat_l4proto_udplite);

err1:

	return err;

}



static void __exit nf_nat_proto_udplite_fini(void)

{

	nf_nat_l4proto_unregister(NFPROTO_IPV6, &nf_nat_l4proto_udplite);

	nf_nat_l4proto_unregister(NFPROTO_IPV4, &nf_nat_l4proto_udplite);

}



module_init(nf_nat_proto_udplite_init);

module_exit(nf_nat_proto_udplite_fini);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("UDP-Lite NAT protocol helper");

MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");