[iptables] libiptc: give credits to my self

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Mon Mar 23 14:28:12 CET 2009


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=c9477d0dcd01af5d1ee6c95c757a8c814fb3be63
commit c9477d0dcd01af5d1ee6c95c757a8c814fb3be63
Author:     Jesper Dangaard Brouer <hawk at comx.dk>
AuthorDate: Mon Mar 23 14:27:44 2009 +0100
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Mar 23 14:27:44 2009 +0100

    libiptc: give credits to my self
    
    Add notes about my scalability work on the library libiptc.
    This should make in more obvious who to complain to.
    
    Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit a9fe5b3d62e4e974e9517b23d0bf7f0f146ed11e
Author:     Jesper Dangaard Brouer <hawk at comx.dk>
AuthorDate: Mon Mar 23 14:26:56 2009 +0100
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Mar 23 14:26:56 2009 +0100

    libiptc: fix whitespaces and typos
    
    Cleanup whitespaces while going through the code.
    
    Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit 64ff47cde38e48b621883947fd61b9b1357f9451
Author:     Jesper Dangaard Brouer <hawk at comx.dk>
AuthorDate: Mon Mar 23 14:25:49 2009 +0100
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Mon Mar 23 14:25:49 2009 +0100

    libiptc: fix chain rename bug in libiptc
    
    Chain renaming (TC_RENAME_CHAIN) can result in an unsorted
    chain list.  That breaks the requirement of the binary search
    done in iptcc_bsearch_chain_index().
    
    Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  c9477d0dcd01af5d1ee6c95c757a8c814fb3be63 (commit)
       via  a9fe5b3d62e4e974e9517b23d0bf7f0f146ed11e (commit)
       via  64ff47cde38e48b621883947fd61b9b1357f9451 (commit)
      from  7cd15e367cc81c839ef2ca061d201c46ca1deb7c (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 c9477d0dcd01af5d1ee6c95c757a8c814fb3be63
Author: Jesper Dangaard Brouer <hawk at comx.dk>
Date:   Mon Mar 23 14:27:44 2009 +0100

    libiptc: give credits to my self
    
    Add notes about my scalability work on the library libiptc.
    This should make in more obvious who to complain to.
    
    Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit a9fe5b3d62e4e974e9517b23d0bf7f0f146ed11e
Author: Jesper Dangaard Brouer <hawk at comx.dk>
Date:   Mon Mar 23 14:26:56 2009 +0100

    libiptc: fix whitespaces and typos
    
    Cleanup whitespaces while going through the code.
    
    Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

commit 64ff47cde38e48b621883947fd61b9b1357f9451
Author: Jesper Dangaard Brouer <hawk at comx.dk>
Date:   Mon Mar 23 14:25:49 2009 +0100

    libiptc: fix chain rename bug in libiptc
    
    Chain renaming (TC_RENAME_CHAIN) can result in an unsorted
    chain list.  That breaks the requirement of the binary search
    done in iptcc_bsearch_chain_index().
    
    Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

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

 libiptc/libiptc.c |   96 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 54 insertions(+), 42 deletions(-)
Chain renaming (TC_RENAME_CHAIN) can result in an unsorted
chain list.  That breaks the requirement of the binary search
done in iptcc_bsearch_chain_index().

Signed-off-by: Jesper Dangaard Brouer <hawk at comx.dk>
Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c
index c3d9bfc..6b3a1fb 100644
--- a/libiptc/libiptc.c
+++ b/libiptc/libiptc.c
@@ -2404,8 +2404,15 @@ int TC_RENAME_CHAIN(const IPT_CHAINLABEL oldname,
 		return 0;
 	}
 
+	/* This only unlinks "c" from the list, thus no free(c) */
+	iptcc_chain_index_delete_chain(c, handle);
+
+	/* Change the name of the chain */
 	strncpy(c->name, newname, sizeof(IPT_CHAINLABEL));
-	
+
+	/* Insert sorted into to list again */
+	iptc_insert_chain(handle, c);
+
 	set_changed(handle);
 
 	return 1;



More information about the netfilter-cvslog mailing list