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

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

netfilter: built-in NAT support for SCTP 



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

footprint test:

(nf_nat_proto_)           | sctp   || nf_nat
--------------------------+--------++--------
no builtin                | 428344 || 2241312
SCTP builtin              |   -    || 2597032

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

include/net/netfilter/nf_nat_l4proto.h

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ extern const struct nf_nat_l4proto nf_nat_l4proto_unknown; 
#ifdef CONFIG_NF_NAT_PROTO_DCCP

extern const struct nf_nat_l4proto nf_nat_l4proto_dccp;

#endif

#ifdef CONFIG_NF_NAT_PROTO_SCTP

extern const struct nf_nat_l4proto nf_nat_l4proto_sctp;

#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
@@ -394,7 +394,7 @@ config NF_NAT_PROTO_UDPLITE 
	default NF_NAT && NF_CT_PROTO_UDPLITE



config NF_NAT_PROTO_SCTP

	tristate

	bool

	default NF_NAT && NF_CT_PROTO_SCTP

	depends on NF_NAT && NF_CT_PROTO_SCTP

	select LIBCRC32C

net/netfilter/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 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



nf_nat-$(CONFIG_NF_NAT_PROTO_DCCP) += nf_nat_proto_dccp.o

nf_nat-$(CONFIG_NF_NAT_PROTO_SCTP) += nf_nat_proto_sctp.o



# generic transport layer logging

obj-$(CONFIG_NF_LOG_COMMON) += nf_log_common.o
@@ -58,7 +59,6 @@ obj-$(CONFIG_NF_NAT_REDIRECT) += nf_nat_redirect.o 


# NAT protocols (nf_nat)

obj-$(CONFIG_NF_NAT_PROTO_UDPLITE) += nf_nat_proto_udplite.o

obj-$(CONFIG_NF_NAT_PROTO_SCTP) += nf_nat_proto_sctp.o



# NAT helpers

obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o

net/netfilter/nf_nat_core.c

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

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

			 &nf_nat_l4proto_dccp);

#endif

#ifdef CONFIG_NF_NAT_PROTO_SCTP

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

			 &nf_nat_l4proto_sctp);

#endif

	mutex_unlock(&nf_nat_proto_mutex);

net/netfilter/nf_nat_proto_sctp.c

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



#include <linux/types.h>

#include <linux/init.h>

#include <linux/sctp.h>

#include <linux/module.h>

#include <net/sctp/checksum.h>



#include <net/netfilter/nf_nat_l4proto.h>
@@ -54,7 +52,7 @@ sctp_manip_pkt(struct sk_buff *skb, 
	return true;

}



static const struct nf_nat_l4proto nf_nat_l4proto_sctp = {

const struct nf_nat_l4proto nf_nat_l4proto_sctp = {

	.l4proto		= IPPROTO_SCTP,

	.manip_pkt		= sctp_manip_pkt,

	.in_range		= nf_nat_l4proto_in_range,
@@ -63,34 +61,3 @@ static const struct nf_nat_l4proto nf_nat_l4proto_sctp = { 
	.nlattr_to_range	= nf_nat_l4proto_nlattr_to_range,

#endif

};
 


static int __init nf_nat_proto_sctp_init(void)

{

	int err;



	err = nf_nat_l4proto_register(NFPROTO_IPV4, &nf_nat_l4proto_sctp);

	if (err < 0)

		goto err1;

	err = nf_nat_l4proto_register(NFPROTO_IPV6, &nf_nat_l4proto_sctp);

	if (err < 0)

		goto err2;

	return 0;



err2:

	nf_nat_l4proto_unregister(NFPROTO_IPV4, &nf_nat_l4proto_sctp);

err1:

	return err;

}



static void __exit nf_nat_proto_sctp_exit(void)

{

	nf_nat_l4proto_unregister(NFPROTO_IPV6, &nf_nat_l4proto_sctp);

	nf_nat_l4proto_unregister(NFPROTO_IPV4, &nf_nat_l4proto_sctp);

}



module_init(nf_nat_proto_sctp_init);

module_exit(nf_nat_proto_sctp_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SCTP NAT protocol helper");

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