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

Commit 57982edc authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Split extensions into separate files 



Cleanup to separate all extensions into individual files.

Ported from a patch proposed by Sergey Popovich <popovich_sergei@mail.ua>.

Suggested-by: default avatarSergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 1d0d6bd6

include/linux/netfilter/ipset/ip_set.h

+2 −93
Original line number Diff line number Diff line
@@ -292,99 +292,6 @@ ip_set_put_flags(struct sk_buff *skb, struct ip_set *set) 
	return nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(cadt_flags));

}



static inline void

ip_set_add_bytes(u64 bytes, struct ip_set_counter *counter)

{

	atomic64_add((long long)bytes, &(counter)->bytes);

}



static inline void

ip_set_add_packets(u64 packets, struct ip_set_counter *counter)

{

	atomic64_add((long long)packets, &(counter)->packets);

}



static inline u64

ip_set_get_bytes(const struct ip_set_counter *counter)

{

	return (u64)atomic64_read(&(counter)->bytes);

}



static inline u64

ip_set_get_packets(const struct ip_set_counter *counter)

{

	return (u64)atomic64_read(&(counter)->packets);

}



static inline void

ip_set_update_counter(struct ip_set_counter *counter,

		      const struct ip_set_ext *ext,

		      struct ip_set_ext *mext, u32 flags)

{

	if (ext->packets != ULLONG_MAX &&

	    !(flags & IPSET_FLAG_SKIP_COUNTER_UPDATE)) {

		ip_set_add_bytes(ext->bytes, counter);

		ip_set_add_packets(ext->packets, counter);

	}

	if (flags & IPSET_FLAG_MATCH_COUNTERS) {

		mext->packets = ip_set_get_packets(counter);

		mext->bytes = ip_set_get_bytes(counter);

	}

}



static inline bool

ip_set_put_counter(struct sk_buff *skb, const struct ip_set_counter *counter)

{

	return nla_put_net64(skb, IPSET_ATTR_BYTES,

			     cpu_to_be64(ip_set_get_bytes(counter)),

			     IPSET_ATTR_PAD) ||

	       nla_put_net64(skb, IPSET_ATTR_PACKETS,

			     cpu_to_be64(ip_set_get_packets(counter)),

			     IPSET_ATTR_PAD);

}



static inline void

ip_set_init_counter(struct ip_set_counter *counter,

		    const struct ip_set_ext *ext)

{

	if (ext->bytes != ULLONG_MAX)

		atomic64_set(&(counter)->bytes, (long long)(ext->bytes));

	if (ext->packets != ULLONG_MAX)

		atomic64_set(&(counter)->packets, (long long)(ext->packets));

}



static inline void

ip_set_get_skbinfo(struct ip_set_skbinfo *skbinfo,

		   const struct ip_set_ext *ext,

		   struct ip_set_ext *mext, u32 flags)

{

	mext->skbinfo = *skbinfo;

}



static inline bool

ip_set_put_skbinfo(struct sk_buff *skb, const struct ip_set_skbinfo *skbinfo)

{

	/* Send nonzero parameters only */

	return ((skbinfo->skbmark || skbinfo->skbmarkmask) &&

		nla_put_net64(skb, IPSET_ATTR_SKBMARK,

			      cpu_to_be64((u64)skbinfo->skbmark << 32 |

					  skbinfo->skbmarkmask),

			      IPSET_ATTR_PAD)) ||

	       (skbinfo->skbprio &&

		nla_put_net32(skb, IPSET_ATTR_SKBPRIO,

			      cpu_to_be32(skbinfo->skbprio))) ||

	       (skbinfo->skbqueue &&

		nla_put_net16(skb, IPSET_ATTR_SKBQUEUE,

			     cpu_to_be16(skbinfo->skbqueue)));

}



static inline void

ip_set_init_skbinfo(struct ip_set_skbinfo *skbinfo,

		    const struct ip_set_ext *ext)

{

	*skbinfo = ext->skbinfo;

}



/* Netlink CB args */

enum {

	IPSET_CB_NET = 0,	/* net namespace */
@@ -539,6 +446,8 @@ bitmap_bytes(u32 a, u32 b) 


#include <linux/netfilter/ipset/ip_set_timeout.h>

#include <linux/netfilter/ipset/ip_set_comment.h>

#include <linux/netfilter/ipset/ip_set_counter.h>

#include <linux/netfilter/ipset/ip_set_skbinfo.h>



int

ip_set_put_extensions(struct sk_buff *skb, const struct ip_set *set,

include/linux/netfilter/ipset/ip_set_counter.h

0 → 100644
+75 −0
Original line number Diff line number Diff line 
#ifndef _IP_SET_COUNTER_H

#define _IP_SET_COUNTER_H



/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

 *

 * 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.

 */



#ifdef __KERNEL__



static inline void

ip_set_add_bytes(u64 bytes, struct ip_set_counter *counter)

{

	atomic64_add((long long)bytes, &(counter)->bytes);

}



static inline void

ip_set_add_packets(u64 packets, struct ip_set_counter *counter)

{

	atomic64_add((long long)packets, &(counter)->packets);

}



static inline u64

ip_set_get_bytes(const struct ip_set_counter *counter)

{

	return (u64)atomic64_read(&(counter)->bytes);

}



static inline u64

ip_set_get_packets(const struct ip_set_counter *counter)

{

	return (u64)atomic64_read(&(counter)->packets);

}



static inline void

ip_set_update_counter(struct ip_set_counter *counter,

		      const struct ip_set_ext *ext,

		      struct ip_set_ext *mext, u32 flags)

{

	if (ext->packets != ULLONG_MAX &&

	    !(flags & IPSET_FLAG_SKIP_COUNTER_UPDATE)) {

		ip_set_add_bytes(ext->bytes, counter);

		ip_set_add_packets(ext->packets, counter);

	}

	if (flags & IPSET_FLAG_MATCH_COUNTERS) {

		mext->packets = ip_set_get_packets(counter);

		mext->bytes = ip_set_get_bytes(counter);

	}

}



static inline bool

ip_set_put_counter(struct sk_buff *skb, const struct ip_set_counter *counter)

{

	return nla_put_net64(skb, IPSET_ATTR_BYTES,

			     cpu_to_be64(ip_set_get_bytes(counter)),

			     IPSET_ATTR_PAD) ||

	       nla_put_net64(skb, IPSET_ATTR_PACKETS,

			     cpu_to_be64(ip_set_get_packets(counter)),

			     IPSET_ATTR_PAD);

}



static inline void

ip_set_init_counter(struct ip_set_counter *counter,

		    const struct ip_set_ext *ext)

{

	if (ext->bytes != ULLONG_MAX)

		atomic64_set(&(counter)->bytes, (long long)(ext->bytes));

	if (ext->packets != ULLONG_MAX)

		atomic64_set(&(counter)->packets, (long long)(ext->packets));

}



#endif /* __KERNEL__ */

#endif /* _IP_SET_COUNTER_H */

include/linux/netfilter/ipset/ip_set_skbinfo.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
#ifndef _IP_SET_SKBINFO_H

#define _IP_SET_SKBINFO_H



/* Copyright (C) 2015 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

 *

 * 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.

 */



#ifdef __KERNEL__



static inline void

ip_set_get_skbinfo(struct ip_set_skbinfo *skbinfo,

		   const struct ip_set_ext *ext,

		   struct ip_set_ext *mext, u32 flags)

{

	mext->skbinfo = *skbinfo;

}



static inline bool

ip_set_put_skbinfo(struct sk_buff *skb, const struct ip_set_skbinfo *skbinfo)

{

	/* Send nonzero parameters only */

	return ((skbinfo->skbmark || skbinfo->skbmarkmask) &&

		nla_put_net64(skb, IPSET_ATTR_SKBMARK,

			      cpu_to_be64((u64)skbinfo->skbmark << 32 |

					  skbinfo->skbmarkmask),

			      IPSET_ATTR_PAD)) ||

	       (skbinfo->skbprio &&

		nla_put_net32(skb, IPSET_ATTR_SKBPRIO,

			      cpu_to_be32(skbinfo->skbprio))) ||

	       (skbinfo->skbqueue &&

		nla_put_net16(skb, IPSET_ATTR_SKBQUEUE,

			      cpu_to_be16(skbinfo->skbqueue)));

}



static inline void

ip_set_init_skbinfo(struct ip_set_skbinfo *skbinfo,

		    const struct ip_set_ext *ext)

{

	*skbinfo = ext->skbinfo;

}



#endif /* __KERNEL__ */

#endif /* _IP_SET_SKBINFO_H */