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

ipset: fast forward to v3.2

Browse Source
This commit is contained in:
Jan Engelhardt
2009-08-21 16:03:50 +02:00
parent 5aee8738ed
commit 3e26335cbd
7 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/ipset/ip_set.c
View File

@@ -1373,7 +1373,7 @@ static int ip_set_restore(void *data,
while (members_size + set->type->reqsize <=
set_restore->members_size) {
line++;
DP("members: %d, line %d", members_size, line);
DP("members: %d, line %d", members_size, line);
res = __ip_set_addip(index,
data + used + members_size,
set->type->reqsize);
@@ -1911,13 +1911,23 @@ ip_set_sockfn_get(struct sock *sk, int optval, void *user, int *len)
res = -ENOENT;
goto done;
}
#define SETLIST(set) (strcmp(set->type->typename, "setlist") == 0)
used = 0;
if (index == IP_SET_INVALID_ID) {
/* Save all sets */
/* Save all sets: ugly setlist type dependency */
int setlist = 0;
setlists:
for (i = 0; i < ip_set_max && res == 0; i++) {
if (ip_set_list[i] != NULL)
if (ip_set_list[i] != NULL
&& !(setlist ^ SETLIST(ip_set_list[i])))
res = ip_set_save_set(i, data, &used, *len);
}
if (!setlist) {
setlist = 1;
goto setlists;
}
} else {
/* Save an individual set */
res = ip_set_save_set(index, data, &used, *len);