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

Commit 91eb7c08 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Patrick McHardy
Browse files

netfilter: ipset: SCTP, UDPLITE support added 



SCTP and UDPLITE port support added to the hash:*port* set types.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent e3f6a652

include/linux/netfilter/ipset/ip_set_getport.h

+2 −0
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ static inline bool ip_set_proto_with_ports(u8 proto) 
{

	switch (proto) {

	case IPPROTO_TCP:

	case IPPROTO_SCTP:

	case IPPROTO_UDP:

	case IPPROTO_UDPLITE:

		return true;

	}

	return false;

net/netfilter/ipset/ip_set_getport.c

+15 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/skbuff.h>

#include <linux/icmp.h>

#include <linux/icmpv6.h>

#include <linux/sctp.h>

#include <linux/netfilter_ipv6/ip6_tables.h>

#include <net/ip.h>

#include <net/ipv6.h>
@@ -35,7 +36,20 @@ get_port(const struct sk_buff *skb, int protocol, unsigned int protooff, 
		*port = src ? th->source : th->dest;

		break;

	}

	case IPPROTO_UDP: {

	case IPPROTO_SCTP: {

		sctp_sctphdr_t _sh;

		const sctp_sctphdr_t *sh;



		sh = skb_header_pointer(skb, protooff, sizeof(_sh), &_sh);

		if (sh == NULL)

			/* No choice either */

			return false;



		*port = src ? sh->source : sh->dest;

		break;

	}

	case IPPROTO_UDP:

	case IPPROTO_UDPLITE: {

		struct udphdr _udph;

		const struct udphdr *uh;

net/netfilter/ipset/ip_set_hash_ipport.c

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ static struct ip_set_type hash_ipport_type __read_mostly = { 
	.features	= IPSET_TYPE_IP | IPSET_TYPE_PORT,

	.dimension	= IPSET_DIM_TWO,

	.family		= AF_UNSPEC,

	.revision	= 0,

	.revision	= 1,

	.create		= hash_ipport_create,

	.create_policy	= {

		[IPSET_ATTR_HASHSIZE]	= { .type = NLA_U32 },

net/netfilter/ipset/ip_set_hash_ipportip.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static struct ip_set_type hash_ipportip_type __read_mostly = { 
	.features	= IPSET_TYPE_IP | IPSET_TYPE_PORT | IPSET_TYPE_IP2,

	.dimension	= IPSET_DIM_THREE,

	.family		= AF_UNSPEC,

	.revision	= 0,

	.revision	= 1,

	.create		= hash_ipportip_create,

	.create_policy	= {

		[IPSET_ATTR_HASHSIZE]	= { .type = NLA_U32 },

net/netfilter/ipset/ip_set_hash_ipportnet.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static struct ip_set_type hash_ipportnet_type __read_mostly = { 
	.features	= IPSET_TYPE_IP | IPSET_TYPE_PORT | IPSET_TYPE_IP2,

	.dimension	= IPSET_DIM_THREE,

	.family		= AF_UNSPEC,

	.revision	= 0,

	.revision	= 1,

	.create		= hash_ipportnet_create,

	.create_policy	= {

		[IPSET_ATTR_HASHSIZE]	= { .type = NLA_U32 },