summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorPhil Oester <kernel@linuxace.com>2004-09-21 10:46:40 +0000
committerPatrick McHardy <kaber@trash.net>2004-09-21 10:46:40 +0000
commit2731398efe38c42b703d2751852e97bd2198663d (patch)
tree9898315e0f5b4dc16b30d835f0121765f066c1db /extensions
parent35160ee618b7015f7dd9da0cf199a518e3b8b70e (diff)
Fix half-working dstlimit invert check (Phil Oester)
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libipt_dstlimit.c38
1 files changed, 12 insertions, 26 deletions
diff --git a/extensions/libipt_dstlimit.c b/extensions/libipt_dstlimit.c
index 31036312..32d73321 100644
--- a/extensions/libipt_dstlimit.c
+++ b/extensions/libipt_dstlimit.c
@@ -132,9 +132,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
switch(c) {
case '%':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM,
- "Unexpected `!' after --dstlimit");
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (!parse_rate(optarg, &r->cfg.avg))
exit_error(PARAMETER_PROBLEM,
"bad rate `%s'", optarg);
@@ -142,10 +140,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
break;
case '$':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM,
- "Unexpected `!' after --dstlimit-burst");
-
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (string_to_number(optarg, 0, 10000, &num) == -1)
exit_error(PARAMETER_PROBLEM,
"bad --dstlimit-burst `%s'", optarg);
@@ -153,10 +148,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
*flags |= PARAM_BURST;
break;
case '&':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM,
- "Unexpected `!' after --dstlimit-htable-size");
-
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (string_to_number(optarg, 0, 0xffffffff, &num) == -1)
exit_error(PARAMETER_PROBLEM,
"bad --dstlimit-htable-size: `%s'", optarg);
@@ -164,9 +156,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
*flags |= PARAM_SIZE;
break;
case '*':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM,
- "Unexpected `!' after --dstlimit-htable-max");
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (string_to_number(optarg, 0, 0xffffffff, &num) == -1)
exit_error(PARAMETER_PROBLEM,
"bad --dstlimit-htable-max: `%s'", optarg);
@@ -174,9 +164,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
*flags |= PARAM_MAX;
break;
case '(':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM, "Unexpected `!' after "
- "--dstlimit-htable-gcinterval");
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (string_to_number(optarg, 0, 0xffffffff, &num) == -1)
exit_error(PARAMETER_PROBLEM,
"bad --dstlimit-htable-gcinterval: `%s'",
@@ -186,9 +174,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
*flags |= PARAM_GCINTERVAL;
break;
case ')':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM, "Unexpected `!' after "
- "--dstlimit-htable-expire");
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (string_to_number(optarg, 0, 0xffffffff, &num) == -1)
exit_error(PARAMETER_PROBLEM,
"bad --dstlimit-htable-expire: `%s'", optarg);
@@ -197,9 +183,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
*flags |= PARAM_EXPIRE;
break;
case '_':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM, "Unexpected `!' after "
- "--dstlimit-mode");
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (!strcmp(optarg, "dstip"))
r->cfg.mode = IPT_DSTLIMIT_HASH_DIP;
else if (!strcmp(optarg, "dstip-destport") ||
@@ -216,9 +200,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
*flags |= PARAM_MODE;
break;
case '"':
- if (check_inverse(optarg, &invert, NULL, 0))
- exit_error(PARAMETER_PROBLEM, "Unexpected `!' after "
- "--dstlimit-name");
+ if (check_inverse(argv[optind-1], &invert, &optind, 0)) break;
if (strlen(optarg) == 0)
exit_error(PARAMETER_PROBLEM, "Zero-length name?");
strncpy(r->name, optarg, sizeof(r->name));
@@ -228,6 +210,10 @@ parse(int c, char **argv, int invert, unsigned int *flags,
return 0;
}
+ if (invert)
+ exit_error(PARAMETER_PROBLEM,
+ "dstlimit does not support invert");
+
return 1;
}