anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-20 19:44:56 +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

10
extensions/ipset/ipset.c
View File

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