From patchwork Mon Jan 25 11:15:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= X-Patchwork-Id: 572689 X-Patchwork-Delegate: pablo@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 F16AC14076B for ; Mon, 25 Jan 2016 22:16:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756662AbcAYLQK (ORCPT ); Mon, 25 Jan 2016 06:16:10 -0500 Received: from mail.asbjorn.biz ([185.38.24.25]:45601 "EHLO mail.asbjorn.biz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756547AbcAYLQH (ORCPT ); Mon, 25 Jan 2016 06:16:07 -0500 Received: from x201s.roaming.asbjorn.biz (mon1.fiberby.net [193.104.135.42]) by mail.asbjorn.biz (Postfix) with ESMTPSA id 5D9AF1C001AE; Mon, 25 Jan 2016 11:16:06 +0000 (UTC) Received: by x201s.roaming.asbjorn.biz (Postfix, from userid 1000) id 1CE93201454; Mon, 25 Jan 2016 11:15:50 +0000 (UTC) From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= Subject: [PATCH conntrack 3/5] conntrack: cleanup: use switch statements for family checks Date: Mon, 25 Jan 2016 11:15:46 +0000 Message-Id: <1453720548-14413-3-git-send-email-ast@fiberby.dk> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1453720548-14413-1-git-send-email-ast@fiberby.dk> References: <1453720548-14413-1-git-send-email-ast@fiberby.dk> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Asbjørn Sloth Tønnesen --- src/conntrack.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/conntrack.c b/src/conntrack.c index cb9545b..3fc9c24 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -1017,10 +1017,16 @@ parse_addr(const char *cp, union ct_address *address) struct addr_parse parse; int ret; - if ((ret = parse_inetaddr(cp, &parse)) == AF_INET) + ret = parse_inetaddr(cp, &parse); + + switch(ret) { + case AF_INET: address->v4 = parse.addr.s_addr; - else if (ret == AF_INET6) + break; + case AF_INET6: memcpy(address->v6, &parse.addr6, sizeof(parse.addr6)); + break; + } return ret; } @@ -1966,14 +1972,17 @@ nfct_set_addr_from_opt(int opt, struct nf_conntrack *ct, union ct_address *ad, "Invalid IP address `%s'", optarg); } set_family(family, l3protonum); - if (l3protonum == AF_INET) { + switch(l3protonum) { + case AF_INET: nfct_set_attr_u32(ct, - opt2family_attr[opt][0], - ad->v4); - } else if (l3protonum == AF_INET6) { + opt2family_attr[opt][0], + ad->v4); + break; + case AF_INET6: nfct_set_attr(ct, - opt2family_attr[opt][1], - &ad->v6); + opt2family_attr[opt][1], + &ad->v6); + break; } nfct_set_attr_u8(ct, opt2attr[opt], l3protonum); }