[libnetfilter_conntrack] API: fix endianess issue

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Tue Jul 29 13:52:10 CEST 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=8bb0e3049b8a7f67d60ba2deed18584acce4eca6
commit 8bb0e3049b8a7f67d60ba2deed18584acce4eca6
Author:     Albert Veli <albert.veli at gmail.com>
AuthorDate: Tue Jul 29 13:51:54 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue Jul 29 13:51:54 2008 +0200

    API: fix endianess issue
    
    In nfct_build_query() the *data argument is converted into a u_int8_t*.
    This works for little-endian but not for big-endian.
    
    Signed-off-by: Albert Veli <albert.veli at gmail.com>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  8bb0e3049b8a7f67d60ba2deed18584acce4eca6 (commit)
      from  e5cb42249f7fd5b730667150c9c19f10d2f215fd (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 8bb0e3049b8a7f67d60ba2deed18584acce4eca6
Author: Albert Veli <albert.veli at gmail.com>
Date:   Tue Jul 29 13:51:54 2008 +0200

    API: fix endianess issue
    
    In nfct_build_query() the *data argument is converted into a u_int8_t*.
    This works for little-endian but not for big-endian.
    
    Signed-off-by: Albert Veli <albert.veli at gmail.com>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

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

 src/conntrack/api.c    |    4 ++--
 utils/conntrack_dump.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
In nfct_build_query() the *data argument is converted into a u_int8_t*.
This works for little-endian but not for big-endian.

Signed-off-by: Albert Veli <albert.veli at gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/src/conntrack/api.c b/src/conntrack/api.c
index ff8b11f..8015440 100644
--- a/src/conntrack/api.c
+++ b/src/conntrack/api.c
@@ -443,7 +443,7 @@ int nfct_build_conntrack(struct nfnl_subsys_handle *ssh,
  * 	NFCT_Q_DUMP: dump the conntrack table
  * 	NFCT_Q_DUMP_RESET: dump the conntrack table and reset counters
  *
- * Pass a valid pointer to the protocol family (u_int8_t)
+ * Pass a valid pointer to the protocol family (u_int32_t)
  *
  * On success, 0 is returned. On error, -1 is returned and errno is set
  * appropiately.
@@ -455,7 +455,7 @@ int nfct_build_query(struct nfnl_subsys_handle *ssh,
 		     unsigned int size)
 {
 	struct nfnlhdr *req = buffer;
-	const u_int8_t *family = data;
+	const u_int32_t *family = data;
 
 	assert(ssh != NULL);
 	assert(data != NULL);
diff --git a/utils/conntrack_dump.c b/utils/conntrack_dump.c
index b30bf38..d8ae4f1 100644
--- a/utils/conntrack_dump.c
+++ b/utils/conntrack_dump.c
@@ -19,7 +19,7 @@ static int cb(enum nf_conntrack_msg_type type,
 int main()
 {
 	int ret;
-	u_int8_t family = AF_INET;
+	u_int32_t family = AF_INET;
 	struct nfct_handle *h;
 	char buf[1024];
 



More information about the netfilter-cvslog mailing list