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: fast forward to 2.5.0

Browse Source
This commit is contained in:
Jan Engelhardt
2009-03-07 01:33:31 +01:00
parent 36f80be2f7
commit d263cfbd50
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/changelog.txt
View File

@@ -1,6 +1,7 @@
- ipset: fix for compilation with 2.6.29-rt - ipset: fix for compilation with 2.6.29-rt
- ipset: fast forward to 2.5.0
- rename xt_portscan to xt_lscan ("low-level scan") because - rename xt_portscan to xt_lscan ("low-level scan") because
"portscan" as a wor caused confusion "portscan" as a wor caused confusion
- xt_LOGMARK: print incoming interface index - xt_LOGMARK: print incoming interface index

6
extensions/ipset/ipset.8
View File

@@ -602,8 +602,4 @@ Joakim Axelsson, Patrick Schaaf and Martin Josefsson.
.P .P
Sven Wegener wrote the iptreemap type. Sven Wegener wrote the iptreemap type.
.SH LAST REMARK .SH LAST REMARK
.BR "I stand on the shoulder of giants." .BR "I stand on the shoulders of giants."
.\" .. and did I mention that we are incredibly cool people?
.\" .. sexy, too ..
.\" .. witty, charming, powerful ..
.\" .. and most of all, modest ..

5
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.9" #define IPSET_VERSION "2.5.0"
char program_name[] = "ipset"; char program_name[] = "ipset";
char program_version[] = IPSET_VERSION; char program_version[] = IPSET_VERSION;
@@ -629,7 +629,8 @@ void parse_ip(const char *str, ip_set_ip_t * ip)
"host/network `%s' resolves to serveral ip-addresses. " "host/network `%s' resolves to serveral ip-addresses. "
"Please specify one.", str); "Please specify one.", str);
*ip = ntohl(((struct in_addr *) host->h_addr_list[0])->s_addr); memcpy(&addr, host->h_addr_list[0], sizeof(struct in_addr));
*ip = ntohl(addr.s_addr);
return; return;
} }