From patchwork Fri Aug 11 16:39:54 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: 3322 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:ed0c:b0:d7:3b0f:3938 with SMTP id oy12csp1517671dyb; Fri, 11 Aug 2023 09:40:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEH+BHtaxFh86dqRapuU6yA12YFm6sGnXJeJRf8zf5jzLAFqDp0q/8PCUF6xwh1S9nYqJRe X-Received: by 2002:a05:6a20:4c9:b0:13e:8ce5:bedd with SMTP id 9-20020a056a2004c900b0013e8ce5beddmr2253592pzd.1.1691772032940; Fri, 11 Aug 2023 09:40:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691772032; cv=none; d=google.com; s=arc-20160816; b=a1hcPEDN9S9wDGPUwH7OqMO1W2LhozNBgbQ/xSq3on4yOcCGug2axmPUM2esvRkG3I CfEcu2uEXZdgHAGo6UIzLkuZOlz9MlbILVjbXTXlvzfjF4C7Wvj6FcfWC1gVajEpFq07 l3V5X7YiUZkgdNgr+4z+7abM/8kvNvU/3FzPy2caBkkcf1qp4ooNae2AjeKuJHChWQEs FVYEqVLsSRpA9DYdt9715UN0c/M9hbUsHdYI8Qs8wgKkOBbqQ+1zh1dhllZ6iDmGR+oI Fd81985dM7pkfdVpHsdcXUm5a3MpT5Nldc7py70aTtRbhaJX9zkz9olQHRG9ahMLEkLl NiLQ== 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:in-reply-to:auto-submitted:to :date:from:dkim-signature:dkim-signature:dkim-signature; bh=BUaTFfwgxYYpopaEJHS+KVHqnqg6o1YCnu4QOCI80Ec=; fh=M0Ap44DuyxvZl+pFH87nP8ejwD3egvCwtooXXL4zzfI=; b=wrg+A/6LoFIaqWY/lDcpVvnGgtJCWBtjpqzz/XYDAZ/Pkbxa4z9TjBzOFiKCcU7dkF Dk53aVJQpHjD1UHsk6i3GFgA6mWQfIEvm+VE2FSGwzjy0GbxtWuhEJYBMq/x17AVLYV9 4FKxHcjDzSDbwzl45iIuKSJx3to4Qkw0RUfnR4Fa5YRYHJlWcuPCnLBE1FX+7CTMsz4M cmSJZP5gwk9dq+avqBDn9L/Aa/B255AWnnN6p3q4Ontn+i1rEbrTaNUty0wFZmwzVQBw qo1/LLj1/XhNjkWt+wQPXOgmcXUhXC9wjCi9ytyYZPEdlCUUmkX8yEUpZeGADDKAYY3y 9Kmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Tcc+ZZfG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=VU9O7XFt; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=MYhgMrcr; 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 z14-20020aa7888e000000b0068261ac6957si3689989pfe.112.2023.08.11.09.40.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2023 09:40:32 -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=Tcc+ZZfG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=VU9O7XFt; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=MYhgMrcr; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1qUVBO-0004ZG-59; Fri, 11 Aug 2023 16:40:14 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qUVBK-0004Yz-69 for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 16:40:12 +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:In-Reply-To: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:List-Help:List-Subscribe :List-Post:List-Owner:List-Archive; bh=MC9AbMbI6ouArAZjsYS9V8AvYSxHSEXx9EOxTSgbEO0=; b=Tcc+ZZfGH4oU9HHtk9ekxoLwSt F5cJAketHJ2EArs4J5RnR92V0EtOz7vHD30Ln28kRpIuStEsMfLYs4oP4X8eAkUukiimorCFm7ogE JsBr+EjoJHTjvh4lrbUdPRFlQlhhwYHaAyHeI3424q+RIFt3VzTP6dXwL/HZRivNIwu4=; 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:In-Reply-To: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:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=MC9AbMbI6ouArAZjsYS9V8AvYSxHSEXx9EOxTSgbEO0=; b=V U9O7XFtHvA+CyZrg5B4JC+oj4YFzLxsjLhdt/EvywkWW9Ag/p7NskB0w50sPAEeNv2Wnnc34H16Mt FBfote4IdVCewx6bgpWdEBgTF6tIGkzx8dTXXWiPkre64eyHXQpD0SMt1QFRWYF0McvFMBDRszwPI W7I731/Z/iSKTYdY=; Received: from mail-wm1-f42.google.com ([209.85.128.42]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1qUVBD-0006lk-4c for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 16:40:09 +0000 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3fe1fc8768aso20462515e9.1 for ; Fri, 11 Aug 2023 09:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1691771996; x=1692376796; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=MC9AbMbI6ouArAZjsYS9V8AvYSxHSEXx9EOxTSgbEO0=; b=MYhgMrcrKtalj57Bz3lAv++mh+PKzduyk/RP6/kHiTj6httbYNshOCYCRZJ9RtbDpU qmDomMxrLIABkd7k1p7+sXYvHIrhti0DzkxProvmhKqMGFysX+kcYQbWSYS8jS+7nkZb O4Co4o2r1pwGAE9yhvCbYWb4l0P/hWDky36fAc6Jy81aP6zCWGcrTrNdFKVqGjxFlaRi k5eXxJUxhUnD2QldptrES/To3KxKr8/kJgxiUqdybXHAxL0pOa2wDU4ss8d2WAgtOVLl CQ8e5Zh9d4NZsOdb0nXctUJMupCAwRkPq1MozMfH9fye7hXr6mPsw/VSR+kK5HSocVET 0kLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691771996; x=1692376796; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:in-reply-to: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=MC9AbMbI6ouArAZjsYS9V8AvYSxHSEXx9EOxTSgbEO0=; b=cK6ZkdkP4TOuVvjmatq3Y0DaNbsN6y8vygHiPnmc0Qmb1tr1i0hhwrTN7xq50gGgy/ ZuNDFzbSj/3nzUWZkZKriiKpu3JmpBf9jGkpGYJg08ElF41dheQJA/2zXUafGLgh7mEV 4y+c85+ZexObN7e2oc4HMWse4Yn2MpKYTafNrQlOLPK4aE5dsR2fhKdNwe269cKhdYGr EwpOG8ZDo0GJhIvOGoxttwGunelyHl2b+wXi3Uf2HoTAnzSNNqH/ndk61YmSvegkS9X2 0BWpBRbi1KYS9hacy6tlIt1UrTsWhs21H97OEZmiHo2LD+nFjLM6PzuEyJolqhJMaCsh 2KQA== X-Gm-Message-State: AOJu0YzB75Jv6ocfRHdFU+MTbqw1mLxTvdK4Qh7BtzuS7FajYze8DENU MV049+em9YLvJnpLduh1oMBecIsp24pbG+ydMJQ= X-Received: by 2002:a7b:cc85:0:b0:3fe:f99:1ba with SMTP id p5-20020a7bcc85000000b003fe0f9901bamr2168661wma.2.1691771996287; Fri, 11 Aug 2023 09:39:56 -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 22-20020a05600c231600b003fc015ae1e1sm5843772wmo.3.2023.08.11.09.39.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 09:39:55 -0700 (PDT) From: "cron2 (Code Review)" X-Google-Original-From: "cron2 (Code Review)" X-Gerrit-PatchSet: 2 Date: Fri, 11 Aug 2023 16:39:54 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset X-Gerrit-Change-Id: I78f92f363fe203af5661c6958b2417ea30f7055c X-Gerrit-Change-Number: 319 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 8067cc8d1b384d3eb0fc9000992710b02951b266 In-Reply-To: References: Message-ID: <91f6fe4842765f3348d4bf97814b77f5e68fd36b-EmailReplacePatchSet-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.0 X-Spam-Score: -0.2 (/) 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: cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/319?usp=email ) Change subject: route: Fix overriding return value of add_route3 Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.42 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.42 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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_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: 1qUVBD-0006lk-4c 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: openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel 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?1773951551026865470?= cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( 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 Message-Id: <60951251cdb2f39b20cfc86130c2dc0570ba0363-HTML@gerrit.openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26900.html Signed-off-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/2 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) {