|
@@ -533,29 +533,9 @@ bitmap_bytes(u32 a, u32 b)
|
|
|
#include <linux/netfilter/ipset/ip_set_timeout.h>
|
|
|
#include <linux/netfilter/ipset/ip_set_comment.h>
|
|
|
|
|
|
-static inline int
|
|
|
+int
|
|
|
ip_set_put_extensions(struct sk_buff *skb, const struct ip_set *set,
|
|
|
- const void *e, bool active)
|
|
|
-{
|
|
|
- if (SET_WITH_TIMEOUT(set)) {
|
|
|
- unsigned long *timeout = ext_timeout(e, set);
|
|
|
-
|
|
|
- if (nla_put_net32(skb, IPSET_ATTR_TIMEOUT,
|
|
|
- htonl(active ? ip_set_timeout_get(timeout)
|
|
|
- : *timeout)))
|
|
|
- return -EMSGSIZE;
|
|
|
- }
|
|
|
- if (SET_WITH_COUNTER(set) &&
|
|
|
- ip_set_put_counter(skb, ext_counter(e, set)))
|
|
|
- return -EMSGSIZE;
|
|
|
- if (SET_WITH_COMMENT(set) &&
|
|
|
- ip_set_put_comment(skb, ext_comment(e, set)))
|
|
|
- return -EMSGSIZE;
|
|
|
- if (SET_WITH_SKBINFO(set) &&
|
|
|
- ip_set_put_skbinfo(skb, ext_skbinfo(e, set)))
|
|
|
- return -EMSGSIZE;
|
|
|
- return 0;
|
|
|
-}
|
|
|
+ const void *e, bool active);
|
|
|
|
|
|
#define IP_SET_INIT_KEXT(skb, opt, set) \
|
|
|
{ .bytes = (skb)->len, .packets = 1, \
|