[conntrack-tools] conntrack: move release options code to free_options()

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Fri Nov 28 00:49:30 CET 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=1cd6dc33d533d05f5212f215521d5c3c9e362714
commit 1cd6dc33d533d05f5212f215521d5c3c9e362714
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Nov 28 00:45:06 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Nov 28 00:45:06 2008 +0100

    conntrack: move release options code to free_options()
    
    This patch move the options release to free_options(). It also
    move the free_options call after the error checking because
    exit_error already free the option.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit a81b65aee06b864772647d9ec0ee09fdaccf2889
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Nov 28 00:45:05 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Nov 28 00:45:05 2008 +0100

    conntrack: support diminutives for -L
    
    With this patch, you can specify the following command to dump the
    expectation table, instead of writing 'expect'.
    
    # conntrack -L e
    
    also, it is valid the following command:
    
    # conntrack -L ex
    # conntrack -L exp
    
    and so on.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 43ba03341b176cb71502df0ac7b979447b98fad9
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Nov 28 00:45:03 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Nov 28 00:45:03 2008 +0100

    conntrack: remove hardcoded buffer size, use sizeof instead
    
    This patch replaces a couple of hardcoded buffer sizes by sizeof()
    calls. This sort of code is error-prone.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 35a22c2721d92c983dc130468ca48aaae46be299
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Fri Nov 28 00:44:46 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Fri Nov 28 00:44:46 2008 +0100

    conntrack: do_parse_parameter show warning to stderr (not to stdout)
    
    This patch fixes a wrong warning display to stdout instead of stderr.
    Make the warning message homogeneous to others.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  1cd6dc33d533d05f5212f215521d5c3c9e362714 (commit)
       via  a81b65aee06b864772647d9ec0ee09fdaccf2889 (commit)
       via  43ba03341b176cb71502df0ac7b979447b98fad9 (commit)
       via  35a22c2721d92c983dc130468ca48aaae46be299 (commit)
      from  9aba3974d60bfbc773ac366ad6b8859a5c000377 (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 1cd6dc33d533d05f5212f215521d5c3c9e362714
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Nov 28 00:45:06 2008 +0100

    conntrack: move release options code to free_options()
    
    This patch move the options release to free_options(). It also
    move the free_options call after the error checking because
    exit_error already free the option.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit a81b65aee06b864772647d9ec0ee09fdaccf2889
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Nov 28 00:45:05 2008 +0100

    conntrack: support diminutives for -L
    
    With this patch, you can specify the following command to dump the
    expectation table, instead of writing 'expect'.
    
    # conntrack -L e
    
    also, it is valid the following command:
    
    # conntrack -L ex
    # conntrack -L exp
    
    and so on.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 43ba03341b176cb71502df0ac7b979447b98fad9
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Nov 28 00:45:03 2008 +0100

    conntrack: remove hardcoded buffer size, use sizeof instead
    
    This patch replaces a couple of hardcoded buffer sizes by sizeof()
    calls. This sort of code is error-prone.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 35a22c2721d92c983dc130468ca48aaae46be299
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Fri Nov 28 00:44:46 2008 +0100

    conntrack: do_parse_parameter show warning to stderr (not to stdout)
    
    This patch fixes a wrong warning display to stdout instead of stderr.
    Make the warning message homogeneous to others.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 src/conntrack.c |   39 ++++++++++++++++++++-------------------
 1 files changed, 20 insertions(+), 19 deletions(-)
This patch fixes a wrong warning display to stdout instead of stderr.
Make the warning message homogeneous to others.

Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/conntrack.c b/src/conntrack.c
index 26e7408..999df87 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -379,12 +379,14 @@ do_parse_parameter(const char *str, size_t str_length, unsigned int *value,
 	struct parse_parameter *p = &parse_array[parse_type];
 
 	if (strncasecmp(str, "SRC_NAT", str_length) == 0) {
-		printf("skipping SRC_NAT, use --src-nat instead\n");
+		fprintf(stderr, "WARNING: ignoring SRC_NAT, "
+				"use --src-nat instead\n");
 		return 1;
 	}
 
 	if (strncasecmp(str, "DST_NAT", str_length) == 0) {
-		printf("skipping DST_NAT, use --dst-nat instead\n");
+		fprintf(stderr, "WARNING: ignoring DST_NAT, "
+				"use --dst-nat instead\n");
 		return 1;
 	}
 



More information about the netfilter-cvslog mailing list