From patchwork Fri Aug 24 01:27:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ansis Atteka X-Patchwork-Id: 179757 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0EDD12C00A5 for ; Fri, 24 Aug 2012 11:28:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932330Ab2HXB2j (ORCPT ); Thu, 23 Aug 2012 21:28:39 -0400 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:46118 "HELO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S932083Ab2HXB2h (ORCPT ); Thu, 23 Aug 2012 21:28:37 -0400 Received: from mail-pb0-f53.google.com ([209.85.160.53]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKUDbYuISDhmIWVBawJtwHdgaFin956LE2@postini.com; Thu, 23 Aug 2012 18:28:37 PDT Received: by pbbro2 with SMTP id ro2so3477752pbb.26 for ; Thu, 23 Aug 2012 18:28:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=LPfgUAgWqRazEyXE6S4JeEdja1Op0QqxmPv6rngmMXY=; b=e2OjjloAo3Rc7KrmHG2wnKuuMQAH7vdEMW8/6QezT5nnWNCKEHALWAM5tGkO1L6BHx ToJmPD0OF/sk2tqs4ludcSJdpQOYfheuRynOqA0dl9MOKx+qAixeo6kZ61/Nj65hxD5h BfsFFG00n8QJIHC54s6YjQpkF7p3UxZq1PzJrzuwXMsg6AiTcyFP8ucg0w0fDrYS02+k TVDP4Ag4Aj/StgBta0ZXV7Il2IXS4pdBw1sbc3TgPIThrItDhPzPLa66wYhGdJ4ixMmK oH5D7naWTh41zkuIYmC+bFtQuV0Uzmds3irRVzjYpcV4c+3O6tPJaouGMCn8DeGtkyZr L1Wg== Received: by 10.66.77.229 with SMTP id v5mr7082757paw.60.1345771698822; Thu, 23 Aug 2012 18:28:18 -0700 (PDT) Received: from aatteka-dell.nicira.com (107-0-204-137-ip-static.hfc.comcastbusiness.net. [107.0.204.137]) by mx.google.com with ESMTPS id vh7sm7140453pbc.22.2012.08.23.18.28.16 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 18:28:17 -0700 (PDT) From: Ansis Atteka To: netfilter-devel@vger.kernel.org Cc: Ansis Atteka Subject: [PATCH] tests: conntrackd: fix compile errors and warnings Date: Thu, 23 Aug 2012 18:27:22 -0700 Message-Id: <1345771642-4121-1-git-send-email-aatteka@nicira.com> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQl+upTHNV1uhfllFatkYW5zGIZ7OrPtfZAhiP6VK+D4yuCAdTdLmGhqivxeowYRSlPDefMF Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch fixes few compile warnings and errors. Signed-off-by: Ansis Atteka --- tests/conntrackd/cthelper/expect.c | 3 ++- tests/conntrackd/cthelper/main.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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]);