The branch, master has been updated
via fb4dd1a0ea39f0189e59e7188a7a438c1548f4cd (commit)
from 556ca72812b099457e564e300ba882d96bd5bcd1 (commit)
- Log -----------------------------------------------------------------
commit fb4dd1a0ea39f0189e59e7188a7a438c1548f4cd
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Fri Aug 14 17:27:14 2009 +0200
Support for iptables 1.4.3 and 1.4.4 by Blazej
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
iptables/extensions/libipt_ACCOUNT.c | 24 ++++++++++++------------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bf79485..6f2ad58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+New in 1.16 - 2009-08-XX
+------------------------
+* Support for iptables 1.4.3 and 1.4.4 by Blazej
+* iptables 1.4.2 and below is no longer supported
+
New in 1.15 - 2009-04-14
------------------------
* Support for kernel 2.6.29 / 2.6.28
diff --git a/iptables/extensions/libipt_ACCOUNT.c
b/iptables/extensions/libipt_ACCOUNT.c
index ef32049..6a790c6 100644
--- a/iptables/extensions/libipt_ACCOUNT.c
+++ b/iptables/extensions/libipt_ACCOUNT.c
@@ -59,21 +59,21 @@ static int parse(int c, char **argv, int invert, unsigned
int *flags,
switch (c) {
case 'a':
if (*flags & IPT_ACCOUNT_OPT_ADDR)
- exit_error(PARAMETER_PROBLEM, "Can't specify --%s twice",
+ xtables_error(PARAMETER_PROBLEM, "Can't specify --%s twice",
opts[0].name);
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM, "Unexpected `!' after --%s",
+ if (xtables_check_inverse(optarg, &invert, NULL, 0))
+ xtables_error(PARAMETER_PROBLEM, "Unexpected `!' after --%s",
opts[0].name);
#ifdef XTABLES_VERSION_CODE
- ipparse_hostnetworkmask(optarg, &addrs, &mask, &naddrs);
+ xtables_ipparse_any(optarg, &addrs, &mask, &naddrs);
#else
parse_hostnetworkmask(optarg, &addrs, &mask, &naddrs);
#endif
if (naddrs > 1)
- exit_error(PARAMETER_PROBLEM, "multiple IP addresses not
allowed");
+ xtables_error(PARAMETER_PROBLEM, "multiple IP addresses not
allowed");
accountinfo->net_ip = addrs[0].s_addr;
accountinfo->net_mask = mask.s_addr;
@@ -83,15 +83,15 @@ static int parse(int c, char **argv, int invert, unsigned
int *flags,
case 't':
if (*flags & IPT_ACCOUNT_OPT_TABLE)
- exit_error(PARAMETER_PROBLEM,
+ xtables_error(PARAMETER_PROBLEM,
"Can't specify --%s twice", opts[1].name);
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM,
+ if (xtables_check_inverse(optarg, &invert, NULL, 0))
+ xtables_error(PARAMETER_PROBLEM,
"Unexpected `!' after --%s", opts[1].name);
if (strlen(optarg) > ACCOUNT_TABLE_NAME_LEN - 1)
- exit_error(PARAMETER_PROBLEM,
+ xtables_error(PARAMETER_PROBLEM,
"Maximum table name length %u for --%s",
ACCOUNT_TABLE_NAME_LEN - 1, opts[1].name);
@@ -109,14 +109,14 @@ static int parse(int c, char **argv, int invert, unsigned
int *flags,
static void final_check(unsigned int flags)
{
if (!(flags&IPT_ACCOUNT_OPT_ADDR) || !(flags&IPT_ACCOUNT_OPT_TABLE))
- exit_error(PARAMETER_PROBLEM, "ACCOUNT: needs --%s and --%s",
+ xtables_error(PARAMETER_PROBLEM, "ACCOUNT: needs --%s and --%s",
opts[0].name, opts[1].name);
}
static const char *print_helper_ip(struct in_addr a)
{
#ifdef XTABLES_VERSION_CODE
- return ipaddr_to_numeric(&a);
+ return xtables_ipaddr_to_numeric(&a);
#else
return addr_to_dotted(&a);
#endif
@@ -125,7 +125,7 @@ static const char *print_helper_ip(struct in_addr a)
static const char *print_helper_mask(struct in_addr a)
{
#ifdef XTABLES_VERSION_CODE
- return ipmask_to_numeric(&a);
+ return xtables_ipmask_to_numeric(&a);
#else
return mask_to_dotted(&a);
#endif
hooks/post-receive
--
high performance accounting for netfilter
--
ipt_ACCOUNT-git - see http://www.intra2net.com/en/developer/ipt_ACCOUNT for
details.
To unsubscribe send a mail to
ipt_ACCOUNT-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|