[libnetfilter_conntrack] api: fix bogus netlink flags in nfct_build_query

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Sat Nov 29 12:37:15 CET 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=77d597d34e12f7b760e2e58a6d801a28247287bc
commit 77d597d34e12f7b760e2e58a6d801a28247287bc
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Nov 29 12:35:18 2008 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Nov 29 12:35:18 2008 +0100

    api: fix bogus netlink flags in nfct_build_query
    
    This patch removes unnecessary flags included in NFCT_Q_DUMP,
    NFCT_Q_DUMP_RESET and NFCT_Q_DESTROY requests.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  77d597d34e12f7b760e2e58a6d801a28247287bc (commit)
      from  dc5162d5f1d4f4ea7e331f1f10a5f8128200025f (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 77d597d34e12f7b760e2e58a6d801a28247287bc
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Sat Nov 29 12:35:18 2008 +0100

    api: fix bogus netlink flags in nfct_build_query
    
    This patch removes unnecessary flags included in NFCT_Q_DUMP,
    NFCT_Q_DUMP_RESET and NFCT_Q_DESTROY requests.
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 src/conntrack/api.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
This patch removes unnecessary flags included in NFCT_Q_DUMP,
NFCT_Q_DUMP_RESET and NFCT_Q_DESTROY requests.

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

diff --git a/src/conntrack/api.c b/src/conntrack/api.c
index 141aa9d..8739412 100644
--- a/src/conntrack/api.c
+++ b/src/conntrack/api.c
@@ -592,7 +592,7 @@ int nfct_build_query(struct nfnl_subsys_handle *ssh,
 		nfct_build_conntrack(ssh, req, size, IPCTNL_MSG_CT_NEW, NLM_F_REQUEST|NLM_F_ACK, data);
 		break;
 	case NFCT_Q_DESTROY:
-		nfct_build_conntrack(ssh, req, size, IPCTNL_MSG_CT_DELETE, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK, data);
+		nfct_build_conntrack(ssh, req, size, IPCTNL_MSG_CT_DELETE, NLM_F_REQUEST|NLM_F_ACK, data);
 		break;
 	case NFCT_Q_GET:
 		nfct_build_conntrack(ssh, req, size, IPCTNL_MSG_CT_GET, NLM_F_REQUEST|NLM_F_ACK, data);
@@ -601,10 +601,10 @@ int nfct_build_query(struct nfnl_subsys_handle *ssh,
 		nfnl_fill_hdr(ssh, &req->nlh, 0, *family, 0, IPCTNL_MSG_CT_DELETE, NLM_F_REQUEST|NLM_F_ACK);
 		break;
 	case NFCT_Q_DUMP:
-		nfnl_fill_hdr(ssh, &req->nlh, 0, *family, 0, IPCTNL_MSG_CT_GET, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST|NLM_F_DUMP);
+		nfnl_fill_hdr(ssh, &req->nlh, 0, *family, 0, IPCTNL_MSG_CT_GET, NLM_F_REQUEST|NLM_F_DUMP);
 		break;
 	case NFCT_Q_DUMP_RESET:
-		nfnl_fill_hdr(ssh, &req->nlh, 0, *family, 0, IPCTNL_MSG_CT_GET_CTRZERO, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST|NLM_F_DUMP);
+		nfnl_fill_hdr(ssh, &req->nlh, 0, *family, 0, IPCTNL_MSG_CT_GET_CTRZERO, NLM_F_REQUEST|NLM_F_DUMP);
 		break;
 	case NFCT_Q_CREATE_UPDATE:
 		nfct_build_conntrack(ssh, req, size, IPCTNL_MSG_CT_NEW, NLM_F_REQUEST|NLM_F_CREATE|NLM_F_ACK, data);



More information about the netfilter-cvslog mailing list