summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2004-10-20 22:02:47 +0000
committerHarald Welte <laforge@gnumonks.org>2004-10-20 22:02:47 +0000
commit60953f027743af52ba6d3ea4561b5ae169629cd0 (patch)
tree140cccff32cd8724b4b0c1a40d527dc6c61fd083 /extensions
parent5d4a1b8d4fdbd4f23245c748c7045929dfea52c1 (diff)
minor syntax fixes
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libipt_hashlimit.c31
1 files changed, 18 insertions, 13 deletions
diff --git a/extensions/libipt_hashlimit.c b/extensions/libipt_hashlimit.c
index f632f652..caa444fb 100644
--- a/extensions/libipt_hashlimit.c
+++ b/extensions/libipt_hashlimit.c
@@ -116,21 +116,26 @@ static int parse_mode(struct ipt_hashlimit_info *r, char *optarg)
if (!arg)
return -1;
+ r->cfg.mode = 0;
+
for (tok = strtok(arg, ",|");
tok;
tok = strtok(NULL, ",|")) {
if (!strcmp(tok, "dstip"))
r->cfg.mode |= IPT_HASHLIMIT_HASH_DIP;
- else if (!strcmp(optarg, "srcip"))
+ else if (!strcmp(tok, "srcip"))
r->cfg.mode |= IPT_HASHLIMIT_HASH_SIP;
- else if (!strcmp(optarg, "srcport"))
+ else if (!strcmp(tok, "srcport"))
r->cfg.mode |= IPT_HASHLIMIT_HASH_SPT;
- else if (!strcmp(optarg, "dstport"))
+ else if (!strcmp(tok, "dstport"))
r->cfg.mode |= IPT_HASHLIMIT_HASH_DPT;
- else
+ else {
+ free(arg);
return -1;
+ }
}
- return 1;
+ free(arg);
+ return 0;
}
#define PARAM_LIMIT 0x00000001
@@ -274,25 +279,25 @@ static void print_mode(const struct ipt_hashlimit_info *r, char separator)
if (r->cfg.mode & IPT_HASHLIMIT_HASH_SIP) {
if (prevmode)
putchar(separator);
- puts("srcip");
+ fputs("srcip", stdout);
prevmode = 1;
}
if (r->cfg.mode & IPT_HASHLIMIT_HASH_SPT) {
if (prevmode)
putchar(separator);
- puts("srcport");
+ fputs("srcport", stdout);
prevmode = 1;
}
if (r->cfg.mode & IPT_HASHLIMIT_HASH_DIP) {
if (prevmode)
putchar(separator);
- puts("dstip");
+ fputs("dstip", stdout);
prevmode = 1;
}
if (r->cfg.mode & IPT_HASHLIMIT_HASH_SPT) {
if (prevmode)
putchar(separator);
- puts("dstport");
+ fputs("dstport", stdout);
}
putchar(' ');
}
@@ -305,9 +310,9 @@ print(const struct ipt_ip *ip,
{
struct ipt_hashlimit_info *r =
(struct ipt_hashlimit_info *)match->data;
- puts("limit: avg "); print_rate(r->cfg.avg);
+ fputs("limit: avg ", stdout); print_rate(r->cfg.avg);
printf("burst %u ", r->cfg.burst);
- puts("mode ");
+ fputs("mode ", stdout);
print_mode(r, '-');
if (r->cfg.size)
printf("htable-size %u ", r->cfg.size);
@@ -325,11 +330,11 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
struct ipt_hashlimit_info *r =
(struct ipt_hashlimit_info *)match->data;
- puts("--hashlimit "); print_rate(r->cfg.avg);
+ fputs("--hashlimit ", stdout); print_rate(r->cfg.avg);
if (r->cfg.burst != IPT_HASHLIMIT_BURST)
printf("--hashlimit-burst %u ", r->cfg.burst);
- puts("--mode ");
+ fputs("--mode ", stdout);
print_mode(r, ',');
if (r->cfg.size)