From patchwork Wed Feb 5 01:46:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Domagoj Pensa X-Patchwork-Id: 975 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id YNJLCQC9Ol7hdwAAIUCqbw for ; Wed, 05 Feb 2020 08:02:56 -0500 Received: from proxy6.mail.ord1c.rsapps.net ([172.28.255.1]) by director12.mail.ord1d.rsapps.net with LMTP id 8NhGCQC9Ol4HDQAAIasKDg ; Wed, 05 Feb 2020 08:02:56 -0500 Received: from smtp22.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.ord1c.rsapps.net with LMTP id WA7hCAC9Ol7pAQAA9sKXow ; Wed, 05 Feb 2020 08:02:56 -0500 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: smtp22.gate.ord1c.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=pensa.hr X-Suspicious-Flag: YES X-Classification-ID: d33929f6-4817-11ea-8e0f-a0369f0d84d2-1-1 Received: from [216.105.38.7] ([216.105.38.7:50976] helo=lists.sourceforge.net) by smtp22.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 29/63-09486-FFCBA3E5; Wed, 05 Feb 2020 08:02:55 -0500 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.90_1) (envelope-from ) id 1izKJd-0003zT-L3; Wed, 05 Feb 2020 13:02:01 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1izKJc-0003yo-1X for openvpn-devel@lists.sourceforge.net; Wed, 05 Feb 2020 13:02:00 +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 :References:In-Reply-To:Date:Subject:Message-ID:To:From:Sender:Reply-To:Cc: 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=7YX6/D4FG5c0LYKxgMrpkPRm+jFvBOe7YH9GJAetlgA=; b=iIYObm7u7f8JuUgMFCOQ5BUx6i vfTe5J4LoHZXI96ssy9LjTWqO03y5WroQTOqsRzw+pIQhn/c9JVdGs0YmiZBcL2r6VGId3A2fmP4x nNy6zRjtWQsWijdbwD556T8X+2Gygk7TMIfduWiDrEZeEOUI74CXhud4ZBhS83i1pymE=; 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:References: In-Reply-To:Date:Subject:Message-ID:To:From:Sender:Reply-To:Cc: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=7YX6/D4FG5c0LYKxgMrpkPRm+jFvBOe7YH9GJAetlgA=; b=EMhwO+OO+uYulKJx3q2afw9e8M Gq08IxgUnG9fEe20TKodCTBMdfAqjW2kuTb+8yLVgqupEHS5qjR43unozlAXzDcv1hzdYbbOutSad 7oE7KjPyeTvBsLmzGcGtyvSVUGhLycSr5tMT6HkmGN58MoZc0q1iJ1vJ/1nGIp2tFbG4=; Received: from sender4-of-o51.zoho.com ([136.143.188.51]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) (Exim 4.92.2) id 1izKJa-00Aybb-VP for openvpn-devel@lists.sourceforge.net; Wed, 05 Feb 2020 13:02:00 +0000 Received: from localhost (31-38.dsl.iskon.hr [89.164.31.38]) by mx.zohomail.com with SMTPS id 1580906784890416.3254388515469; Wed, 5 Feb 2020 04:46:24 -0800 (PST) From: Domagoj Pensa To: openvpn-devel@lists.sourceforge.net Message-ID: <20200205124615.15758-3-domagoj@pensa.hr> Date: Wed, 5 Feb 2020 13:46:15 +0100 X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200205124615.15758-1-domagoj@pensa.hr> References: <20200205124615.15758-1-domagoj@pensa.hr> MIME-Version: 1.0 X-ZohoMailClient: External X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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: pensa.hr] X-Headers-End: 1izKJa-00Aybb-VP Subject: [Openvpn-devel] [PATCH 2/2] Fix linking issues on MinGW 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox MinGW linking fails for several files due to a missing "static" declaration in functions tuntap_is_wintun() and tuntap_ring_empty(). Signed-off-by: Domagoj Pensa Acked-by: Lev Stipakov --- src/openvpn/tun.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 97d28f45..327d7927 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -224,13 +224,13 @@ tuntap_defined(const struct tuntap *tt) } #ifdef _WIN32 -inline bool +static inline bool tuntap_is_wintun(struct tuntap *tt) { return tt && tt->windows_driver == WINDOWS_DRIVER_WINTUN; } -inline bool +static inline bool tuntap_ring_empty(struct tuntap *tt) { return tuntap_is_wintun(tt) && (tt->wintun_send_ring->head == tt->wintun_send_ring->tail);