From patchwork Wed Apr 10 10:29:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3684 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:5a0a:b0:569:ad12:4fde with SMTP id v10csp355469may; Wed, 10 Apr 2024 03:29:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwHMK5ELzJbgmPpQrNLP3xM/FQTOWlwKr2IVgr0zuXcSaP355FkD1/8dkG/fAvWeMpI05D+hsVd1S67/NrNycloknTiJA= X-Google-Smtp-Source: AGHT+IHzYu7FWwxv8nc2ibp0deA+gCpNI3r69o9px45WLvvilhJOXEVPUWoGAlhz8P1adycbvFVb X-Received: by 2002:a05:6a20:3c89:b0:1a7:9b9a:757b with SMTP id b9-20020a056a203c8900b001a79b9a757bmr2633902pzj.1.1712744985523; Wed, 10 Apr 2024 03:29:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712744985; cv=none; d=google.com; s=arc-20160816; b=Sq7kXEC8ug5n9ZV/pm+/onZFR43dEfhl/K+774BKLTotAPnAWH6sD4Zucp13UwOTM7 G7TcBZn4fef7/JZdR7UrF1ktoK1yIvJA0Mke9hf+y16UniwRHP1/zCXCQj9TN4gLK9bC ygyGzxhuuSbvxK9IqN1kiTwJ9Fp51Y+3f52kLcHv863f4+MNa9PnfZP668lBgPXl4ukx VzBlUm1x7yaC6NOX/RzfvN7BbdpM4FKdM0j6wNx4WHKsA64BYYqXKpmNcFXK3R3/0yVB U/xeyKJ404NN1/8xZ0yR5o3u6Hz+AKXixjVhkLqnL+FNHnnx5ckZgeWur9FvQB7BIDwW XU/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=5sGxSwR9oNGqJgMRMLiGFDUohG2OvzwwsxuECoaEClM=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=rUk8PbiUay+BSJQcLT5WGR5VaY/oH5kIaN8f20sHq1/pegyboNVGosPnnd+l1PNQn1 h5lx2ND+0m39iFzZjfLaEb60fHel+6hrOQaj45QpgfSRETkNapvdgooIJ/pHJZf1Poth iPh+c/5ZGG3t+K0WWApEVfUcaN3wZKuoyNpEwNIPECC0YtQzUoyXiejRMjfC7AedWJPv WygEISg0oWaGcU1Vf7mRx7TGCk/YFVEhGxbnmYi9G3DEpC+amhzwv/FLT13kDTjaocUZ KRvFw7NpLjFFvEuNG/yMKCZlvQ0P6CjiTI0y2IZmZNt6f0wSVUFBUycQ7uz9hazB2Eey LhJw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Ljjcevxf; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OvDk3mW5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Em8auTth; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id h18-20020a170902f71200b001e504940a14si770853plo.423.2024.04.10.03.29.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2024 03:29:45 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Ljjcevxf; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OvDk3mW5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=Em8auTth; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1ruVCc-0006EB-I0; Wed, 10 Apr 2024 10:29:15 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1ruVCa-0006Ds-ET for openvpn-devel@lists.sourceforge.net; Wed, 10 Apr 2024 10:29:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LYf+PL8hmgGMZARlBqgu4aTiMw02vINWp/FWzvRoVj4=; b=LjjcevxfXy6Y8fdmDMv0Kz4u8u TPbr731l05SDfZf/Fiom3VLhMOya/fc5lRbhz7TZO7mxHAYd04Pjsr6DNnPYDnz/k9F3i652nE8Dg L/Lq13G1ajug6g66W+YxiGXuELSv2m3dI1zYiS77t+A+nRgaAvjawihnQwG8mfJvoxAM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=LYf+PL8hmgGMZARlBqgu4aTiMw02vINWp/FWzvRoVj4=; b=O vDk3mW56TWAV6I/f4EtodcvqiDXEzMbYpbfJq7oMx+f5P5xw6gy+DgAK2s2/vNQks/kJ1RgfA4NRE Y1iY3MQ11rZI8u//o8TSrc6Afh/gWPoE1ArTr5/ErWrV1Y8aMbjm8CWX43FcZizt1fEZeQnScGWA+ gRo+802lC5nVM1FM=; Received: from mail-lj1-f176.google.com ([209.85.208.176]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1ruVCZ-0006Wp-To for openvpn-devel@lists.sourceforge.net; Wed, 10 Apr 2024 10:29:13 +0000 Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2d4a8bddc21so91102591fa.0 for ; Wed, 10 Apr 2024 03:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1712744945; x=1713349745; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=LYf+PL8hmgGMZARlBqgu4aTiMw02vINWp/FWzvRoVj4=; b=Em8auTthye8Z/0b5OZxw2ftMIY04OUR/dHSYtH+lIOta+At3l/ZFX2DLjRUCrF2xql 8XLgmbnX4RB8sSXz0Ct69/ywXOm43730uffnAOv1Mgxj/ncOVbDnEA9+K1reKCeN9u+M LgAweVHHxePL/Y8LfI0RWXDHcVpkXAO+5YcEeE6DdQtKrJUtIye4rt8eei+Ojiugpywf iQFrndEkfQ2QNTvGtlOXWV5dmyaBRxxpFOVOC9WD/QskPENx0ZnJMROLHyOZJ1QPNanZ /cGTj6ze/dI1GukgW1rzBJmRRcPiZzswXLn9xRIch/kOK0BgHSwQPmtxx6pzM1r4vDBi 01lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712744945; x=1713349745; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LYf+PL8hmgGMZARlBqgu4aTiMw02vINWp/FWzvRoVj4=; b=jaAKruSwSs/Dgpg1r9+eQZPJqD0hDyJTOQdmElIB+TjZnA1F3J6bzCqr3TY/MZrLJg 6sxt7D1B/cB7LJqusEx7Y1gpRVGl4vFvhe+hE2ZxmK/W/JlpWMdD4RoxJGgZTe2ho7K/ zl0pnEs7GtWKq+U8LaJDPzd1mrzEUZGNGfKJ1yfWB7QynBYXc/FvmX+DNfO/TDzuXSpp BmWB4WKiS2slNnrwp0I1iCrLsYb3seZGd1eLO8cXyKIu27PhTkjMKkmkPs8hyV1Oc0Rv THYIUpPQSP04SwiuL1z4NIg6gtZ4UFCz+RI2M8yFYEHzQOPns+QGUQuLU2NBAhRwLZ0w Yzug== X-Gm-Message-State: AOJu0YxLT3Gwdx14dga7qk+J3S+8AjumNAtlKEJbiBD7nqXdLAgApsCp IozOeu6Setb11MUPIpJj2uR+iGS/2NitWaHPzyPg/j2H5OB2ZsGxgLmE20TFOA4A0krGKqL4KGt 3 X-Received: by 2002:a05:651c:1248:b0:2d6:fb69:114e with SMTP id h8-20020a05651c124800b002d6fb69114emr1425356ljh.21.1712744945131; Wed, 10 Apr 2024 03:29:05 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id l23-20020a05600c1d1700b0041663c75ef1sm1837260wms.32.2024.04.10.03.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 03:29:04 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Wed, 10 Apr 2024 10:29:03 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: Ie61fa6a78875ecbaa9d3d8e7a50603d77c9ce09e X-Gerrit-Change-Number: 553 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: e075dfa2c177dac75afa36e46d34109b899b2e52 References: Message-ID: <87ab2e32786be872f9341611ac3445ab0796a358-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.176 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1ruVCZ-0006Wp-To Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Fix "binary or" vs "boolean or" related to server_bridge_proxy_dhcp X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: frank@lichtenheld.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1795943285735792573?= X-GMAIL-MSGID: =?utf-8?q?1795943285735792573?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/553?usp=email to review the following change. Change subject: Fix "binary or" vs "boolean or" related to server_bridge_proxy_dhcp ...................................................................... Fix "binary or" vs "boolean or" related to server_bridge_proxy_dhcp Both values are boolean so there is no reason to use "|" and it just confuses the reader whether there is something more going on here. Change-Id: Ie61fa6a78875ecbaa9d3d8e7a50603d77c9ce09e Signed-off-by: Frank Lichtenheld --- M src/openvpn/helper.c M src/openvpn/init.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/53/553/1 diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 1bab84c..24dee97 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -427,7 +427,7 @@ * if !nogw: * push "route-gateway dhcp" */ - else if (o->server_bridge_defined | o->server_bridge_proxy_dhcp) + else if (o->server_bridge_defined || o->server_bridge_proxy_dhcp) { if (o->client) { diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 02205e7..e67f10e 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3565,7 +3565,7 @@ msg(M_WARN, "WARNING: using --pull/--client and --ifconfig together is probably not what you want"); } - if (o->server_bridge_defined | o->server_bridge_proxy_dhcp) + if (o->server_bridge_defined || o->server_bridge_proxy_dhcp) { msg(M_WARN, "NOTE: when bridging your LAN adapter with the TAP adapter, note that the new bridge adapter will often take on its own IP address that is different from what the LAN adapter was previously set to"); }