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 4.2

Browse Source
This commit is contained in:
Jan Engelhardt
2010-01-25 11:54:34 +01:00
parent b4b0ab9ef4
commit 0de9f38412
9 changed files with 45 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/changelog.txt
View File

@@ -1,6 +1,7 @@
HEAD HEAD
==== ====
- ipset: update to 4.2
Xtables-addons 1.22 (January 22 2009) Xtables-addons 1.22 (January 22 2009)

1
extensions/ipset/ip_set_ipportnethash.c
View File

@@ -185,7 +185,6 @@ ipportnethash_add(struct ip_set *set,
if (ret == 0) { if (ret == 0) {
if (!map->nets[cidr-1]++) if (!map->nets[cidr-1]++)
add_cidr_size(map->cidr, cidr); add_cidr_size(map->cidr, cidr);
map->elements++;
} }
return ret; return ret;
} }

1
extensions/ipset/ip_set_nethash.c
View File

@@ -136,7 +136,6 @@ nethash_add(struct ip_set *set, ip_set_ip_t ip, uint8_t cidr)
if (ret == 0) { if (ret == 0) {
if (!map->nets[cidr-1]++) if (!map->nets[cidr-1]++)
add_cidr_size(map->cidr, cidr); add_cidr_size(map->cidr, cidr);
map->elements++;
} }
return ret; return ret;

2
extensions/ipset/ipset.c
View File

@@ -30,7 +30,7 @@
#define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe" #define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe"
#endif #endif
#define IPSET_VERSION "4.1" #define IPSET_VERSION "4.2"
char program_name[] = "ipset"; char program_name[] = "ipset";
char program_version[] = IPSET_VERSION; char program_version[] = IPSET_VERSION;

7
extensions/ipset/ipset_iphash.c
View File

@@ -200,8 +200,7 @@ iphash_printips(struct set *set UNUSED, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ip = data + offset; ip = data + offset;
if (*ip) printf("%s\n", ip_tostring(*ip, options));
printf("%s\n", ip_tostring(*ip, options));
offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align); offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align);
} }
} }
@@ -230,9 +229,7 @@ iphash_saveips(struct set *set UNUSED, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ip = data + offset; ip = data + offset;
if (*ip) printf("-A %s %s\n", set->name, ip_tostring(*ip, options));
printf("-A %s %s\n", set->name,
ip_tostring(*ip, options));
offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align); offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align);
} }
} }

24
extensions/ipset/ipset_ipporthash.c
View File

@@ -259,13 +259,11 @@ ipporthash_printips(struct set *set, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ipptr = data + offset; ipptr = data + offset;
if (*ipptr) { ip = (*ipptr>>16) + mysetdata->first_ip;
ip = (*ipptr>>16) + mysetdata->first_ip; port = (uint16_t) *ipptr;
port = (uint16_t) *ipptr; printf("%s,%s\n",
printf("%s,%s\n", ip_tostring(ip, options),
ip_tostring(ip, options), port_tostring(port, options));
port_tostring(port, options));
}
offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align); offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align);
} }
} }
@@ -296,13 +294,11 @@ ipporthash_saveips(struct set *set, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ipptr = data + offset; ipptr = data + offset;
if (*ipptr) { ip = (*ipptr>>16) + mysetdata->first_ip;
ip = (*ipptr>>16) + mysetdata->first_ip; port = (uint16_t) *ipptr;
port = (uint16_t) *ipptr; printf("-A %s %s,%s\n", set->name,
printf("-A %s %s,%s\n", set->name, ip_tostring(ip, options),
ip_tostring(ip, options), port_tostring(port, options));
port_tostring(port, options));
}
offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align); offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align);
} }
} }

32
extensions/ipset/ipset_ipportiphash.c
View File

@@ -265,15 +265,13 @@ ipportiphash_printips(struct set *set, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ipptr = data + offset; ipptr = data + offset;
if (ipptr->ip && ipptr->ip1) { ip = (ipptr->ip>>16) + mysetdata->first_ip;
ip = (ipptr->ip>>16) + mysetdata->first_ip; port = (uint16_t) ipptr->ip;
port = (uint16_t) ipptr->ip; printf("%s,%s,",
printf("%s,%s,", ip_tostring(ip, options),
ip_tostring(ip, options), port_tostring(port, options));
port_tostring(port, options)); printf("%s\n",
printf("%s\n", ip_tostring(ipptr->ip1, options));
ip_tostring(ipptr->ip1, options));
}
offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align); offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align);
} }
} }
@@ -305,15 +303,13 @@ ipportiphash_saveips(struct set *set, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ipptr = data + offset; ipptr = data + offset;
if (ipptr->ip && ipptr->ip1) { ip = (ipptr->ip>>16) + mysetdata->first_ip;
ip = (ipptr->ip>>16) + mysetdata->first_ip; port = (uint16_t) ipptr->ip;
port = (uint16_t) ipptr->ip; printf("-A %s %s,%s,", set->name,
printf("-A %s %s,%s,", set->name, ip_tostring(ip, options),
ip_tostring(ip, options), port_tostring(port, options));
port_tostring(port, options)); printf("%s\n",
printf("%s\n", ip_tostring(ipptr->ip1, options));
ip_tostring(ipptr->ip1, options));
}
offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align); offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align);
} }
} }

32
extensions/ipset/ipset_ipportnethash.c
View File

@@ -330,15 +330,13 @@ ipportnethash_printips(struct set *set, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ipptr = data + offset; ipptr = data + offset;
if (ipptr->ip || ipptr->ip1) { ip = (ipptr->ip>>16) + mysetdata->first_ip;
ip = (ipptr->ip>>16) + mysetdata->first_ip; port = (uint16_t) ipptr->ip;
port = (uint16_t) ipptr->ip; printf("%s,%s,",
printf("%s,%s,", ip_tostring(ip, options),
ip_tostring(ip, options), port_tostring(port, options));
port_tostring(port, options)); printf("%s\n",
printf("%s\n", unpack_ip_tostring(ipptr->ip1, options));
unpack_ip_tostring(ipptr->ip1, options));
}
offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align); offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align);
} }
} }
@@ -370,15 +368,13 @@ ipportnethash_saveips(struct set *set, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ipptr = data + offset; ipptr = data + offset;
if (ipptr) { ip = (ipptr->ip>>16) + mysetdata->first_ip;
ip = (ipptr->ip>>16) + mysetdata->first_ip; port = (uint16_t) ipptr->ip;
port = (uint16_t) ipptr->ip; printf("-A %s %s,%s,", set->name,
printf("-A %s %s,%s,", set->name, ip_tostring(ip, options),
ip_tostring(ip, options), port_tostring(port, options));
port_tostring(port, options)); printf("%s\n",
printf("%s\n", unpack_ip_tostring(ipptr->ip, options));
unpack_ip_tostring(ipptr->ip, options));
}
offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align); offset += IPSET_VALIGN(sizeof(struct ipportip), dont_align);
} }
} }

8
extensions/ipset/ipset_nethash.c
View File

@@ -232,8 +232,7 @@ nethash_printips(struct set *set UNUSED, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ip = data + offset; ip = data + offset;
if (*ip) printf("%s\n", unpack_ip_tostring(*ip, options));
printf("%s\n", unpack_ip_tostring(*ip, options));
offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align); offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align);
} }
} }
@@ -258,9 +257,8 @@ nethash_saveips(struct set *set UNUSED, void *data, u_int32_t len,
while (offset < len) { while (offset < len) {
ip = data + offset; ip = data + offset;
if (*ip) printf("-A %s %s\n", set->name,
printf("-A %s %s\n", set->name, unpack_ip_tostring(*ip, options));
unpack_ip_tostring(*ip, options));
offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align); offset += IPSET_VALIGN(sizeof(ip_set_ip_t), dont_align);
} }
} }