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: upgrade to ipset 2.4.5

Browse Source
This commit is contained in:
Jan Engelhardt
2008-11-18 12:01:51 +01:00
parent be6fbee56a
commit d20d1922db
19 changed files with 108 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extensions/ipset/ip_set.c
View File

@@ -21,6 +21,7 @@
#include <linux/random.h> #include <linux/random.h>
#include <linux/jhash.h> #include <linux/jhash.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/capability.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
@@ -29,7 +30,6 @@
#include <linux/semaphore.h> #include <linux/semaphore.h>
#endif #endif
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/capability.h>
#define ASSERT_READ_LOCK(x) #define ASSERT_READ_LOCK(x)
#define ASSERT_WRITE_LOCK(x) #define ASSERT_WRITE_LOCK(x)
@@ -379,7 +379,7 @@ __ip_set_get_byname(const char *name, struct ip_set **set)
return index; return index;
} }
void __ip_set_put_byid(ip_set_id_t index) void __ip_set_put_byindex(ip_set_id_t index)
{ {
if (ip_set_list[index]) if (ip_set_list[index])
__ip_set_put(index); __ip_set_put(index);
@@ -434,12 +434,26 @@ ip_set_get_byindex(ip_set_id_t index)
return index; return index;
} }
/*
* Find the set id belonging to the index.
* We are protected by the mutex, so we do not need to use
* ip_set_lock. There is no need to reference the sets either.
*/
ip_set_id_t
ip_set_id(ip_set_id_t index)
{
if (index >= ip_set_max || !ip_set_list[index])
return IP_SET_INVALID_ID;
return ip_set_list[index]->id;
}
/* /*
* If the given set pointer points to a valid set, decrement * If the given set pointer points to a valid set, decrement
* reference count by 1. The caller shall not assume the index * reference count by 1. The caller shall not assume the index
* to be valid, after calling this function. * to be valid, after calling this function.
*/ */
void ip_set_put(ip_set_id_t index) void ip_set_put_byindex(ip_set_id_t index)
{ {
down(&ip_set_app_mutex); down(&ip_set_app_mutex);
if (ip_set_list[index]) if (ip_set_list[index])
@@ -2038,9 +2052,10 @@ EXPORT_SYMBOL(ip_set_unregister_set_type);
EXPORT_SYMBOL(ip_set_get_byname); EXPORT_SYMBOL(ip_set_get_byname);
EXPORT_SYMBOL(ip_set_get_byindex); EXPORT_SYMBOL(ip_set_get_byindex);
EXPORT_SYMBOL(ip_set_put); EXPORT_SYMBOL(ip_set_put_byindex);
EXPORT_SYMBOL(ip_set_id);
EXPORT_SYMBOL(__ip_set_get_byname); EXPORT_SYMBOL(__ip_set_get_byname);
EXPORT_SYMBOL(__ip_set_put_byid); EXPORT_SYMBOL(__ip_set_put_byindex);
EXPORT_SYMBOL(ip_set_addip_kernel); EXPORT_SYMBOL(ip_set_addip_kernel);
EXPORT_SYMBOL(ip_set_delip_kernel); EXPORT_SYMBOL(ip_set_delip_kernel);

7
extensions/ipset/ip_set.h
View File

@@ -495,11 +495,12 @@ struct ip_set_hash {
/* register and unregister set references */ /* register and unregister set references */
extern ip_set_id_t ip_set_get_byname(const char name[IP_SET_MAXNAMELEN]); extern ip_set_id_t ip_set_get_byname(const char name[IP_SET_MAXNAMELEN]);
extern ip_set_id_t ip_set_get_byindex(ip_set_id_t id); extern ip_set_id_t ip_set_get_byindex(ip_set_id_t index);
extern void ip_set_put(ip_set_id_t id); extern void ip_set_put_byindex(ip_set_id_t index);
extern ip_set_id_t ip_set_id(ip_set_id_t index);
extern ip_set_id_t __ip_set_get_byname(const char name[IP_SET_MAXNAMELEN], extern ip_set_id_t __ip_set_get_byname(const char name[IP_SET_MAXNAMELEN],
struct ip_set **set); struct ip_set **set);
extern void __ip_set_put_byid(ip_set_id_t id); extern void __ip_set_put_byindex(ip_set_id_t index);
/* API for iptables set match, and SET target */ /* API for iptables set match, and SET target */
extern int ip_set_addip_kernel(ip_set_id_t id, extern int ip_set_addip_kernel(ip_set_id_t id,

118
extensions/ipset/ip_set_setlist.c
View File

@@ -17,14 +17,14 @@
#include "ip_set_setlist.h" #include "ip_set_setlist.h"
/* /*
* before ==> id, ref * before ==> index, ref
* after ==> ref, id * after ==> ref, index
*/ */
static inline bool static inline bool
next_id_eq(const struct ip_set_setlist *map, int i, ip_set_id_t id) next_index_eq(const struct ip_set_setlist *map, int i, ip_set_id_t index)
{ {
return i < map->size && map->id[i] == id; return i < map->size && map->index[i] == index;
} }
static int static int
@@ -33,15 +33,15 @@ setlist_utest(struct ip_set *set, const void *data, size_t size,
{ {
const struct ip_set_setlist *map = set->data; const struct ip_set_setlist *map = set->data;
const struct ip_set_req_setlist *req = data; const struct ip_set_req_setlist *req = data;
ip_set_id_t id, ref = IP_SET_INVALID_ID; ip_set_id_t index, ref = IP_SET_INVALID_ID;
int i, res = 0; int i, res = 0;
struct ip_set *s; struct ip_set *s;
if (req->before && req->ref[0] == '\0') if (req->before && req->ref[0] == '\0')
return -EINVAL; return -EINVAL;
id = __ip_set_get_byname(req->name, &s); index = __ip_set_get_byname(req->name, &s);
if (id == IP_SET_INVALID_ID) if (index == IP_SET_INVALID_ID)
return -EEXIST; return -EEXIST;
if (req->ref[0] != '\0') { if (req->ref[0] != '\0') {
ref = __ip_set_get_byname(req->ref, &s); ref = __ip_set_get_byname(req->ref, &s);
@@ -51,24 +51,24 @@ setlist_utest(struct ip_set *set, const void *data, size_t size,
} }
} }
for (i = 0; i < map->size for (i = 0; i < map->size
&& map->id[i] != IP_SET_INVALID_ID; i++) { && map->index[i] != IP_SET_INVALID_ID; i++) {
if (req->before && map->id[i] == id) { if (req->before && map->index[i] == index) {
res = next_id_eq(map, i + 1, ref); res = next_index_eq(map, i + 1, ref);
break; break;
} else if (!req->before) { } else if (!req->before) {
if ((ref == IP_SET_INVALID_ID if ((ref == IP_SET_INVALID_ID
&& map->id[i] == id) && map->index[i] == index)
|| (map->id[i] == ref || (map->index[i] == ref
&& next_id_eq(map, i + 1, id))) { && next_index_eq(map, i + 1, index))) {
res = 1; res = 1;
break; break;
} }
} }
} }
if (ref != IP_SET_INVALID_ID) if (ref != IP_SET_INVALID_ID)
__ip_set_put_byid(ref); __ip_set_put_byindex(ref);
finish: finish:
__ip_set_put_byid(id); __ip_set_put_byindex(index);
return res; return res;
} }
@@ -83,27 +83,27 @@ setlist_ktest(struct ip_set *set,
int i, res = 0; int i, res = 0;
for (i = 0; i < map->size for (i = 0; i < map->size
&& map->id[i] != IP_SET_INVALID_ID && map->index[i] != IP_SET_INVALID_ID
&& res == 0; i++) && res == 0; i++)
res = ip_set_testip_kernel(map->id[i], skb, flags); res = ip_set_testip_kernel(map->index[i], skb, flags);
return res; return res;
} }
static inline int static inline int
insert_setlist(struct ip_set_setlist *map, int i, ip_set_id_t id) insert_setlist(struct ip_set_setlist *map, int i, ip_set_id_t index)
{ {
ip_set_id_t tmp; ip_set_id_t tmp;
int j; int j;
printk("i: %u, last %u\n", i, map->id[map->size - 1]); DP("i: %u, last %u\n", i, map->index[map->size - 1]);
if (i >= map->size || map->id[map->size - 1] != IP_SET_INVALID_ID) if (i >= map->size || map->index[map->size - 1] != IP_SET_INVALID_ID)
return -ERANGE; return -ERANGE;
for (j = i; j < map->size for (j = i; j < map->size
&& id != IP_SET_INVALID_ID; j++) { && index != IP_SET_INVALID_ID; j++) {
tmp = map->id[j]; tmp = map->index[j];
map->id[j] = id; map->index[j] = index;
id = tmp; index = tmp;
} }
return 0; return 0;
} }
@@ -114,15 +114,15 @@ setlist_uadd(struct ip_set *set, const void *data, size_t size,
{ {
struct ip_set_setlist *map = set->data; struct ip_set_setlist *map = set->data;
const struct ip_set_req_setlist *req = data; const struct ip_set_req_setlist *req = data;
ip_set_id_t id, ref = IP_SET_INVALID_ID; ip_set_id_t index, ref = IP_SET_INVALID_ID;
int i, res = -ERANGE; int i, res = -ERANGE;
struct ip_set *s; struct ip_set *s;
if (req->before && req->ref[0] == '\0') if (req->before && req->ref[0] == '\0')
return -EINVAL; return -EINVAL;
id = __ip_set_get_byname(req->name, &s); index = __ip_set_get_byname(req->name, &s);
if (id == IP_SET_INVALID_ID) if (index == IP_SET_INVALID_ID)
return -EEXIST; return -EEXIST;
/* "Loop detection" */ /* "Loop detection" */
if (strcmp(s->type->typename, "setlist") == 0) if (strcmp(s->type->typename, "setlist") == 0)
@@ -136,22 +136,22 @@ setlist_uadd(struct ip_set *set, const void *data, size_t size,
} }
} }
for (i = 0; i < map->size; i++) { for (i = 0; i < map->size; i++) {
if (map->id[i] != ref) if (map->index[i] != ref)
continue; continue;
if (req->before) if (req->before)
res = insert_setlist(map, i, id); res = insert_setlist(map, i, index);
else else
res = insert_setlist(map, res = insert_setlist(map,
ref == IP_SET_INVALID_ID ? i : i + 1, ref == IP_SET_INVALID_ID ? i : i + 1,
id); index);
break; break;
} }
if (ref != IP_SET_INVALID_ID) if (ref != IP_SET_INVALID_ID)
__ip_set_put_byid(ref); __ip_set_put_byindex(ref);
/* In case of success, we keep the reference to the id */ /* In case of success, we keep the reference to the set */
finish: finish:
if (res != 0) if (res != 0)
__ip_set_put_byid(id); __ip_set_put_byindex(index);
return res; return res;
} }
@@ -166,9 +166,9 @@ setlist_kadd(struct ip_set *set,
int i, res = -EINVAL; int i, res = -EINVAL;
for (i = 0; i < map->size for (i = 0; i < map->size
&& map->id[i] != IP_SET_INVALID_ID && map->index[i] != IP_SET_INVALID_ID
&& res != 0; i++) && res != 0; i++)
res = ip_set_addip_kernel(map->id[i], skb, flags); res = ip_set_addip_kernel(map->index[i], skb, flags);
return res; return res;
} }
@@ -178,8 +178,8 @@ unshift_setlist(struct ip_set_setlist *map, int i)
int j; int j;
for (j = i; j < map->size - 1; j++) for (j = i; j < map->size - 1; j++)
map->id[j] = map->id[j+1]; map->index[j] = map->index[j+1];
map->id[map->size-1] = IP_SET_INVALID_ID; map->index[map->size-1] = IP_SET_INVALID_ID;
return 0; return 0;
} }
@@ -189,15 +189,15 @@ setlist_udel(struct ip_set *set, const void *data, size_t size,
{ {
struct ip_set_setlist *map = set->data; struct ip_set_setlist *map = set->data;
const struct ip_set_req_setlist *req = data; const struct ip_set_req_setlist *req = data;
ip_set_id_t id, ref = IP_SET_INVALID_ID; ip_set_id_t index, ref = IP_SET_INVALID_ID;
int i, res = -EEXIST; int i, res = -EEXIST;
struct ip_set *s; struct ip_set *s;
if (req->before && req->ref[0] == '\0') if (req->before && req->ref[0] == '\0')
return -EINVAL; return -EINVAL;
id = __ip_set_get_byname(req->name, &s); index = __ip_set_get_byname(req->name, &s);
if (id == IP_SET_INVALID_ID) if (index == IP_SET_INVALID_ID)
return -EEXIST; return -EEXIST;
if (req->ref[0] != '\0') { if (req->ref[0] != '\0') {
ref = __ip_set_get_byname(req->ref, &s); ref = __ip_set_get_byname(req->ref, &s);
@@ -205,31 +205,31 @@ setlist_udel(struct ip_set *set, const void *data, size_t size,
goto finish; goto finish;
} }
for (i = 0; i < map->size for (i = 0; i < map->size
&& map->id[i] != IP_SET_INVALID_ID; i++) { && map->index[i] != IP_SET_INVALID_ID; i++) {
if (req->before) { if (req->before) {
if (map->id[i] == id if (map->index[i] == index
&& next_id_eq(map, i + 1, ref)) { && next_index_eq(map, i + 1, ref)) {
res = unshift_setlist(map, i); res = unshift_setlist(map, i);
break; break;
} }
} else if (ref == IP_SET_INVALID_ID) { } else if (ref == IP_SET_INVALID_ID) {
if (map->id[i] == id) { if (map->index[i] == index) {
res = unshift_setlist(map, i); res = unshift_setlist(map, i);
break; break;
} }
} else if (map->id[i] == ref } else if (map->index[i] == ref
&& next_id_eq(map, i + 1, id)) { && next_index_eq(map, i + 1, index)) {
res = unshift_setlist(map, i + 1); res = unshift_setlist(map, i + 1);
break; break;
} }
} }
if (ref != IP_SET_INVALID_ID) if (ref != IP_SET_INVALID_ID)
__ip_set_put_byid(ref); __ip_set_put_byindex(ref);
finish: finish:
__ip_set_put_byid(id); __ip_set_put_byindex(index);
/* In case of success, release the reference to the id */ /* In case of success, release the reference to the set */
if (res == 0) if (res == 0)
__ip_set_put_byid(id); __ip_set_put_byindex(index);
return res; return res;
} }
@@ -244,9 +244,9 @@ setlist_kdel(struct ip_set *set,
int i, res = -EINVAL; int i, res = -EINVAL;
for (i = 0; i < map->size for (i = 0; i < map->size
&& map->id[i] != IP_SET_INVALID_ID && map->index[i] != IP_SET_INVALID_ID
&& res != 0; i++) && res != 0; i++)
res = ip_set_delip_kernel(map->id[i], skb, flags); res = ip_set_delip_kernel(map->index[i], skb, flags);
return res; return res;
} }
@@ -263,7 +263,7 @@ setlist_create(struct ip_set *set, const void *data, size_t size)
return -ENOMEM; return -ENOMEM;
map->size = req->size; map->size = req->size;
for (i = 0; i < map->size; i++) for (i = 0; i < map->size; i++)
map->id[i] = IP_SET_INVALID_ID; map->index[i] = IP_SET_INVALID_ID;
set->data = map; set->data = map;
return 0; return 0;
@@ -276,8 +276,8 @@ setlist_destroy(struct ip_set *set)
int i; int i;
for (i = 0; i < map->size for (i = 0; i < map->size
&& map->id[i] != IP_SET_INVALID_ID; i++) && map->index[i] != IP_SET_INVALID_ID; i++)
__ip_set_put_byid(map->id[i]); __ip_set_put_byindex(map->index[i]);
kfree(map); kfree(map);
set->data = NULL; set->data = NULL;
@@ -290,9 +290,9 @@ setlist_flush(struct ip_set *set)
int i; int i;
for (i = 0; i < map->size for (i = 0; i < map->size
&& map->id[i] != IP_SET_INVALID_ID; i++) { && map->index[i] != IP_SET_INVALID_ID; i++) {
__ip_set_put_byid(map->id[i]); __ip_set_put_byindex(map->index[i]);
map->id[i] = IP_SET_INVALID_ID; map->index[i] = IP_SET_INVALID_ID;
} }
} }
@@ -320,7 +320,7 @@ setlist_list_members(const struct ip_set *set, void *data)
int i; int i;
for (i = 0; i < map->size; i++) for (i = 0; i < map->size; i++)
*((ip_set_id_t *)data + i) = map->id[i]; *((ip_set_id_t *)data + i) = ip_set_id(map->index[i]);
} }
IP_SET_TYPE(setlist, IPSET_TYPE_SETNAME | IPSET_DATA_SINGLE) IP_SET_TYPE(setlist, IPSET_TYPE_SETNAME | IPSET_DATA_SINGLE)

2
extensions/ipset/ip_set_setlist.h
View File

@@ -10,7 +10,7 @@
struct ip_set_setlist { struct ip_set_setlist {
uint8_t size; uint8_t size;
ip_set_id_t id[0]; ip_set_id_t index[0];
}; };
struct ip_set_req_setlist_create { struct ip_set_req_setlist_create {

10
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 "2.4.3" #define IPSET_VERSION "2.4.5"
char program_name[] = "ipset"; char program_name[] = "ipset";
char program_version[] = IPSET_VERSION; char program_version[] = IPSET_VERSION;
@@ -121,7 +121,7 @@ static struct option opts_long[] = {
{"help", 2, 0, 'H'}, {"help", 2, 0, 'H'},
/* end */ /* end */
{0, 0, 0, 0}, {NULL},
}; };
static char opts_short[] = static char opts_short[] =
@@ -734,13 +734,13 @@ string_to_number(const char *str, unsigned int min, unsigned int max,
static int static int
string_to_port(const char *str, ip_set_ip_t *port) string_to_port(const char *str, ip_set_ip_t *port)
{ {
struct servent *service = getservbyname(str, "tcp"); struct servent *service;
if ((service = getservbyname(str, "tcp")) != NULL) { if ((service = getservbyname(str, "tcp")) != NULL) {
*port = ntohs((uint16_t) service->s_port); *port = ntohs((uint16_t) service->s_port);
return 0; return 0;
} }
return - 1; return -1;
} }
/* Fills the 'ip' with the parsed port in host byte order */ /* Fills the 'ip' with the parsed port in host byte order */
@@ -1955,7 +1955,7 @@ static int find_cmd(int option)
int i; int i;
for (i = 1; i <= NUMBER_OF_CMD; i++) for (i = 1; i <= NUMBER_OF_CMD; i++)
if (cmdflags[i] == (char) option) if (cmdflags[i] == option)
return i; return i;
return CMD_NONE; return CMD_NONE;

9
extensions/ipset/ipset.h
View File

@@ -68,10 +68,11 @@ enum set_commands {
CMD_ADT_GET, CMD_ADT_GET,
}; };
/* Exit codes */ enum exittype {
#define OTHER_PROBLEM 1 OTHER_PROBLEM = 1,
#define PARAMETER_PROBLEM 2 PARAMETER_PROBLEM,
#define VERSION_PROBLEM 3 VERSION_PROBLEM
};
/* The view of an ipset in userspace */ /* The view of an ipset in userspace */
struct set { struct set {

2
extensions/ipset/ipset_iphash.c
View File

@@ -127,7 +127,7 @@ static const struct option create_opts[] = {
{.name = "probes", .has_arg = required_argument, .val = '2'}, {.name = "probes", .has_arg = required_argument, .val = '2'},
{.name = "resize", .has_arg = required_argument, .val = '3'}, {.name = "resize", .has_arg = required_argument, .val = '3'},
{.name = "netmask", .has_arg = required_argument, .val = '4'}, {.name = "netmask", .has_arg = required_argument, .val = '4'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_ipmap.c
View File

@@ -183,7 +183,7 @@ static const struct option create_opts[] = {
{.name = "to", .has_arg = required_argument, .val = '2'}, {.name = "to", .has_arg = required_argument, .val = '2'},
{.name = "network", .has_arg = required_argument, .val = '3'}, {.name = "network", .has_arg = required_argument, .val = '3'},
{.name = "netmask", .has_arg = required_argument, .val = '4'}, {.name = "netmask", .has_arg = required_argument, .val = '4'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_ipporthash.c
View File

@@ -184,7 +184,7 @@ static const struct option create_opts[] = {
{.name = "from", .has_arg = required_argument, .val = '4'}, {.name = "from", .has_arg = required_argument, .val = '4'},
{.name = "to", .has_arg = required_argument, .val = '5'}, {.name = "to", .has_arg = required_argument, .val = '5'},
{.name = "network", .has_arg = required_argument, .val = '6'}, {.name = "network", .has_arg = required_argument, .val = '6'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_ipportiphash.c
View File

@@ -184,7 +184,7 @@ static const struct option create_opts[] = {
{.name = "from", .has_arg = required_argument, .val = '4'}, {.name = "from", .has_arg = required_argument, .val = '4'},
{.name = "to", .has_arg = required_argument, .val = '5'}, {.name = "to", .has_arg = required_argument, .val = '5'},
{.name = "network", .has_arg = required_argument, .val = '6'}, {.name = "network", .has_arg = required_argument, .val = '6'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_ipportnethash.c
View File

@@ -184,7 +184,7 @@ static const struct option create_opts[] = {
{.name = "from", .has_arg = required_argument, .val = '4'}, {.name = "from", .has_arg = required_argument, .val = '4'},
{.name = "to", .has_arg = required_argument, .val = '5'}, {.name = "to", .has_arg = required_argument, .val = '5'},
{.name = "network", .has_arg = required_argument, .val = '6'}, {.name = "network", .has_arg = required_argument, .val = '6'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_iptree.c
View File

@@ -70,7 +70,7 @@ create_final(void *data UNUSED, unsigned int flags UNUSED)
/* Create commandline options */ /* Create commandline options */
static const struct option create_opts[] = { static const struct option create_opts[] = {
{.name = "timeout", .has_arg = required_argument, .val = '1'}, {.name = "timeout", .has_arg = required_argument, .val = '1'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_iptreemap.c
View File

@@ -59,7 +59,7 @@ create_final(void *data UNUSED, unsigned int flags UNUSED)
static const struct option create_opts[] = { static const struct option create_opts[] = {
{.name = "gc", .has_arg = required_argument, .val = 'g'}, {.name = "gc", .has_arg = required_argument, .val = 'g'},
{0, 0, 0, 0}, {NULL},
}; };
static ip_set_ip_t static ip_set_ip_t

2
extensions/ipset/ipset_macipmap.c
View File

@@ -149,7 +149,7 @@ static const struct option create_opts[] = {
{.name = "to", .has_arg = required_argument, .val = '2'}, {.name = "to", .has_arg = required_argument, .val = '2'},
{.name = "network", .has_arg = required_argument, .val = '3'}, {.name = "network", .has_arg = required_argument, .val = '3'},
{.name = "matchunset", .has_arg = no_argument, .val = '4'}, {.name = "matchunset", .has_arg = no_argument, .val = '4'},
{0, 0, 0, 0}, {NULL},
}; };
static void static void

2
extensions/ipset/ipset_nethash.c
View File

@@ -106,7 +106,7 @@ static const struct option create_opts[] = {
{.name = "hashsize", .has_arg = required_argument, .val = '1'}, {.name = "hashsize", .has_arg = required_argument, .val = '1'},
{.name = "probes", .has_arg = required_argument, .val = '2'}, {.name = "probes", .has_arg = required_argument, .val = '2'},
{.name = "resize", .has_arg = required_argument, .val = '3'}, {.name = "resize", .has_arg = required_argument, .val = '3'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_portmap.c
View File

@@ -108,7 +108,7 @@ create_final(void *data, unsigned int flags)
static const struct option create_opts[] = { static const struct option create_opts[] = {
{.name = "from", .has_arg = required_argument, .val = '1'}, {.name = "from", .has_arg = required_argument, .val = '1'},
{.name = "to", .has_arg = required_argument, .val = '2'}, {.name = "to", .has_arg = required_argument, .val = '2'},
{0, 0, 0, 0}, {NULL},
}; };
/* Add, del, test parser */ /* Add, del, test parser */

2
extensions/ipset/ipset_setlist.c
View File

@@ -64,7 +64,7 @@ create_final(void *data UNUSED, unsigned int flags UNUSED)
/* Create commandline options */ /* Create commandline options */
static const struct option create_opts[] = { static const struct option create_opts[] = {
{.name = "size", .has_arg = required_argument, .val = '1'}, {.name = "size", .has_arg = required_argument, .val = '1'},
{0, 0, 0, 0}, {NULL},
}; };
static void check_setname(const char *name) static void check_setname(const char *name)

4
extensions/ipset/ipt_SET.c
View File

@@ -179,9 +179,9 @@ static void destroy(const struct xt_target *target,
} }
#endif #endif
if (info->add_set.index != IP_SET_INVALID_ID) if (info->add_set.index != IP_SET_INVALID_ID)
ip_set_put(info->add_set.index); ip_set_put_byindex(info->add_set.index);
if (info->del_set.index != IP_SET_INVALID_ID) if (info->del_set.index != IP_SET_INVALID_ID)
ip_set_put(info->del_set.index); ip_set_put_byindex(info->del_set.index);
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)

2
extensions/ipset/ipt_set.c
View File

@@ -175,7 +175,7 @@ static void destroy(const struct xt_match *match,
return; return;
} }
#endif #endif
ip_set_put(info->match_set.index); ip_set_put_byindex(info->match_set.index);
} }
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)