[conntrack-tools] cli: insert `conntrack-tools' string in help and error messages
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Tue Aug 12 18:50:10 CEST 2008
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=abc90e7c5d560973912ea736628d31ead1fe3d5e
commit abc90e7c5d560973912ea736628d31ead1fe3d5e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Aug 12 18:49:58 2008 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Aug 12 18:49:58 2008 +0200
cli: insert `conntrack-tools' string in help and error messages
Insert string `conntrack-tools' in error messages to explicitly print
that this version is inside the conntrack-tools package.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit b18a146363f170afa420af04f80d2a91c38f11a3
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Aug 12 18:08:07 2008 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Aug 12 18:08:07 2008 +0200
cli: check for missing arguments in getopt_long
From: Pablo Neira Ayuso <pablo at netfilter.org>
If getopt_long returns '?', show an error telling that some
arguments are missing.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit e50e3a5b0f426571d6feb16800b991779aab6d8e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Aug 12 13:46:27 2008 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Aug 12 13:46:27 2008 +0200
cli: remove unrequired \n in error message
Remove extra \n in error message.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 064f0d6da31e9dd5a18da77a9dcf9938746a0c48
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue Aug 12 12:59:32 2008 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Aug 12 12:59:32 2008 +0200
cli: remove duplicated optarg checking
Remove duplicated optarg checkings for options that require mandatory
paramaters. This checking is already done by getopt_long().
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
via abc90e7c5d560973912ea736628d31ead1fe3d5e (commit)
via b18a146363f170afa420af04f80d2a91c38f11a3 (commit)
via e50e3a5b0f426571d6feb16800b991779aab6d8e (commit)
via 064f0d6da31e9dd5a18da77a9dcf9938746a0c48 (commit)
from d8df7a62cf50cc1af868b22e4d301a78e7f5c450 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit abc90e7c5d560973912ea736628d31ead1fe3d5e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Aug 12 18:49:58 2008 +0200
cli: insert `conntrack-tools' string in help and error messages
Insert string `conntrack-tools' in error messages to explicitly print
that this version is inside the conntrack-tools package.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit b18a146363f170afa420af04f80d2a91c38f11a3
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Aug 12 18:08:07 2008 +0200
cli: check for missing arguments in getopt_long
From: Pablo Neira Ayuso <pablo at netfilter.org>
If getopt_long returns '?', show an error telling that some
arguments are missing.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit e50e3a5b0f426571d6feb16800b991779aab6d8e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Aug 12 13:46:27 2008 +0200
cli: remove unrequired \n in error message
Remove extra \n in error message.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 064f0d6da31e9dd5a18da77a9dcf9938746a0c48
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Tue Aug 12 12:59:32 2008 +0200
cli: remove duplicated optarg checking
Remove duplicated optarg checkings for options that require mandatory
paramaters. This checking is already done by getopt_long().
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
-----------------------------------------------------------------------
src/conntrack.c | 66 +++++++++++++++----------------------------------------
1 files changed, 18 insertions(+), 48 deletions(-)
Remove duplicated optarg checkings for options that require mandatory
paramaters. This checking is already done by getopt_long().
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
diff --git a/src/conntrack.c b/src/conntrack.c
index cc19b5d..36a317a 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -964,10 +964,6 @@ int main(int argc, char *argv[])
case 'd':
case 'r':
case 'q':
- if (!optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires an IP", c);
-
options |= opt2type[c];
l3protonum = parse_addr(optarg, &ad);
@@ -987,10 +983,6 @@ int main(int argc, char *argv[])
case '}':
case '[':
case ']':
- if (!optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires an IP", c);
-
options |= opt2type[c];
l3protonum = parse_addr(optarg, &ad);
set_family(&family, l3protonum);
@@ -1006,10 +998,6 @@ int main(int argc, char *argv[])
nfct_set_attr_u8(mask, ATTR_ORIG_L3PROTO, l3protonum);
break;
case 'p':
- if (!optarg || !*optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires a valid protocol", c);
-
options |= CT_OPT_PROTO;
h = findproto(optarg);
if (!h)
@@ -1022,44 +1010,24 @@ int main(int argc, char *argv[])
exit_error(OTHER_PROBLEM, "out of memory");
break;
case 't':
- if (!optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires value", c);
-
options |= CT_OPT_TIMEOUT;
nfct_set_attr_u32(obj, ATTR_TIMEOUT, atol(optarg));
nfexp_set_attr_u32(exp, ATTR_EXP_TIMEOUT, atol(optarg));
break;
case 'u':
- if (!optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires type", c);
-
options |= CT_OPT_STATUS;
parse_parameter(optarg, &status, PARSE_STATUS);
nfct_set_attr_u32(obj, ATTR_STATUS, status);
break;
case 'e':
- if (!optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires type", c);
-
options |= CT_OPT_EVENT_MASK;
parse_parameter(optarg, &event_mask, PARSE_EVENT);
break;
case 'o':
- if (!optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires type", c);
-
options |= CT_OPT_OUTPUT;
parse_parameter(optarg, &output_mask, PARSE_OUTPUT);
break;
case 'z':
- if (optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c does not require parameters",c);
-
options |= CT_OPT_ZERO;
break;
case 'n':
@@ -1085,10 +1053,6 @@ int main(int argc, char *argv[])
case 'm':
case 'c':
options |= opt2type[c];
- if (!optarg)
- exit_error(PARAMETER_PROBLEM,
- "-%c requires value", c);
-
nfct_set_attr_u32(obj,
opt2attr[c],
strtoul(optarg, NULL, 0));
More information about the netfilter-cvslog
mailing list