anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-08 05:34:58 +02:00
Code Issues Releases Wiki Activity

ipset: update to 6.10-genl

Browse Source
This commit is contained in:
Jan Engelhardt
2011-11-30 11:14:29 +01:00
parent 365d5edfb3
commit 9ab6a0ee0d
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/changelog.txt
View File

@@ -10,6 +10,7 @@ Changes:
- xt_ECHO: now calculates UDP checksum - xt_ECHO: now calculates UDP checksum
- Linux kernel versions below 2.6.32 are no longer officially - Linux kernel versions below 2.6.32 are no longer officially
supported, and will not be part of compilation testing. supported, and will not be part of compilation testing.
- update to ipset 6.10
Enhancements: Enhancements:
- xt_ECHO: IPv6 support - xt_ECHO: IPv6 support

2
extensions/ipset-6/Kbuild
View File

@@ -8,4 +8,4 @@ obj-m += ip_set_hash_netiface.o ip_set_hash_netport.o ip_set_list_set.o
ip_set-y := ip_set_core.o ip_set_getport.o pfxlen.o ip_set-y := ip_set_core.o ip_set_getport.o pfxlen.o
EXTRA_CFLAGS += -DLCONFIG_IP_SET_MAX=256 -DIPSET_EXTERNAL_MODULE=1 EXTRA_CFLAGS += -DLCONFIG_IP_SET_MAX=256

2
extensions/ipset-6/ip_set_core.c
View File

@@ -17,7 +17,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rculist.h> #include <linux/rculist.h>
#ifdef IPSET_EXTERNAL_MODULE #ifndef IPSET_IN_KERNEL_TREE
#include <linux/version.h> #include <linux/version.h>
#endif #endif
#include <net/netlink.h> #include <net/netlink.h>

2
extensions/ipset-6/ip_set_hash_ipport.c
View File

@@ -158,7 +158,7 @@ hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[],
const struct ip_set_hash *h = set->data; const struct ip_set_hash *h = set->data;
ipset_adtfn adtfn = set->variant->adt[adt]; ipset_adtfn adtfn = set->variant->adt[adt];
struct hash_ipport4_elem data = { }; struct hash_ipport4_elem data = { };
u32 ip, ip_to, p = 0, port, port_to; u32 ip, ip_to = 0, p = 0, port, port_to;
u32 timeout = h->timeout; u32 timeout = h->timeout;
bool with_ports = false; bool with_ports = false;
int ret; int ret;

2
extensions/ipset-6/ip_set_hash_ipportip.c
View File

@@ -162,7 +162,7 @@ hash_ipportip4_uadt(struct ip_set *set, struct nlattr *tb[],
const struct ip_set_hash *h = set->data; const struct ip_set_hash *h = set->data;
ipset_adtfn adtfn = set->variant->adt[adt]; ipset_adtfn adtfn = set->variant->adt[adt];
struct hash_ipportip4_elem data = { }; struct hash_ipportip4_elem data = { };
u32 ip, ip_to, p = 0, port, port_to; u32 ip, ip_to = 0, p = 0, port, port_to;
u32 timeout = h->timeout; u32 timeout = h->timeout;
bool with_ports = false; bool with_ports = false;
int ret; int ret;

2
extensions/ipset-6/ip_set_hash_ipportnet.c
View File

@@ -184,7 +184,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[],
const struct ip_set_hash *h = set->data; const struct ip_set_hash *h = set->data;
ipset_adtfn adtfn = set->variant->adt[adt]; ipset_adtfn adtfn = set->variant->adt[adt];
struct hash_ipportnet4_elem data = { .cidr = HOST_MASK }; struct hash_ipportnet4_elem data = { .cidr = HOST_MASK };
u32 ip, ip_to, p = 0, port, port_to; u32 ip, ip_to = 0, p = 0, port, port_to;
u32 ip2_from = 0, ip2_to, ip2_last, ip2; u32 ip2_from = 0, ip2_to, ip2_last, ip2;
u32 timeout = h->timeout; u32 timeout = h->timeout;
bool with_ports = false; bool with_ports = false;

8
extensions/ipset-6/libipset/parse.c
View File

@@ -307,7 +307,7 @@ int
ipset_parse_tcp_port(struct ipset_session *session, ipset_parse_tcp_port(struct ipset_session *session,
enum ipset_opt opt, const char *str) enum ipset_opt opt, const char *str)
{ {
return ipset_parse_tcpudp_port(session, opt, str, "TCP"); return ipset_parse_tcpudp_port(session, opt, str, "tcp");
} }
/** /**
@@ -330,7 +330,7 @@ ipset_parse_single_tcp_port(struct ipset_session *session,
assert(opt == IPSET_OPT_PORT || opt == IPSET_OPT_PORT_TO); assert(opt == IPSET_OPT_PORT || opt == IPSET_OPT_PORT_TO);
assert(str); assert(str);
return ipset_parse_port(session, opt, str, "TCP"); return ipset_parse_port(session, opt, str, "tcp");
} }
/** /**
@@ -391,8 +391,8 @@ parse_icmp_typecode(struct ipset_session *session,
str, family); str, family);
} }
*a++ = '\0'; *a++ = '\0';
if ((err = string_to_u8(session, a, &type)) != 0 || if ((err = string_to_u8(session, tmp, &type)) != 0 ||
(err = string_to_u8(session, tmp, &code)) != 0) (err = string_to_u8(session, a, &code)) != 0)
goto error; goto error;
typecode = (type << 8) | code; typecode = (type << 8) | code;

2
extensions/ipset-6/src/ipset.c
View File

@@ -24,7 +24,7 @@
#include <libipset/utils.h> /* STREQ */ #include <libipset/utils.h> /* STREQ */
static char program_name[] = "ipset"; static char program_name[] = "ipset";
static char program_version[] = "6.9.1-genl-xta"; static char program_version[] = "6.10-genl-xta";
static struct ipset_session *session; static struct ipset_session *session;
static uint32_t restore_line; static uint32_t restore_line;