From patchwork Tue Jun 3 10:15:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken-ichirou MATSUZAWA X-Patchwork-Id: 355298 X-Patchwork-Delegate: regit@netfilter.org 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 ACC3214009F for ; Tue, 3 Jun 2014 20:15:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752050AbaFCKPe (ORCPT ); Tue, 3 Jun 2014 06:15:34 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:61249 "EHLO mail-pb0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751213AbaFCKPd (ORCPT ); Tue, 3 Jun 2014 06:15:33 -0400 Received: by mail-pb0-f45.google.com with SMTP id um1so5315836pbc.18 for ; Tue, 03 Jun 2014 03:15:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=gJVrO2+mlkzQIoVNS8oxyF+cJ0j6LnkJlTpl3OfuRNM=; b=P2sVd9teh9EM+3Nca5BYLQCM7Itj+O74c1VL9wgyNK1PwFhJQ1dCRGQy4yJKtZtVUn J0rViSbWQjfqkc2W7PG+MHt0SxUW2wiw9jUvgRiTFdkXOcHj8PIo9BD1+Mw9rWkrTlQW +S1Kth18ZLcieUIpu4yRkDjMvv23kNzQQpW/6CIY/gwkZYb0rRyFqH3MEMH+H/scNb61 kVJrk+zG0rHtreddjvVUF/2MQD9+pjfE/vIMZaNpQb97Bd1WbqCtZhfo1ccgrYdSP816 sTL0gvS3PyLHJzO5I1xDxwtZ67jqwKuGNaploF/xiS4BVnr+1dmhSJWNLRneBGYspidV kqwg== X-Received: by 10.68.181.165 with SMTP id dx5mr49616365pbc.38.1401790532583; Tue, 03 Jun 2014 03:15:32 -0700 (PDT) Received: from gmail.com (softbank220009032006.bbtec.net. [220.9.32.6]) by mx.google.com with ESMTPSA id ee5sm26122164pbc.47.2014.06.03.03.15.30 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 03 Jun 2014 03:15:31 -0700 (PDT) Date: Tue, 3 Jun 2014 19:15:26 +0900 From: Ken-ichirou MATSUZAWA To: The netfilter developer mailinglist Cc: Eric Leblond Subject: [PATCH v3 ulogd 10/12] nfct: fix icmp type and code output key size Message-ID: <20140603101526.GK24668@gmail.com> References: <20140603100130.GA24668@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20140603100130.GA24668@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by Ken-ichirou MATSUZAWA --- input/flow/ulogd_inpflow_NFCT.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c index 0b64a45..81f5bc3 100644 --- a/input/flow/ulogd_inpflow_NFCT.c +++ b/input/flow/ulogd_inpflow_NFCT.c @@ -542,10 +542,10 @@ static int propagate_ct(struct ulogd_pluginstance *main_upi, htons(nfct_get_attr_u16(ct, ATTR_ORIG_PORT_DST))); break; case IPPROTO_ICMP: - okey_set_u16(&ret[NFCT_ICMP_CODE], - nfct_get_attr_u8(ct, ATTR_ICMP_CODE)); - okey_set_u16(&ret[NFCT_ICMP_TYPE], - nfct_get_attr_u8(ct, ATTR_ICMP_TYPE)); + okey_set_u8(&ret[NFCT_ICMP_CODE], + nfct_get_attr_u8(ct, ATTR_ICMP_CODE)); + okey_set_u8(&ret[NFCT_ICMP_TYPE], + nfct_get_attr_u8(ct, ATTR_ICMP_TYPE)); break; }