Patchwork tests: conntrackd: fix compile errors and warnings

login
register
mail settings
Submitter Ansis Atteka
Date Aug. 24, 2012, 1:27 a.m.
Message ID <1345771642-4121-1-git-send-email-aatteka@nicira.com>
Download mbox | patch
Permalink /patch/179757/
State Accepted
Headers show

Comments

Ansis Atteka - Aug. 24, 2012, 1:27 a.m.
This patch fixes few compile warnings and errors.

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
---
 tests/conntrackd/cthelper/expect.c |    3 ++-
 tests/conntrackd/cthelper/main.c   |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
Pablo Neira - Aug. 24, 2012, 9:58 a.m.
On Thu, Aug 23, 2012 at 06:27:22PM -0700, Ansis Atteka wrote:
> This patch fixes few compile warnings and errors.

Applied, thanks Ansis.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/tests/conntrackd/cthelper/expect.c b/tests/conntrackd/cthelper/expect.c
index c667293..d1d1d28 100644
--- a/tests/conntrackd/cthelper/expect.c
+++ b/tests/conntrackd/cthelper/expect.c
@@ -25,7 +25,8 @@  cthelper_expect_init(struct nf_expect *exp, struct nf_conntrack *master,
 		  uint32_t class,
 		  union nfct_attr_grp_addr *saddr,
 		  union nfct_attr_grp_addr *daddr,
-		  uint8_t l4proto, uint16_t *sport, uint16_t *dport)
+		  uint8_t l4proto, uint16_t *sport, uint16_t *dport,
+		  uint32_t flags)
 {
 	struct nf_conntrack *expected, *mask;
 
diff --git a/tests/conntrackd/cthelper/main.c b/tests/conntrackd/cthelper/main.c
index f229c5d..7021f00 100755
--- a/tests/conntrackd/cthelper/main.c
+++ b/tests/conntrackd/cthelper/main.c
@@ -119,10 +119,10 @@  cthelper_process_packet(const uint8_t *pkt, uint32_t pktlen,
 		ct->myct->ct = tmp;
 
 		if (pktb_mangled(pktb)) {
-			int i;
+			uint32_t i;
 			uint8_t *data = pktb_network_header(pktb);
 
-			printf("\e[1;31mmangled content: ", pktb_len(pktb));
+			printf("\e[1;31mmangled content: ");
 
 			for (i=0; i < pktb_len(pktb); i++)
 				printf("%c", data[i]);