From nobody Sat Dec 04 14:34:40 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CDD8718B7DC7; Sat, 4 Dec 2021 14:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J5sf93Wwgz3Dn6; Sat, 4 Dec 2021 14:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 059A525FA9; Sat, 4 Dec 2021 14:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B4EYeu0078023; Sat, 4 Dec 2021 14:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B4EYeEJ078022; Sat, 4 Dec 2021 14:34:40 GMT (envelope-from git) Date: Sat, 4 Dec 2021 14:34:40 GMT Message-Id: <202112041434.1B4EYeEJ078022@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 130df64793d7 - main - ipfilter: Avoid more null if-then-else blocks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 130df64793d7d3c680c0f7177a707867a8a19665 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638628482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HiAr5P9Y9nzRsYlvRa5G560Zt5pS41f23YNh6/BHevA=; b=d9Ci6O+pfAmlpk3KqDwL4nyksKvrdsbrdA6MpgLW1ZAc2cO3+torRMQaNrM2JHKBehsYGj DTHuY9ZwK9s96XArhrPP4xwDyXfd8/KuCzugPTspfIY/R/U0hAXPfCGJ5r26QnKbYDXMo6 rMhlGwah9Y6MgMnuDM48i2DbcIhhppjOt5g235Ej0kJ0u0kregvV83QiMso1BGoGJFWrEx 62nLoLE9t+GjdftRAp6yAw6rDHiEynKfo9OQzLDX1pleuWynK/qQTBo5yCCXRkCuTYwV16 70uoRCu7HMvAZDY9W+CSffLsP+c3F++XLgbLxzuBOgcg7ryQNsKUtGIs7xcYPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638628482; a=rsa-sha256; cv=none; b=rVnjz59UHbdDGRfG3OVYm3jryW8GP0qs/0Y+DORgUI+smm7z04ljjP82SwALi1hkF/m7gq dDXpOg5rn8dYz5Exu/8so6UtOIKoOoRHmzU3Mm16zwAbVQ67DGGK5y2o24hcuHrUjf8a9Q biKnd3ae0yoYJdjC+jZzy6ko1qAcsP+XpoGLtW1lcdZOgPnL21lR0AFqh+QK2oSypWRIcb XMlbuJaJmy/l+CaPkBffyxQDraCaenMPaFck31ikD8QCFDAUvvXABCyxYkEyvNzCk93J0J Sd2mijtaIi4eaNoMti104fMqBwJQj++xwBbIjLA+WzQwpgqnTcBgzSM3waqsVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=130df64793d7d3c680c0f7177a707867a8a19665 commit 130df64793d7d3c680c0f7177a707867a8a19665 Author: Cy Schubert AuthorDate: 2021-10-20 03:11:40 +0000 Commit: Cy Schubert CommitDate: 2021-12-04 14:33:13 +0000 ipfilter: Avoid more null if-then-else blocks As in 73db3b64f167, when WITHOUT_INET6 is selected, null if-then-else blocks are generated because #if statements are incorrectly placed. Moving the #if statements reduces unnecessary runtime comparisons or compiler optimizations. MFC after: 3 days --- sys/contrib/ipfilter/netinet/ip_proxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c index b90ad09d8c00..af5ed81a5765 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.c +++ b/sys/contrib/ipfilter/netinet/ip_proxy.c @@ -1367,8 +1367,8 @@ ipf_proxy_rule_rev(nat) if (ipn->in_v[0] == 4) { ipn->in_snip = ntohl(nat->nat_odstaddr); ipn->in_dnip = ntohl(nat->nat_osrcaddr); - } else { #ifdef USE_INET6 + } else { ipn->in_snip6 = nat->nat_odst6; ipn->in_dnip6 = nat->nat_osrc6; #endif @@ -1443,8 +1443,8 @@ ipf_proxy_rule_fwd(nat) if (ipn->in_v[0] == 4) { ipn->in_snip = ntohl(nat->nat_nsrcaddr); ipn->in_dnip = ntohl(nat->nat_ndstaddr); - } else { #ifdef USE_INET6 + } else { ipn->in_snip6 = nat->nat_nsrc6; ipn->in_dnip6 = nat->nat_ndst6; #endif