From patchwork Thu Aug 15 02:10:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 810 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.31.255.6]) by backend30.mail.ord1d.rsapps.net with LMTP id YE1wChpMVV3CNwAAIUCqbw for ; Thu, 15 Aug 2019 08:12:10 -0400 Received: from proxy5.mail.iad3b.rsapps.net ([172.31.255.6]) by director7.mail.ord1d.rsapps.net with LMTP id aIpHBxpMVV0cXQAAovjBpQ ; Thu, 15 Aug 2019 08:12:10 -0400 Received: from smtp38.gate.iad3b ([172.31.255.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.iad3b.rsapps.net with LMTP id 6BqOABpMVV3sNgAA13hMnw ; Thu, 15 Aug 2019 08:12:10 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp38.gate.iad3b.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: e7900fdc-bf55-11e9-a2d1-5254006f0979-1-1 Received: from [216.105.38.7] ([216.105.38.7:41124] helo=lists.sourceforge.net) by smtp38.gate.iad3b.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A0/B9-02975-91C455D5; Thu, 15 Aug 2019 08:12:09 -0400 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.90_1) (envelope-from ) id 1hyEax-0007TE-G7; Thu, 15 Aug 2019 12:11:07 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1hyEaw-0007T0-7F for openvpn-devel@lists.sourceforge.net; Thu, 15 Aug 2019 12:11:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=JuZ/4j8H91ZOYtW7Natcgspl2UwIK2/gyvJPIxrXjys=; b=BCuG5EannwBGIaRMb1XIh48jA7 deXpYFLlMlkCrNVoJRRRBiKNPjpu5AfR55lVrcPw4kik3siQaoLIP/oVQ+utnbJ2DR453EPq24PGl 31z08p2yxT3yTHQCIGa/f/PguPPEZ2xvYygd/WLRNP7zyOfD85pel9xj4TDdbbPHNacY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JuZ/4j8H91ZOYtW7Natcgspl2UwIK2/gyvJPIxrXjys=; b=fj0RDYrKgTaFhPDoCBzohsCMnS 5DP++G/kr9/zrfkwqw/uQCPqwYdl0Pm74beBjzv/7d4vORQQdn5ggUvO971oe9gU5iEP4WPfbrRx3 SZ+oGSyvVgSxhAxepd6bs5BJ0NcHxomQWiQ0gbJgOlGoGAwOQJNnBKrwQCdJAUmV/UGQ=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hyEav-0079R3-4Y for openvpn-devel@lists.sourceforge.net; Thu, 15 Aug 2019 12:11:06 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.92.1 (FreeBSD)) (envelope-from ) id 1hyEaj-000K3d-5V for openvpn-devel@lists.sourceforge.net; Thu, 15 Aug 2019 14:10:53 +0200 Received: (nullmailer pid 18480 invoked by uid 10006); Thu, 15 Aug 2019 12:10:53 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 15 Aug 2019 14:10:52 +0200 Message-Id: <20190815121053.18433-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190812134513.20758-1-arne@rfc2549.org> References: <20190812134513.20758-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1hyEav-0079R3-4Y Subject: [Openvpn-devel] [PATCH v2 1/2] Fix check if iface name is set 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox Clang/Android complained warning: address of array 'rgi6->iface' will always evaluate to 'true' [-Wpointer-bool-conversion] if (rgi6->iface) iface is a char[16]; So its pointer is always true. we do a CLEAR(rgi6) always before setting this struct and strcpy the name into iface. So using strlen instead of checking for the pointer should be the right fix. Patch V2: use if(strlen > 0) instead of if(strlen) Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli --- src/openvpn/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 3035fa89..1b5eacea 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -3350,7 +3350,7 @@ get_default_gateway_ipv6(struct route_ipv6_gateway_info *rgi6, rgi6->flags |= RGI_ADDR_DEFINED; } - if (rgi6->iface) + if (strlen(rgi6->iface) > 0) { rgi6->flags |= RGI_IFACE_DEFINED; }