[conntrack-tools] conntrack: cleanup XML header handling

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=1c2772d3e5f77022649410d9f5787221cc38573f
commit 1c2772d3e5f77022649410d9f5787221cc38573f
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Sep 28 22:46:15 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Sep 28 22:46:15 2008 +0200

    conntrack: cleanup XML header handling
    
    This patch removes the use of snprintf and directly print the XML header
    to the standard output. This simplifies the handling.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 7a399ccded7086436dff2b55e6461b520cc952f6
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sun Sep 28 18:28:39 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sun Sep 28 18:28:39 2008 +0200

    conntrack: cleanup for the update path
    
    This patch cleans up the update path for the conntrack utility.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  1c2772d3e5f77022649410d9f5787221cc38573f (commit)
       via  7a399ccded7086436dff2b55e6461b520cc952f6 (commit)
      from  99a80b3fe6af95ca711c2d37737408c3703a6184 (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 1c2772d3e5f77022649410d9f5787221cc38573f
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Sep 28 22:46:15 2008 +0200

    conntrack: cleanup XML header handling
    
    This patch removes the use of snprintf and directly print the XML header
    to the standard output. This simplifies the handling.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 7a399ccded7086436dff2b55e6461b520cc952f6
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sun Sep 28 18:28:39 2008 +0200

    conntrack: cleanup for the update path
    
    This patch cleans up the update path for the conntrack utility.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 include/conntrack.h |    6 ------
 src/conntrack.c     |   37 +++++++++++--------------------------
 2 files changed, 11 insertions(+), 32 deletions(-)
This patch cleans up the update path for the conntrack utility.

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

diff --git a/src/conntrack.c b/src/conntrack.c
index 7c12b39..568307a 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -787,21 +787,22 @@ static int update_cb(enum nf_conntrack_msg_type type,
 	char __tmp[nfct_maxsize()];
 	struct nf_conntrack *tmp = (struct nf_conntrack *) (void *)__tmp;
 
-	memcpy(tmp, obj, sizeof(__tmp));
+	memset(tmp, 0, sizeof(__tmp));
 
-	if (ignore_nat(tmp, ct))
+	if (ignore_nat(obj, ct))
 		return NFCT_CB_CONTINUE;
 
 	if (nfct_attr_is_set(obj, ATTR_ID) && nfct_attr_is_set(ct, ATTR_ID) &&
 	    nfct_get_attr_u32(obj, ATTR_ID) != nfct_get_attr_u32(ct, ATTR_ID))
 	    	return NFCT_CB_CONTINUE;
 
-	if (options & CT_OPT_TUPLE_ORIG && !nfct_cmp(tmp, ct, NFCT_CMP_ORIG))
+	if (options & CT_OPT_TUPLE_ORIG && !nfct_cmp(obj, ct, NFCT_CMP_ORIG))
 		return NFCT_CB_CONTINUE;
-	if (options & CT_OPT_TUPLE_REPL && !nfct_cmp(tmp, ct, NFCT_CMP_REPL))
+	if (options & CT_OPT_TUPLE_REPL && !nfct_cmp(obj, ct, NFCT_CMP_REPL))
 		return NFCT_CB_CONTINUE;
 
 	nfct_copy(tmp, ct, NFCT_CP_ORIG);
+	nfct_copy(tmp, obj, NFCT_CP_META);
 
 	res = nfct_query(ith, NFCT_Q_UPDATE, tmp);
 	if (res < 0)