From patchwork Fri Jul 28 13:03:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3304 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7301:3787:b0:d7:3b0f:3938 with SMTP id jw7csp565237dyb; Fri, 28 Jul 2023 06:04:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlHCesqoY90ZwvxTjd414HiWR3+JtKc7OZtFgCPnbFbpp+mgMwtJX51tBdtQiMtFB/Piqf80 X-Received: by 2002:a17:902:d507:b0:1b6:c229:c350 with SMTP id b7-20020a170902d50700b001b6c229c350mr2078553plg.18.1690549450816; Fri, 28 Jul 2023 06:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690549450; cv=none; d=google.com; s=arc-20160816; b=bo/j6naiB17EJchgEuwunLBJOIF0uGBOLDeraP4KS4IZYYC1j58y6+3u1M+LGMx/s6 jCdA6KQiWsFtrLcYfJaniO6CaJcY1iP0ZFGcjzHtJVTLiP9b/Ld3yge6iH0JQ3wQMylq nTMWAExmfJbl88S10xgqeRuwAjrfpZB6qIiVxjuW7gX4Ntu0apLmlCoeeNrqlTSeCpIR +TkCnb1fYGPvNdDnVVtaoL0KROviAKCTb2t+QW0UmO/u4lvS/3suo9Z6VoSWL74mYspI AAOSSJEmrfS3LNgxQ8/4aUiMzHEChYOKKLGP6bVDCYehnCZUP5M5nYePECJtwUjSldSp OWmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to: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:cc:date:from:dkim-signature :dkim-signature:dkim-signature; bh=5iKK+v7kO0+GJL8U+V9SjuTKJfeP1BHaYGMQ/pf2nH0=; fh=ejqQk4evxSbcB4TOY987ChV164zUZaeCjiIZ6JGqg/c=; b=sMLMzQ9ybcUA8ohjokAFcBic0E5gjGQ9ClNc5Xjbjd2CXqX+/i38uA9Q8JX0E2K/6q MbJF0DefPZtcxfTV1ThRZbGyzaXI55qe1GMcLCMcq1Jbv13j9BDj0OiwZHclyKgGS7Ld KsrTGr/8OQBGbQhMXmU/+N/w7boGGTToIcLVyQ1eprbyVFapnlevf/LyNTLtlcVH1zzE JVQW0f5G1WBZvRutbfy/IFrHGGRa7lGksOWk74qpD3xy0NF8mQWu70P91en3NpPqzIo6 C2EUnqObxuvm9npbyh9tVpmLQAJo/nh3sqAnA6CBBtm6xaPwx4qMf6ewoY2tk77a/9up ohbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=k4ER4vbW; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Sn0aTHr5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=OYq5UXOE; 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 q5-20020a170902dac500b001b8ae5d825bsi3120060plx.612.2023.07.28.06.04.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jul 2023 06:04:10 -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=k4ER4vbW; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Sn0aTHr5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=OYq5UXOE; 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-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qPN8E-0004nu-0u; Fri, 28 Jul 2023 13:03:47 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qPN8C-0004nb-P1 for openvpn-devel@lists.sourceforge.net; Fri, 28 Jul 2023 13:03:45 +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:Date:From :Sender:To: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=CsUTpR0vUuXqQujvPhhZMtheXlSiLN2WQ+tXzOgThJ8=; b=k4ER4vbWeqH2oYEN47VJCRyuiC xC0SomK7Zy9PNOfrmMMRyAmUV0/2Wx69fxGdBJIbb1Wid5Zv8rTdAt0Z0MhOYdWN4p4R4aNhbhbI6 Va6WnelSahj1CN+NdTeLQpKtYyU5I/R+7BoHJL6IPcDGERINiHu+ROFPMLaYcyzV9JJY=; 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:Date:From:Sender:To: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=CsUTpR0vUuXqQujvPhhZMtheXlSiLN2WQ+tXzOgThJ8=; b=S n0aTHr5Pt5BsGKgibzbDTmZBNZL4eCEFKiwua4ORYN+EkE5Oeon3sYrmEyRIWpRjgQds1/syHpi8X iVSel+TAKL9gBtQLnUtClGJLKrP7HuY2nhU1F1beSoTLTkHcmjd0BZ1SMk5CR9oRRGtmsEGNrvdnU /BnsjhT2fjHzt9ZY=; Received: from mail-wr1-f50.google.com ([209.85.221.50]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qPN86-005WCr-09 for openvpn-devel@lists.sourceforge.net; Fri, 28 Jul 2023 13:03:45 +0000 Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-31783d02093so1593315f8f.0 for ; Fri, 28 Jul 2023 06:03:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1690549411; x=1691154211; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from:from:to:cc :subject:date:message-id:reply-to; bh=CsUTpR0vUuXqQujvPhhZMtheXlSiLN2WQ+tXzOgThJ8=; b=OYq5UXOEA5VR3ar+ows2xlZAP/IF5Dzv6wGtXQHR1NLW7mc8nWr33Fpy971jZJf763 xwfXQ+NM+S1BD9UTL/asVpzp922wNZxZJeJN7wghnqksCfRWujnkba7rOng8rQKaxOPw /bjCZU+vr/oKaI8xr5z5xQC3I10k74uMbpRZpTcOhUlwoFfD0gaqdok+NH4u/TH986ml y5Q7Kb4rl8wFi7yCwYxu/rvNDKZMMPcSZasDvK/NMhmDcjxL0x9uhgS/0rk0V9CkLFhH SqHwKidKi+ujXrL3TWkAZsM2u8XpYayIVlazeI+z6zmIR3jlJtvnxaCLP0aCS1U5+A+K Q1Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690549411; x=1691154211; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CsUTpR0vUuXqQujvPhhZMtheXlSiLN2WQ+tXzOgThJ8=; b=j/DVailPRDGKPSWGNs8EUI653p/LG5a1kJZlevAJQOD0HFt5v99SzG23piJsMVvGdk +J1zVNMB/MB/7cbIFL0OhDwtxrXgOKJv2STTa8IeuHwRXssEKnepmdRDRYWSmp4Euwr5 3rACXAMYMs16K5uEV4SXtD9Smj28UORYAyjf8dTEgfd/Q18/SAjHS7Dtz2fVFhp8gxcw 0q1ws+0rzB/OdZAUgGpZzkNqkmzYXO/CXqS5QV+gV6NIf6FwqMafn0GXGPMKGoimgFQq buHqpeoVPyc5l4rAzYaiP0ncYlsWDgYUjn09+e6mw4+mj9GhEukb61lIQMvK1GTf47WA OyqQ== X-Gm-Message-State: ABy/qLbPgWnqiZQn+0diotkgGAElSwsAWuTLN574FhUc84T2SzFQ2qzK UDMLjoBXtawF+3IpoUki/xCwzsbM9zyeH9dRpiI= X-Received: by 2002:a5d:4d90:0:b0:317:5ece:e169 with SMTP id b16-20020a5d4d90000000b003175ecee169mr1960468wru.68.1690549411236; Fri, 28 Jul 2023 06:03:31 -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 p15-20020a056000018f00b0030ae53550f5sm4773745wrx.51.2023.07.28.06.03.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jul 2023 06:03:30 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Fri, 28 Jul 2023 13:03:30 +0000 Cc: openvpn-devel Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I78f92f363fe203af5661c6958b2417ea30f7055c X-Gerrit-Change-Number: 319 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 17d713f7605c24f09e2b2773b01f539b72006bc1 References: Message-ID: <60951251cdb2f39b20cfc86130c2dc0570ba0363-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: 1.0 (+) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/319?usp=email ) Change subject: route: Fix overriding return value of add_route3 Content analysis details: (1.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.50 listed in wl.mailspike.net] 1.2 MISSING_HEADERS Missing To: header -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.50 listed in list.dnswl.org] 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_EF Message has a valid DKIM or DK signature from envelope-from domain -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_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: 1qPN86-005WCr-09 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: route: Fix overriding return value of add_route3 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, openvpn-devel@lists.sourceforge.net Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1772669581274046148?= X-GMAIL-MSGID: =?utf-8?q?1772669581274046148?= flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/319?usp=email ) Change subject: route: Fix overriding return value of add_route3 ...................................................................... route: Fix overriding return value of add_route3 The return value of add_bypass_routes overwrites the return value of add_route3 instead of combining them. Coverity: CID 1539180 (#1 of 1): Unused value (UNUSED_VALUE) Change-Id: I78f92f363fe203af5661c6958b2417ea30f7055c Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- M src/openvpn/route.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/19/319/1 diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 90e981e..9212186 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1062,7 +1062,7 @@ /* route DHCP/DNS server traffic through original default gateway */ ret = add_bypass_routes(&rl->spec.bypass, rl->rgi.gateway.addr, tt, flags, - &rl->rgi, es, ctx); + &rl->rgi, es, ctx) && ret; if (rl->flags & RG_REROUTE_GW) {