From patchwork Fri Aug 11 16:39:56 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: 3323 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:ed0c:b0:d7:3b0f:3938 with SMTP id oy12csp1517929dyb; Fri, 11 Aug 2023 09:40:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFOKXZtYq371KFnpeaWSQMRnChK2DYWYxXf0nC59dZy9lc8kmKQxYMcRmWxFovxkYCRQEn1 X-Received: by 2002:a05:6870:6394:b0:1c1:e6da:f88d with SMTP id t20-20020a056870639400b001c1e6daf88dmr2283056oap.56.1691772058154; Fri, 11 Aug 2023 09:40:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691772058; cv=none; d=google.com; s=arc-20160816; b=PdtqaLDwyT2cPwrXPYsbvjFdbESXdS9dWr2HB03uHAbo5kbAIDTL32m0815Eo0Bxdr sgWwIjcVbwT6lLAUMd/Rrz1RajbUUFKkFkQpxMglUVq6+iMD3mGjwbuaL45len++tNhg 9nHb49HQM/YeHQPkYt2N+xx0jqr1GKp6oaPWpHrVGXdiS5EUEbJm54JCLTOmWKraRA4j DckzkWg7f1/9aIdpnU62JCxIJeulwNOD0pBKtUIy1VeiB6T2vErj/D+UDszTCAPY612R u/V3aBg6FDh5Y9ZaDmgbL4Qv+B/7ngJvTdAueK5lAycu1QvNxMd1OyxmruoMEGrIErRa l9rg== 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=aNxRkrBqb5y0/D7rt2RfI6WvL8LvoSKtpo6LChnhW2M=; fh=M0Ap44DuyxvZl+pFH87nP8ejwD3egvCwtooXXL4zzfI=; b=DiGJXqmbJjoFDY7mYLpmDj+b7ps6z3yWznih5uupHq0y6vX5wE3AFHcRjcUXzEtcpv w4HF87kL3rVJ/aa/KWddydAw6i1oZIN5XkRczcauPqLNnldbGDM+0P+JqmVx5uMTmxZN ewRooxZT2zFeHoOkbijscv1E6eL9mIAw2Q4kvLB4PLDipdfy8rpBAbUGxIEbXr5V99z5 eqlKZLQH/5HYljt+A1VU0OH/u4lQDCMUzbMxrjvZGHMggmF1Mv2Ycekl/uxHTc86HhfW SphItjDMc3xDw+yxIW+qHHS9JJm6thNPD/Tm9nXAfgqZEo914Ze8m2dYwd70mWz2OelM 6GUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=c5Ya0UD7; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DCqD4qgU; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b="V6E/hDI0"; 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 s24-20020a17090a5d1800b0026305080a6fsi3583555pji.63.2023.08.11.09.40.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2023 09:40:58 -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=c5Ya0UD7; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DCqD4qgU; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b="V6E/hDI0"; 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 1qUVBK-0003ia-V4; Fri, 11 Aug 2023 16:40:12 +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 1qUVBJ-0003iS-Qc for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 16:40:10 +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=cEMjyMtDEYhR58SvXgLTC+jW0goG6T9TZX0z5KG0Ra4=; b=c5Ya0UD7kzgvtV39WgCXIPbn03 k58T58mxQPqvl1uiwxWlZU7Zu65QnHlRdh5cYWLpr+GOC0B9JknB8EovMhwgXU8nDzg2EqGrAP4CV m+W+I02nlMtobqFR7L3mq3drdJQ1kOPUD2uivtKjTbr6a94AN0J0vZjZHhD7oI4cj/3c=; 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=cEMjyMtDEYhR58SvXgLTC+jW0goG6T9TZX0z5KG0Ra4=; b=D CqD4qgUdTDtGFIWasgtebPZCjdee+yKXdqBKa1/kGTv82qAECsBpj6nAk++r+/2QT2Q/YbSVS+gPb vd15kbVlreZ64OHwk14i+Mv9Mg5xBHiftHPnfSB3DSZSOPenOzIvUjhN08Utiol4wFoqb6UTZYroz Y8HE922Dsk+ClK2E=; 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 1qUVBE-002hvp-6y for openvpn-devel@lists.sourceforge.net; Fri, 11 Aug 2023 16:40:10 +0000 Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-31771bb4869so1976464f8f.0 for ; Fri, 11 Aug 2023 09:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1691771997; x=1692376797; 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=cEMjyMtDEYhR58SvXgLTC+jW0goG6T9TZX0z5KG0Ra4=; b=V6E/hDI0Yy+KCkbtZC8s01dXa+2Gw2zye9d6exQZTms2zaHeAIttEM596i3xRR3jY8 HrCKnde1qQu6J9Jx0Xon6/4o40Ba7Isbu1YhOkz/sXLDz8zS5vuoT1lfaWohOjTavoju OmgFQTQLJjr4x9j7MoTTEy+Aodt41eAvgR9lyh7bo0z6J6+ein23l6aeVKat+uj6j9+J ABzN+IjjXn1VIrU2f9RjneW81J88u5A8z3M0DYzaxJVI+slVeGgQeAq04agkvdGDOJdc 6DkQTiWZ28EZ6MpkR247/xlmvULP0QpY4pDlga1c6v2WaJWN7XFfNtOp0q2Ugt+FXEor 0cOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691771997; x=1692376797; 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=cEMjyMtDEYhR58SvXgLTC+jW0goG6T9TZX0z5KG0Ra4=; b=bzdF24ZWPfg5tYFAYAaYt244LphhHdJkO8NhDfbdIY4VLHypj3VFX80I5sA18OBRYT WWxuUT8CzFfHBLzAmPiWS41wR/GYoTK+CYminldtEQl/q78gVsnaUOmmVQn8nebqi2Ff 9ER3ap/NCwL7T4o45bZIjzoAA2XYPjVG2ulyN4m5s0kop7PfbiBB7t67qRe5UUySKGi9 8XIsxk9go9EinDaiMwxn7NOP71fl/LW1tLvvaLOVHlY1NMVi6JpGU74kBN9FeOnbW56p Sj1sPl9FfSUfZbC9gBzgeMUIxved+LA3RfexXWIvTIqOXfpG9q9uZl5niCmHzDO5Z/Ud sL9Q== X-Gm-Message-State: AOJu0Yyve1hpk2L2+OymUmINVQoY85ksNhejrqra8kxHExdtqImpTBEE 9a9JEDo7POu3PMmi/IrBvM6XgkcjmNVRRUWiZCY= X-Received: by 2002:a5d:6dc8:0:b0:314:3e77:f210 with SMTP id d8-20020a5d6dc8000000b003143e77f210mr1821414wrz.59.1691771997472; Fri, 11 Aug 2023 09:39:57 -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 c13-20020a5d528d000000b003142c85fbcdsm5914375wrv.11.2023.08.11.09.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 09:39:57 -0700 (PDT) From: "cron2 (Code Review)" X-Google-Original-From: "cron2 (Code Review)" X-Gerrit-PatchSet: 2 Date: Fri, 11 Aug 2023 16:39:56 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: merged 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-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-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: cron2 has submitted this change. ( 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 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 HTML_MESSAGE BODY: HTML included in message -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.50 listed in wl.mailspike.net] -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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1qUVBE-002hvp-6y 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?1773951577407131902?= cron2 has submitted this change. ( 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(-) 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) {