git://git.onelab.eu
/
iptables.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to iptables-1.3.5
[iptables.git]
/
extensions
/
libipt_connbytes.c
diff --git
a/extensions/libipt_connbytes.c
b/extensions/libipt_connbytes.c
index
7274194
..
42e1ab5
100644
(file)
--- a/
extensions/libipt_connbytes.c
+++ b/
extensions/libipt_connbytes.c
@@
-84,11
+84,11
@@
parse(int c, char **argv, int invert, unsigned int *flags,
break;
case '3':
if (!strcmp(optarg, "packets"))
break;
case '3':
if (!strcmp(optarg, "packets"))
- sinfo->what = IPT_CONNBYTES_
WHAT_
PKTS;
+ sinfo->what = IPT_CONNBYTES_PKTS;
else if (!strcmp(optarg, "bytes"))
else if (!strcmp(optarg, "bytes"))
- sinfo->what = IPT_CONNBYTES_
WHAT_
BYTES;
+ sinfo->what = IPT_CONNBYTES_BYTES;
else if (!strcmp(optarg, "avgpkt"))
else if (!strcmp(optarg, "avgpkt"))
- sinfo->what = IPT_CONNBYTES_
WHAT_
AVGPKT;
+ sinfo->what = IPT_CONNBYTES_AVGPKT;
else
exit_error(PARAMETER_PROBLEM,
"Unknown --connbytes-mode `%s'", optarg);
else
exit_error(PARAMETER_PROBLEM,
"Unknown --connbytes-mode `%s'", optarg);
@@
-105,19
+105,19
@@
static void final_check(unsigned int flags)
{
if (flags != 7)
exit_error(PARAMETER_PROBLEM, "You must specify `--connbytes'"
{
if (flags != 7)
exit_error(PARAMETER_PROBLEM, "You must specify `--connbytes'"
- "`--connbytes-dir
ection
' and `--connbytes-mode'");
+ "`--connbytes-dir' and `--connbytes-mode'");
}
static void print_mode(struct ipt_connbytes_info *sinfo)
{
switch (sinfo->what) {
}
static void print_mode(struct ipt_connbytes_info *sinfo)
{
switch (sinfo->what) {
- case IPT_CONNBYTES_
WHAT_
PKTS:
+ case IPT_CONNBYTES_PKTS:
fputs("packets ", stdout);
break;
fputs("packets ", stdout);
break;
- case IPT_CONNBYTES_
WHAT_
BYTES:
+ case IPT_CONNBYTES_BYTES:
fputs("bytes ", stdout);
break;
fputs("bytes ", stdout);
break;
- case IPT_CONNBYTES_
WHAT_
AVGPKT:
+ case IPT_CONNBYTES_AVGPKT:
fputs("avgpkt ", stdout);
break;
default:
fputs("avgpkt ", stdout);
break;
default:
@@
-181,7
+181,7
@@
static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
fputs("--connbytes-mode ", stdout);
print_mode(sinfo);
fputs("--connbytes-mode ", stdout);
print_mode(sinfo);
- fputs("--connbytes-dir
ection
", stdout);
+ fputs("--connbytes-dir ", stdout);
print_direction(sinfo);
}
print_direction(sinfo);
}