From patchwork Tue Oct 10 12:11:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 18 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director2.mail.ord1d.rsapps.net ([172.30.157.8]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id scx/OtZT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.157.46]) by director2.mail.ord1d.rsapps.net (Dovecot) with LMTP id K3ndFdZT3VmQIwAAgYhSiA ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from smtp32.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net (Dovecot) with LMTP id Tx6rObdT3VlhUAAAMe1Fpw ; Tue, 10 Oct 2017 19:12:22 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1001-1199-w 0-298-1001-1563-w 0-298-0-9751-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=BJvxlxYG c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=6gE8B_6XuioXVbMB5fAA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp32.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 779212fa-ae10-11e7-ab09-842b2b572c6a-1-1 Received: from [216.34.181.88] ([216.34.181.88:7763] helo=lists.sourceforge.net) by smtp32.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id C1/2D-08254-4D35DD95; Tue, 10 Oct 2017 19:12:20 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gh-0003XL-KR; Tue, 10 Oct 2017 23:11:47 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23ge-0003X9-BC for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From; bh=aJvTRH7Psk8dPL1kh9gHqBG3ItlvGg/1+tiE5oM+jI4=; b=ejxDiiO4HwmoOzZda/jWO2H+FK5s+kOOzlCq0KNDIBZhSEL888X6IMPWd27K/M4L9nvWXBbjDmHlWKCmd0NNxva73QnBxPi4TccGRqAmRL83g9vGw4e+23gYG+DLwVBx/+90leLO671sK30b33rs6zb7JdwNnAVPBjdmHBf/wOI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=Message-Id:Date:Subject:Cc:To:From; bh=aJvTRH7Psk8dPL1kh9gHqBG3ItlvGg/1+tiE5oM+jI4=; b=jR1gdciNaATh+mzPBgVMMQgfX+Kynp95EUnhJSO5bA688Qb3X9Q8hrj1Dd18Lc6TCOhC5LY+KbwXAVfNd7JTcI9jisWWRjOsYAUleIJurHtqZly7IMMe+zo8GD8jTbicisaF0JTMdQV/gJfouivfXMyv0c9rmvLw7jb7ZrzOr30=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gb-0000f4-1H for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 1B05A405E6; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=pq2kIVn7tU5RF9w019RawOtdaOlHevxxjukpcTKfO9E=; h=From:To:Cc:Subject:Date:Message-Id; b=KbO/c+zy/2DCCCQKxrW/Cf/w1jlMBswXfNliOHKDrP0Q0TkM1gCijp+EoVshbnuZd y6+bRhhE3+DMDdgIsCT/o5HmzPOjvBMK1JFA+aKiPrkvOrPbgdnAnEoeTieb2NuO1e GBLyTsOs00Zkq+C/7BFb+gievdj8Wz7Oa7vv0+Qg= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:18 +0200 Message-Id: <20171010231130.6832-1-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gb-0000f4-1H Subject: [Openvpn-devel] [PATCH 01/13] snwprintf() => _snwprintf() 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 From: Simon Rozman --- src/openvpnserv/interactive.c | 12 ++++++------ src/openvpnserv/validate.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index fe9c7d6..9d473e4 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -402,8 +402,8 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options) if (!CheckOption(workdir, 2, argv_tmp, &settings)) { - snwprintf(buf, _countof(buf), msg1, argv[0], workdir, - settings.ovpn_admin_group); + _snwprintf(buf, _countof(buf), msg1, argv[0], workdir, + settings.ovpn_admin_group); buf[_countof(buf) - 1] = L'\0'; ReturnError(pipe, ERROR_STARTUP_DATA, buf, 1, &exit_event); } @@ -421,15 +421,15 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options) { if (wcscmp(L"--config", argv[i]) == 0 && argc-i > 1) { - snwprintf(buf, _countof(buf), msg1, argv[i+1], workdir, - settings.ovpn_admin_group); + _snwprintf(buf, _countof(buf), msg1, argv[i+1], workdir, + settings.ovpn_admin_group); buf[_countof(buf) - 1] = L'\0'; ReturnError(pipe, ERROR_STARTUP_DATA, buf, 1, &exit_event); } else { - snwprintf(buf, _countof(buf), msg2, argv[i], - settings.ovpn_admin_group); + _snwprintf(buf, _countof(buf), msg2, argv[i], + settings.ovpn_admin_group); buf[_countof(buf) - 1] = L'\0'; ReturnError(pipe, ERROR_STARTUP_DATA, buf, 1, &exit_event); } diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index f6a97e9..7a2d0e3 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -65,7 +65,7 @@ CheckConfigPath(const WCHAR *workdir, const WCHAR *fname, const settings_t *s) /* convert fname to full path */ if (PathIsRelativeW(fname) ) { - snwprintf(tmp, _countof(tmp), L"%s\\%s", workdir, fname); + _snwprintf(tmp, _countof(tmp), L"%s\\%s", workdir, fname); tmp[_countof(tmp)-1] = L'\0'; config_file = tmp; } From patchwork Tue Oct 10 12:11:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 14 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director4.mail.ord1d.rsapps.net ([172.30.157.10]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id n6aAFs1T3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:13 -0400 Received: from director7.mail.ord1c.rsapps.net ([172.28.128.196]) by director4.mail.ord1d.rsapps.net (Dovecot) with LMTP id p2wvAM1T3Vn2OgAAHDmxtw ; Tue, 10 Oct 2017 19:12:13 -0400 Received: from smtp13.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director7.mail.ord1c.rsapps.net (Dovecot) with LMTP id NyGCKcRT3VlfQwAAqdfm7w ; Tue, 10 Oct 2017 19:12:13 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1001-1204-w 0-298-1001-1568-w 0-298-0-6935-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=ZYtfDYdA c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=lZ4cS7aGu6OMoeGOBXgA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp13.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 7200edac-ae10-11e7-8c5f-bc305bf03494-1-1 Received: from [216.34.181.88] ([216.34.181.88:58390] helo=lists.sourceforge.net) by smtp13.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 0F/CB-14234-BC35DD95; Tue, 10 Oct 2017 19:12:11 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gi-0000WS-DX; Tue, 10 Oct 2017 23:11:48 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23ge-0000WF-7m for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +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:Cc:To:From; bh=iluGW8KibaAqPT77AMh2Q8h7ia7nvME5GjPWf/SyYaI=; b=HaiLeCv7mq68i2N9lm/U9gxI1GuLfS95elyqIe2tlEfIhPfBuXmMhFhNVKV9iX1Kkv1drSkZQfeJf4UaizBirplfsTwwbx0+is6hrPkFF8luVWw4EoPzALJDxxKYXqFz06/beLAqqG+EJkKwwFeUUCmTi6ea+6QIgIniLqnAKfU=; 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:Cc:To:From; bh=iluGW8KibaAqPT77AMh2Q8h7ia7nvME5GjPWf/SyYaI=; b=HDHAMkRRjGN0BMgl4UVg2K3vhNJn4WfQy4A77rxmWAzzqxhtSnH2cGr3j4NcF986bjmayGGJhh0dPokOeFbiBzmAMHP+YQWQB6azt6rm4Q3/PCIL6OyInXK962Ujx7aYHsb6UVGPKJUEvIz+V/NhZuRUvHKgfX4y6kHc9Pnwamk=; Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gb-0006sV-Gw for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 36E04405EF; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=22XRN5o1fNwaT8Ln+LpfB3nLa431l/ulR9ICJsX4PDU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=RjErdrrh2I9hrPt7Ie30vLXE2e3i1x9IiZhFj2jjm/ajiplOx47pqkxSPNpnOYPia rsWoD6WDPaa0EvspLYAHUklrM80jNyiS2K/l54oNE4++WBTv8HltdJZcOOtdrxNcfF SXGG1buGl3siInx3wQlS6fvNjQT/pfdg1dFb6B9c= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:19 +0200 Message-Id: <20171010231130.6832-2-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gb-0006sV-Gw Subject: [Openvpn-devel] [PATCH 02/13] Mixing wide and regular strings in concatenations is not allowed in MSVC. 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 From: Simon Rozman --- src/openvpnserv/interactive.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 9d473e4..4b08086 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -370,12 +370,12 @@ ValidateOptions(HANDLE pipe, const WCHAR *workdir, const WCHAR *options) BOOL ret = FALSE; int i; const WCHAR *msg1 = L"You have specified a config file location (%s relative to %s)" - " that requires admin approval. This error may be avoided" - " by adding your account to the \"%s\" group"; + L" that requires admin approval. This error may be avoided" + L" by adding your account to the \"%s\" group"; const WCHAR *msg2 = L"You have specified an option (%s) that may be used" - " only with admin approval. This error may be avoided" - " by adding your account to the \"%s\" group"; + L" only with admin approval. This error may be avoided" + L" by adding your account to the \"%s\" group"; argv = CommandLineToArgvW(options, &argc); From patchwork Tue Oct 10 12:11:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 23 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director3.mail.ord1d.rsapps.net ([172.30.157.9]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id ib4PGPpT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:58 -0400 Received: from director8.mail.ord1c.rsapps.net ([172.28.130.196]) by director3.mail.ord1d.rsapps.net (Dovecot) with LMTP id kdzuF/pT3VkxOAAAkXNnRw ; Tue, 10 Oct 2017 19:12:58 -0400 Received: from smtp21.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director8.mail.ord1c.rsapps.net (Dovecot) with LMTP id n3nuH4JT3VktDgAAPBwpBw ; Tue, 10 Oct 2017 19:12:58 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1019-1222-w 0-298-1019-1586-w 0-298-0-6599-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=asPwMmRV c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=3GLR1-XzZKwA:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=mkmQqGwGvsM5QENDagQA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp21.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 8de3d8fe-ae10-11e7-8701-a0369f0d8808-1-1 Received: from [216.34.181.88] ([216.34.181.88:55158] helo=lists.sourceforge.net) by smtp21.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id FD/A1-25686-AF35DD95; Tue, 10 Oct 2017 19:12:58 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gh-0003XT-MR; Tue, 10 Oct 2017 23:11:47 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23ge-0003X8-4P for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +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:Cc:To:From; bh=F3oduWxL+JEzhUB28WK2O4M9W3eQ7PRX8YcrIoCzt6U=; b=Z3A4PXV3+hfycR+VG1U04LQIp6D04uCPsxxcnyoJJNjynYgGnI3E9OzfuAB1lYg+9yJFhGWZ9IKkgPbqljZ5rLXmrlYlqQG/mAoQdBugR2h4wKRTgkLOmyalCcPDIMHqNwMseGL6gutAZEXYei9BdJ1KakMYD6Ua5pIyH9ugKnQ=; 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:Cc:To:From; bh=F3oduWxL+JEzhUB28WK2O4M9W3eQ7PRX8YcrIoCzt6U=; b=XxK30xLcUUnp0xeLfOQVVFRBuEwd3xHHYYHNEXvdd3PW9QYisjpACAKFKUXRXG9T25Y+A312qbIAD9D4AvGlhSUygmRxP0Q1gooo6MdNRvtp/QZxbvta6o3ssi3e0I80vLW3sFL/fm5sTDjsM13GEan1rnaNjeLHIjPZ7AORWW8=; Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gb-0000xw-7m for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 53508405F2; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=ZFzkxN397P/2N7c47jCLMnRxb1ouRUs56ukFWVKXN2c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=M70Jalf0D77eN74vLgQQxf3QXYxRfTq8XFSfwW5wtBPbiFKcXpBMcXtJtvPg0Qciv AT2gQ45cmkifef0IqTlji9/fGW20R4gAXYHmkRLtQEggvrxMT7p/E/TpyoDAOA1Bp9 9XlyqDDTgmYEBjmE9B2aiEIHPl75g1EAAczuVqAI= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:20 +0200 Message-Id: <20171010231130.6832-3-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.2 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gb-0000xw-7m Subject: [Openvpn-devel] [PATCH 03/13] RtlIpv6AddressToStringW() and RtlIpv4AddressToStringW() require mstcpip.h 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 From: Simon Rozman --- src/openvpnserv/interactive.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 4b08086..2019d38 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef HAVE_VERSIONHELPERS_H #include From patchwork Tue Oct 10 12:11:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 24 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director1.mail.ord1d.rsapps.net ([172.30.157.6]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id ETDoIvpT3Vn0TAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:58 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.157.44]) by director1.mail.ord1d.rsapps.net (Dovecot) with LMTP id 2TybIvpT3Vk4VgAANGzteQ ; Tue, 10 Oct 2017 19:12:58 -0400 Received: from smtp24.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net (Dovecot) with LMTP id U3e9KvBT3VmTQQAA8Zzt7w ; Tue, 10 Oct 2017 19:12:58 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-999-1216-w 0-298-999-1580-w 0-298-0-7863-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=LubQ8TVc c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=e8Y76__cAGTsDfWv5rAA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp24.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 8d36137c-ae10-11e7-a16e-0026b94accf9-1-1 Received: from [216.34.181.88] ([216.34.181.88:58760] helo=lists.sourceforge.net) by smtp24.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id A5/5B-19099-9F35DD95; Tue, 10 Oct 2017 19:12:57 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gi-0000Wa-FG; Tue, 10 Oct 2017 23:11:48 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23ge-0000WE-4X for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:45 +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:Cc:To:From; bh=M1J8pFuRDOdfM6/A0wOywuVx3iqOZBgtSPfMSFLQe5U=; b=m6DHuNEqud2lDpERFP9bdRinRQAb1t47YRzeNpO3Z0DyEvUl07Y/GFRdDpz1GFnH7HMHZdYHjLuXs1JPuIsQvVD+Jwy790poAT3Wv8zd5FYc8LCiGFjYA71g5+xKe9leWcMlsNG/VfjsaqP6zVGapjLD5sgFIrmFgSvEG5DZujQ=; 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:Cc:To:From; bh=M1J8pFuRDOdfM6/A0wOywuVx3iqOZBgtSPfMSFLQe5U=; b=iGOtWrwUzUeVOz6k+MTwUAR60I+Z2Mq9hQs0djhkdk6BM9bRHHAta2ApmhO7bOgc6Kn7sueELma3bPdw2D+uBNZVHoYl12HDRcRaZGvVmNRCMAmdlrTp6SFuqzZgS3xvYrIkwoIFUt9eRERfg20qgN4EE3zZ4g8DIj+FEa3dnjo=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gb-0000f7-1H for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 78555405F4; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=W2NvmVEKaK9/8sAwWQCK2FOabj9ELKgFeFxCrKHxpnc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=tVR39ZSdWdL+cMcVnFctG4ejhigGnMPElGiFif6sic81rfPUsDk86jxu8OiUp7m6j WPslfc8AOmLwMqS9gkY/gOAz49zNI042o2D9xTSlrhlSn9ge7fAUSCgV05fQIp9KuQ aAiWDDFaKMYCOHUtjGG8XTTb262s+XFKkAviRY1A= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:21 +0200 Message-Id: <20171010231130.6832-4-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.2 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gb-0000f7-1H Subject: [Openvpn-devel] [PATCH 04/13] Local functions are not supported in MSVC. Bummer. 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 From: Simon Rozman --- src/openvpnserv/interactive.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 2019d38..7ff45b1 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -1891,6 +1891,11 @@ FreeWaitHandles(LPHANDLE h) free(h); } +static BOOL +CmpHandle(LPVOID item, LPVOID hnd) +{ + return item == hnd; +} VOID WINAPI ServiceStartInteractive(DWORD dwArgc, LPTSTR *lpszArgv) @@ -1901,11 +1906,6 @@ ServiceStartInteractive(DWORD dwArgc, LPTSTR *lpszArgv) list_item_t *threads = NULL; PHANDLE handles = NULL; DWORD handle_count; - BOOL - CmpHandle(LPVOID item, LPVOID hnd) - { - return item == hnd; - } service = RegisterServiceCtrlHandlerEx(interactive_service.name, ServiceCtrlInteractive, &status); if (!service) From patchwork Tue Oct 10 12:11:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 19 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director2.mail.ord1d.rsapps.net ([172.30.157.8]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id sQ7uEdhT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:24 -0400 Received: from proxy3.mail.ord1d.rsapps.net ([172.30.157.20]) by director2.mail.ord1d.rsapps.net (Dovecot) with LMTP id uZblEdhT3VkIIgAAgYhSiA ; Tue, 10 Oct 2017 19:12:24 -0400 Received: from smtp11.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.ord1d.rsapps.net (Dovecot) with LMTP id aGFgAGJT3VkFYAAA7WKfLA ; Tue, 10 Oct 2017 19:12:24 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1045-1262-w 0-298-1045-1626-w 0-298-0-13622-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=PLBNwriC c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=mpEHOEdKiDi3SPtJlZkA:9 a=LwAVnjRaDGGQmuPT:21 a=mpjeYKLOz0ShiI-I:21 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp11.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 7965b47e-ae10-11e7-b559-bc305beffa54-1-1 Received: from [216.34.181.88] ([216.34.181.88:43186] helo=lists.sourceforge.net) by smtp11.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 0B/67-06815-7D35DD95; Tue, 10 Oct 2017 19:12:23 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gi-00006A-UR; Tue, 10 Oct 2017 23:11:48 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23ge-000060-KN for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +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:Cc:To:From; bh=mEEL8Umh1UoodzeS5iIfAN8YrNBLpRjIr29LgyeA6w0=; b=Yvp8yaDW4KHJenC5pBh4KCP7kLShPLVXG+y47T4DU/q5wNZs74FsunGT5UbRSLWqfBJwxC/tcAlG3JrB7LiSLLxnjApvSaWUPUEZe21hchy1VyLy5lMlCVn5/mkiVJ0OA9ff8ZfPwuK3G9nuUDs1/Y+rujoK3caQQ7FB8lB4OlI=; 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:Cc:To:From; bh=mEEL8Umh1UoodzeS5iIfAN8YrNBLpRjIr29LgyeA6w0=; b=JJzzVoFFSAUU90vjE8QMJEw5qDzlpYnrOOSXvylKxl8lA82ltnsEZJybshaxU2k8iQ0QWVjCSk8s9rC58vD2d6L524uu3jt1apnYrt5qWsta3R+hefJCiZbeZ/eFt5p6rAQS7KsR4NENC/AbgkzU028QekgseG/KzaV2Rn+RJ7U=; Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gb-0007JV-KZ for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:44 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 9DE8140606; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=q91D0XQdLobMxbs0+fyiCITCpeGcRU+nbt7ad31tn4s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=Ynqi+2jxHQVApWzrfq0bYFEGweuKpTu8DwhZ6uRJleAJb1IpUM+wPcpJI13rj5SQL g7c4GB4d0pbn8RYmz/ZaYSwLkd9WsV4e4U/WxLN0q2jrgZfhpt58HINKRHGBsK7yDD 5eUpPkShuSW+vCChdrXqksjMfRebQKzM9SWMIFU8= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:22 +0200 Message-Id: <20171010231130.6832-5-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gb-0007JV-KZ Subject: [Openvpn-devel] [PATCH 05/13] Function prototypes are declared as "typedef ( *type_name)()" in MSVC. 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 From: Simon Rozman Note: NETIOAPI_API is defined as: #define NETIOAPI_API NETIO_STATUS NETIOAPI_API_ #define NETIOAPI_API_ WINAPI I am not sure whether interactive.c will compile using mingw with this patch. If not: 1. We can introduce some #ifdef _MSC_VER #else #endif 2. Since NTDDI_VERSION=NTDDI_VISTA, most of the dynamic API loading by GetProcAddress() could be simplified to statically linked API calls, avoiding function prototype declarations altogether. I suggest we do this anyway to clean-up the code in the future. --- src/openvpnserv/interactive.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 7ff45b1..8d94197 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -550,7 +550,7 @@ InterfaceLuid(const char *iface_name, PNET_LUID luid) LPWSTR wide_name; int n; - typedef NETIO_STATUS WINAPI (*ConvertInterfaceAliasToLuidFn) (LPCWSTR, PNET_LUID); + typedef NETIO_STATUS (WINAPI *ConvertInterfaceAliasToLuidFn) (LPCWSTR, PNET_LUID); static ConvertInterfaceAliasToLuidFn ConvertInterfaceAliasToLuid = NULL; if (!ConvertInterfaceAliasToLuid) { @@ -585,7 +585,7 @@ CmpAddress(LPVOID item, LPVOID address) static DWORD DeleteAddress(PMIB_UNICASTIPADDRESS_ROW addr_row) { - typedef NETIOAPI_API (*DeleteUnicastIpAddressEntryFn) (const PMIB_UNICASTIPADDRESS_ROW); + typedef NETIO_STATUS (NETIOAPI_API_ *DeleteUnicastIpAddressEntryFn) (const PMIB_UNICASTIPADDRESS_ROW); static DeleteUnicastIpAddressEntryFn DeleteUnicastIpAddressEntry = NULL; if (!DeleteUnicastIpAddressEntry) @@ -613,8 +613,8 @@ HandleAddressMessage(address_message_t *msg, undo_lists_t *lists) PMIB_UNICASTIPADDRESS_ROW addr_row; BOOL add = msg->header.type == msg_add_address; - typedef NETIOAPI_API (*CreateUnicastIpAddressEntryFn) (const PMIB_UNICASTIPADDRESS_ROW); - typedef NETIOAPI_API (*InitializeUnicastIpAddressEntryFn) (PMIB_UNICASTIPADDRESS_ROW); + typedef NETIO_STATUS (NETIOAPI_API_ *CreateUnicastIpAddressEntryFn) (const PMIB_UNICASTIPADDRESS_ROW); + typedef NETIO_STATUS (NETIOAPI_API_ *InitializeUnicastIpAddressEntryFn) (PMIB_UNICASTIPADDRESS_ROW); static CreateUnicastIpAddressEntryFn CreateUnicastIpAddressEntry = NULL; static InitializeUnicastIpAddressEntryFn InitializeUnicastIpAddressEntry = NULL; @@ -707,7 +707,7 @@ CmpRoute(LPVOID item, LPVOID route) static DWORD DeleteRoute(PMIB_IPFORWARD_ROW2 fwd_row) { - typedef NETIOAPI_API (*DeleteIpForwardEntry2Fn) (PMIB_IPFORWARD_ROW2); + typedef NETIO_STATUS (NETIOAPI_API_ *DeleteIpForwardEntry2Fn) (PMIB_IPFORWARD_ROW2); static DeleteIpForwardEntry2Fn DeleteIpForwardEntry2 = NULL; if (!DeleteIpForwardEntry2) @@ -735,7 +735,7 @@ HandleRouteMessage(route_message_t *msg, undo_lists_t *lists) PMIB_IPFORWARD_ROW2 fwd_row; BOOL add = msg->header.type == msg_add_route; - typedef NETIOAPI_API (*CreateIpForwardEntry2Fn) (PMIB_IPFORWARD_ROW2); + typedef NETIO_STATUS (NETIOAPI_API_ *CreateIpForwardEntry2Fn) (PMIB_IPFORWARD_ROW2); static CreateIpForwardEntry2Fn CreateIpForwardEntry2 = NULL; if (!CreateIpForwardEntry2) @@ -821,7 +821,7 @@ out: static DWORD HandleFlushNeighborsMessage(flush_neighbors_message_t *msg) { - typedef NETIOAPI_API (*FlushIpNetTable2Fn) (ADDRESS_FAMILY, NET_IFINDEX); + typedef NETIO_STATUS (NETIOAPI_API_ *FlushIpNetTable2Fn) (ADDRESS_FAMILY, NET_IFINDEX); static FlushIpNetTable2Fn flush_fn = NULL; if (msg->family == AF_INET) From patchwork Tue Oct 10 12:11:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 26 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director5.mail.ord1d.rsapps.net ([172.30.157.12]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id SJJDA/tT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:59 -0400 Received: from director8.mail.ord1c.rsapps.net ([172.28.130.196]) by director5.mail.ord1d.rsapps.net (Dovecot) with LMTP id rZcaD/tT3VmNNgAAsdCWiw ; Tue, 10 Oct 2017 19:12:59 -0400 Received: from smtp34.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director8.mail.ord1c.rsapps.net (Dovecot) with LMTP id 4103OcdT3VlmDgAAPBwpBw ; Tue, 10 Oct 2017 19:12:59 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1019-1218-w 0-298-1019-1582-w 0-298-0-21191-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=KLMYNxNo c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=IkcTkHD0fZMA:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=yMhMjlubAAAA:8 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=P7A9kmvSCa1qLUXxOBgA:9 a=QEXdDO2ut3YA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp34.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 8ebce3ce-ae10-11e7-ab17-0026b93662df-1-1 Received: from [216.34.181.88] ([216.34.181.88:58786] helo=lists.sourceforge.net) by smtp34.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 1E/02-02012-BF35DD95; Tue, 10 Oct 2017 19:12:59 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gm-0000X4-HX; Tue, 10 Oct 2017 23:11:52 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gl-0000Wv-U5 for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=OwFMRA0Fq4hSEPBhkcXTs3dl7x2SupH+IvZaqykRlYA=; b=d4tHkdU40TeumIWzI5FHSjoyY867+o19SEvW548LrJhpLWkZRNZ0Yjrd88yxWPdJhYts7p66pSKZTJX4lpqQ3ybc3lcIPeSZum3pzPp078GGOOpyq6+pLi72mUaxv1CqOb+55MqfXlPDvDQr5Mutk/NBCGEA9OeY/bCAKo4quP0=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=OwFMRA0Fq4hSEPBhkcXTs3dl7x2SupH+IvZaqykRlYA=; b=YDYkmo4e0UuX7rOkQODtWbArqqTLpBeJHX9q+ukvOGVHARbRFZu+GJUkhllWGZ2OQys5e7uxM5v9SRUYTbUD1zLKSgsRG19U7A4T3oNGz3L37asPlHVQum7tMWDgtNUFJCTgoI6/wsqjxh4VTyjsVq2+Hh5Sp5QN8rUTEigAxn8=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gk-0000fZ-At for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id D31E340617; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677092; bh=pgLH+jwFEDtBxE/0CH/Qi/2dRTiEmnG39mx7oIj4Xfg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type:Content-Transfer-Encoding; b=Wt9x90JzrnGLkbrsBl4pHJzm7Hd+dScdAX+dGJqrKGcrArc+oJITyLEZgFva1SP5I cRuQcoyRFzrZY0MUyxkJuOgqmKA64GRhjJWQpP/4N1O/db0FaEtHMA78piBx7/gfDX y7WdDdVBwYNhikF/FzsbeIOfj4Sb9Wi+LhMDUBpo= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:23 +0200 Message-Id: <20171010231130.6832-6-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gk-0000fZ-At Subject: [Openvpn-devel] [PATCH 06/13] openvpnserv.vcxproj project file recreated using Visual Studio 2017 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 From: Simon Rozman 1. The project file was created from scratch. 2. XML nodes were reordered to match old project order for easier diff-ing. 3. All non-essential settings reset to MSVC defaults. 4. .h/.c file list updated. 5. Missing /I include paths added. 6. List of required .lib files updated. The openvpnserv.exe compiles now. Warnings will be addressed in future patches. --- openvpn.sln | 6 ++-- src/openvpnserv/openvpnserv.vcxproj | 52 +++++++++++++++-------------- src/openvpnserv/openvpnserv.vcxproj.filters | 34 ++++++++++++++----- 3 files changed, 57 insertions(+), 35 deletions(-) diff --git a/openvpn.sln b/openvpn.sln index 90c01b8..9f50f11 100644 --- a/openvpn.sln +++ b/openvpn.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvpnserv", "src\openvpnserv\openvpnserv.vcxproj", "{9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openvpn", "src\openvpn\openvpn.vcxproj", "{29DF226E-4D4E-440F-ADAF-5829CFD4CA94}" diff --git a/src/openvpnserv/openvpnserv.vcxproj b/src/openvpnserv/openvpnserv.vcxproj index c6760da..a865bf0 100644 --- a/src/openvpnserv/openvpnserv.vcxproj +++ b/src/openvpnserv/openvpnserv.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -11,6 +11,7 @@ + 15.0 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD} openvpnserv Win32Proj @@ -18,18 +19,20 @@ Application - MultiByte + Unicode true - v120 + v141 Application - MultiByte - v120 + Unicode + v141 + + @@ -37,67 +40,66 @@ - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ - true - $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ - false + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\ Disabled - $(SOURCEBASE);%(AdditionalIncludeDirectories) + $(SOURCEBASE);$(SOURCEBASE)\include;$(SOURCEBASE)\src\openvpn;$(SOURCEBASE)\src\compat;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions) - true - EnableFastChecks MultiThreadedDebugDLL Level3 - EditAndContinue $(SOURCEBASE);%(AdditionalIncludeDirectories) - true Console MachineX86 + fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) MaxSpeed - true - $(SOURCEBASE);%(AdditionalIncludeDirectories) + $(SOURCEBASE);$(SOURCEBASE)\include;$(SOURCEBASE)\src\openvpn;$(SOURCEBASE)\src\compat;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions) MultiThreadedDLL - true Level3 - ProgramDatabase $(SOURCEBASE);%(AdditionalIncludeDirectories) - true Console true true MachineX86 + fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) - + + + + + + + @@ -111,4 +113,4 @@ - + \ No newline at end of file diff --git a/src/openvpnserv/openvpnserv.vcxproj.filters b/src/openvpnserv/openvpnserv.vcxproj.filters index 0c89b4f..c3267d1 100644 --- a/src/openvpnserv/openvpnserv.vcxproj.filters +++ b/src/openvpnserv/openvpnserv.vcxproj.filters @@ -7,29 +7,47 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd + h;hh;hpp;hxx;hm;inl;inc;xsd {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - + + Source Files + + + Source Files + + Source Files Source Files - - - - Header Files - + + Source Files + + + Source Files + Resource Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file From patchwork Tue Oct 10 12:11:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 25 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director4.mail.ord1d.rsapps.net ([172.30.157.10]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id QZJDA/tT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:59 -0400 Received: from director4.mail.ord1c.rsapps.net ([172.28.140.4]) by director4.mail.ord1d.rsapps.net (Dovecot) with LMTP id MQY/A/tT3VmRPwAAHDmxtw ; Tue, 10 Oct 2017 19:12:59 -0400 Received: from smtp43.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director4.mail.ord1c.rsapps.net (Dovecot) with LMTP id +ipyD/NQ3VnTYAAAsEL7Xg ; Tue, 10 Oct 2017 19:12:59 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1019-1236-w 0-298-1019-1600-w 0-298-1019-5387-w 0-298-0-15528-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=G8ReKJs5 c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=IkcTkHD0fZMA:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=yMhMjlubAAAA:8 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=dIDyQCueVpGrRbz-K7AA:9 a=QEXdDO2ut3YA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp43.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 8e32b6a4-ae10-11e7-9b44-bc305befc478-1-1 Received: from [216.34.181.88] ([216.34.181.88:42803] helo=lists.sourceforge.net) by smtp43.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 31/CB-35377-AF35DD95; Tue, 10 Oct 2017 19:12:58 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gm-00007D-4s; Tue, 10 Oct 2017 23:11:52 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gl-00006v-OB for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=enBF+d+4XQmLH3pzjD+AWRF/WX8VD7lHhHhcU94FyrM=; b=Uk4qJaQW8+cjqOYAkOPqwSPF4qFW0itwHHyslM0ya7j8sRch7sZOJIaizopH+oFzVrhW5PEzlpwCGKH23yyQPZ8+z/K0/SmxcPpXdCYJRtvhj9KchqWLsd8QIaUDVF0FnK6XKHxxx9y5r/XgQxUcwHPtjYr6l8I3jVTJuFaQXCA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=enBF+d+4XQmLH3pzjD+AWRF/WX8VD7lHhHhcU94FyrM=; b=BuXNieF/BPRdb6bd52R+LxKzOsWS7DemgMGfsOzSwn1OQW2Pd9iGZXCusri0ytloZNQfyJMZ7PZzIrl9UMbKv6+YqlzxrlhpVCMLzrBE+WbZ7GVU62q+ntxaEZTKlUN0rRuUspGDhMz+62PReKGKsNsqX82xtYuLehcCSj9dlow=; Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gk-0000yM-B8 for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id F2E0040641; Wed, 11 Oct 2017 01:11:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=IUotpQq/fmkI6Mnr+83/iNLHmlBGfnZCEKgC7xkonq0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type:Content-Transfer-Encoding; b=TC+Yv3N4LeB6gl+/IZ4uJkis6nSqQNHtsZB8ZYE1zkQLH8vxoavcr4m0f3+ozMtQk aj6iRNi9om7jQluznpZX88ZIFcIvNDk8IvLKG2PJsNrHgQ3ja3FkrAozFkMCWqXTG+ QkkW3O4pDOJ75C11BUW9udXRugxsG+3Ap62OtI1w= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:24 +0200 Message-Id: <20171010231130.6832-7-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gk-0000yM-B8 Subject: [Openvpn-devel] [PATCH 07/13] compat.vcxproj project file upgraded to Visual Studio 2017 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 From: Simon Rozman 1. The project file was ported to VS2017. 2. All non-essential settings reset to MSVC defaults. --- src/compat/compat.vcxproj | 36 +++++++++++++++++------------------- src/compat/compat.vcxproj.filters | 4 ++-- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj index d2695e6..997aaf7 100644 --- a/src/compat/compat.vcxproj +++ b/src/compat/compat.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -11,6 +11,7 @@ + 15.0 {4B2E2719-E661-45D7-9203-F6F456B22F19} compat Win32Proj @@ -18,18 +19,20 @@ StaticLibrary - MultiByte + Unicode true - v120 + v141 StaticLibrary - MultiByte - v120 + Unicode + v141 + + @@ -37,39 +40,34 @@ - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ - $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\ Disabled - $(SOURCEBASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SOURCEBASE);$(SOURCEBASE)\include;$(OPENSSL_HOME)\include;$(LZO_HOME)\include;$(PKCS11H_HOME)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions) - true - EnableFastChecks MultiThreadedDebugDLL Level3 - EditAndContinue MaxSpeed - true - $(SOURCEBASE);$(SOURCEBASE)/include;$(OPENSSL_HOME)/include;$(LZO_HOME)/include;$(PKCS11H_HOME)/include;%(AdditionalIncludeDirectories) + $(SOURCEBASE);$(SOURCEBASE)\include;$(OPENSSL_HOME)\include;$(LZO_HOME)\include;$(PKCS11H_HOME)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions) MultiThreadedDLL - true Level3 - ProgramDatabase diff --git a/src/compat/compat.vcxproj.filters b/src/compat/compat.vcxproj.filters index 0f78e86..acff7e7 100644 --- a/src/compat/compat.vcxproj.filters +++ b/src/compat/compat.vcxproj.filters @@ -7,11 +7,11 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd + h;hh;hpp;hxx;hm;inl;inc;xsd {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms From patchwork Tue Oct 10 12:11:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 16 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director6.mail.ord1d.rsapps.net ([172.30.157.13]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id sQBOM9ZT3Vn0TAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from director5.mail.ord1c.rsapps.net ([172.28.140.5]) by director6.mail.ord1d.rsapps.net (Dovecot) with LMTP id 9acPF9ZT3VnyPgAAhgvE6Q ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from smtp33.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director5.mail.ord1c.rsapps.net (Dovecot) with LMTP id w/UxNUFT3VlaEwAAH8LYwg ; Tue, 10 Oct 2017 19:12:22 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1001-1200-w 0-298-1001-1564-w 0-298-0-7333-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=Ts6kv3fh c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=E_K_3J3bz4N9Vrko1f0A:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp33.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 77a257e6-ae10-11e7-a322-0026b94abc32-1-1 Received: from [216.34.181.88] ([216.34.181.88:54243] helo=lists.sourceforge.net) by smtp33.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 57/D9-09987-4D35DD95; Tue, 10 Oct 2017 19:12:20 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gm-000073-2e; Tue, 10 Oct 2017 23:11:52 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gl-00006l-8h for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +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:Cc:To:From; bh=SPqj5LawTAMTb/aBVX085tjf1n+hzU80o+D8/5zUmy0=; b=FYOy4wQW/pyHUerSSyd5Wi8A4WCi7hu/f/Ul4IHnqFchw7UrSBJavK+nYlEgsyCmGQUJiNAjYqLbbF7UuixCupuwwHahC5lldCzl9K3R7GYJuq4OhHX5TN6dCCbOybn8HHQAH3Xf+Qn2d1xrsEt+a7W58eXV7G6dBYxKwF5WOrU=; 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:Cc:To:From; bh=SPqj5LawTAMTb/aBVX085tjf1n+hzU80o+D8/5zUmy0=; b=csJ6DIG6RgYSp5Bx6vIIf5SE4cYLmfOo+aTWmK6LzxdOS06vqqEtX5pQvxyB69/F8l9waJ098s4UcoUM3+jEkeW//iQbjj4xS8FcERknspaoT4vpE81JgAYwE7eECMGD/MFCqeyuPcGZehZydJAK3DRh4C//BZ55CqHzzihlWho=; Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gk-0007MO-G2 for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 1D5354071B; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=oIVB2YlQTiUhUWApylSyyabuyswhy9g6nwFf84jXcGE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=e0lZqp4/FybK1c7P/NYFDpEnT/B2zWIAYleEaiQYP5oVjLNixAyuxgfUNqTa7TPQC EkQZJeRRcpY+fKZNqWcOjFHrn6AmufjiHR9K/b3ZhSB+aHylZpBKGxVRzEIcfSUIdy 4tywJY4rI75xsY4pMCN6DyhYscxGnMUsfaXDefFE= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:25 +0200 Message-Id: <20171010231130.6832-8-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gk-0007MO-G2 Subject: [Openvpn-devel] [PATCH 08/13] MSVC meta files added to .gitignore list 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 From: Simon Rozman --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 30e289b..4543674 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ Release Debug Win32-Output +.vs .deps .libs Makefile @@ -55,6 +56,7 @@ distro/systemd/*.service sample/sample-keys/sample-ca/ vendor/.build vendor/dist +build/msvc/msvc-generate/version.m4 tests/t_client.sh tests/t_client-*-20??????-??????/ From patchwork Tue Oct 10 12:11:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 15 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director4.mail.ord1d.rsapps.net ([172.30.157.10]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id QZtQC9NT3VkKawAAgoeIoA for ; Tue, 10 Oct 2017 19:12:19 -0400 Received: from director4.mail.ord1c.rsapps.net ([172.28.140.4]) by director4.mail.ord1d.rsapps.net (Dovecot) with LMTP id xb1nAdNT3VmTPwAAHDmxtw ; Tue, 10 Oct 2017 19:12:19 -0400 Received: from smtp50.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by director4.mail.ord1c.rsapps.net (Dovecot) with LMTP id kygaFylT3VkAYgAAsEL7Xg ; Tue, 10 Oct 2017 19:12:19 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1001-1200-w 0-298-1001-1564-w 0-298-0-10199-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=K/5gJGeI c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=WoUKt_tgeKuBKdJwVhYA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp50.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 756882de-ae10-11e7-9d81-b8ca3a659864-1-1 Received: from [216.34.181.88] ([216.34.181.88:24468] helo=lists.sourceforge.net) by smtp50.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id D0/6A-27082-1D35DD95; Tue, 10 Oct 2017 19:12:17 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gm-0004yX-IC; Tue, 10 Oct 2017 23:11:52 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gl-0004yL-F8 for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +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:Cc:To:From; bh=7PAE2veS4bMgDf/3WTRd54XFPyXj436ONmopnEL2GXE=; b=LnEMKZDaZjhSJWYX1WsUlv4ZaWlorH3fbY3pbD8OUlt0U4DKqhAlMZnWhtxTujkBLpSmo5MCoc35fSpTGf6uKk3LZW+Arjmd+BDm4qsx/pQsX6w0JHMclxqGUl2g4nc1e86SCH76q2Ej9XePCHahPieV2UcDf4/ZLVk6B37ICeA=; 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:Cc:To:From; bh=7PAE2veS4bMgDf/3WTRd54XFPyXj436ONmopnEL2GXE=; b=hh0otEf21XtFYwOQJBsMuHj/KAMH0MBl5STHRv5cMusJbtf981t0ZQWZ103P9sw+/tff/PrW47eZKYLqj1cHzgjY+n43XoLfUrupw1oPbTtK2JS/JpSXMeOwCcsvFaurhcQCszIDNWFyK0UjKU9vvdea24kXmN5FzjT6FNRzERM=; Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gk-0000yN-HF for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:51 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 43AE6407B8; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=nVGGhrL/IOvBrDGLITWDWeBXJwN37+LlxscX09YdvtM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=USTKsV9rNmibA6hPhDHjSBqRIfZSYcPV44esWGX+6vmTsNXZgz/J2a2AX9riqfq7r eGP/wnDNtxX1CiaWn252RYQoEHFTQlLfqnsZKq8h/AgBr58BXhETby0BR19KAfXQfV o/djiNG0AVpECwR2oRJ/szlf1S5u9bPeWAIdZa8w= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:26 +0200 Message-Id: <20171010231130.6832-9-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gk-0000yN-HF Subject: [Openvpn-devel] [PATCH 09/13] Signed/unsigned warnings of MSVC resolved 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 From: Simon Rozman --- src/openvpn/block_dns.c | 2 +- src/openvpnserv/automatic.c | 2 +- src/openvpnserv/common.c | 2 +- src/openvpnserv/interactive.c | 4 ++-- src/openvpnserv/validate.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openvpn/block_dns.c b/src/openvpn/block_dns.c index d43cbcf..f88ba2c 100644 --- a/src/openvpn/block_dns.c +++ b/src/openvpn/block_dns.c @@ -370,7 +370,7 @@ get_interface_metric(const NET_IFINDEX index, const ADDRESS_FAMILY family) } return ipiface.Metric; } - return -err; + return -(int)err; } /* diff --git a/src/openvpnserv/automatic.c b/src/openvpnserv/automatic.c index 4123d0f..6c39aaa 100644 --- a/src/openvpnserv/automatic.c +++ b/src/openvpnserv/automatic.c @@ -155,7 +155,7 @@ match(const WIN32_FIND_DATA *find, LPCTSTR ext) * Modify the extension on a filename. */ static bool -modext(LPTSTR dest, int size, LPCTSTR src, LPCTSTR newext) +modext(LPTSTR dest, size_t size, LPCTSTR src, LPCTSTR newext) { int i; diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index b8b817b..7901fd6 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -36,7 +36,7 @@ openvpn_vsntprintf(LPTSTR str, size_t size, LPCTSTR format, va_list arglist) len = _vsntprintf(str, size, format, arglist); str[size - 1] = 0; } - return (len >= 0 && len < size); + return (len >= 0 && (size_t)len < size); } int openvpn_sntprintf(LPTSTR str, size_t size, LPCTSTR format, ...) diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 8d94197..96e0de0 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -188,7 +188,7 @@ typedef enum { static DWORD AsyncPipeOp(async_op_t op, HANDLE pipe, LPVOID buffer, DWORD size, DWORD count, LPHANDLE events) { - int i; + DWORD i; BOOL success; HANDLE io_event; DWORD res, bytes = 0; @@ -1061,7 +1061,7 @@ RegisterDNS(LPVOID unused) { ipcfg, L"ipconfig /flushdns", timeout }, { ipcfg, L"ipconfig /registerdns", timeout }, }; - int ncmds = sizeof(cmds) / sizeof(cmds[0]); + DWORD ncmds = sizeof(cmds) / sizeof(cmds[0]); HANDLE wait_handles[2] = {rdns_semaphore, exit_event}; diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index 7a2d0e3..5422d33 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -298,7 +298,7 @@ IsUserInGroup(PSID sid, const PTOKEN_GROUPS token_groups, const WCHAR *group_nam break; } /* If a match is already found, ret == TRUE and the loop is skipped */ - for (int i = 0; i < nread && !ret; ++i) + for (DWORD i = 0; i < nread && !ret; ++i) { ret = EqualSid(members[i].lgrmi0_sid, sid); } From patchwork Tue Oct 10 12:11:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 17 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director1.mail.ord1d.rsapps.net ([172.30.157.6]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id WJyuLdZT3VkKawAAgoeIoA for ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from proxy20.mail.ord1d.rsapps.net ([172.30.157.65]) by director1.mail.ord1d.rsapps.net (Dovecot) with LMTP id WZv6NNZT3VlZWQAANGzteQ ; Tue, 10 Oct 2017 19:12:22 -0400 Received: from smtp18.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy20.mail.ord1d.rsapps.net (Dovecot) with LMTP id hhdDCrVT3VmYSQAAsk8m8w ; Tue, 10 Oct 2017 19:12:22 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1019-1218-w 0-298-1019-1582-w 0-298-0-15375-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=Sp/S07G0 c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=IkcTkHD0fZMA:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=yMhMjlubAAAA:8 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=wJ8qo1gzr0bXMVrvlfIA:9 a=QEXdDO2ut3YA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp18.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 781b26b2-ae10-11e7-967b-bc305bf00c68-1-1 Received: from [216.34.181.88] ([216.34.181.88:24510] helo=lists.sourceforge.net) by smtp18.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 60/56-09635-5D35DD95; Tue, 10 Oct 2017 19:12:21 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gn-0004yq-Kt; Tue, 10 Oct 2017 23:11:53 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gm-0004yR-8b for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=D7CHRrokEqb9+7qFSk5DUO+liXfk6hIdL5SzWhg9sPk=; b=kxXnGrf5AXA5LfHup7rt7qbP8+qm9I/wgps5FleKHzxOA9wsJ4mqbxq74SZAerqoIud56ab+8I21xCHSTfgv3KHFEeIcVgwDt73fzmblJ0BclI2O2fjxOlII8w+OsuINis9Res1TY22xg9NCqRPfgwlnMhCBvLQL88iuBbWv1HI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=D7CHRrokEqb9+7qFSk5DUO+liXfk6hIdL5SzWhg9sPk=; b=lmAueqDgKIt+/YoElN4UuaFvvE6TRZiVxy8uh81pe4KWqX2HefrJsuuA16ZWYmZglppqIvyPA3sK9CKsYRdt12oiKmaL5Y9frdY041bV9BCn79YsxwRWBgfiuDfrjumZokElaQKYD1cQnjAsIXMUKHtQ5o1FJznTQxU/PAdaHXA=; Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gk-0000yP-S3 for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:52 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 5F9C1407B9; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=H2ImJPx7hOKCpdL8NqZZMKWb9ch5Kb/skXHl1UOW9/0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type:Content-Transfer-Encoding; b=IqpLSHX7yFRwubpTnXwRl/vIIBAax1Ltftf0AAU2lHeIfyKmlUmL4S9e2DBGY/buo FccJzwh9XpNBOKSFVncUEScVczaXaazi6KP7iJXUWzBNnY1Ij9EgylU1Kl3UZ+J/Rz QEPALjp8ef3owJX7PIWiAubNpEjj/mNr3jTuXnwU= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:27 +0200 Message-Id: <20171010231130.6832-10-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gk-0000yP-S3 Subject: [Openvpn-devel] [PATCH 10/13] msvc-generate.vcxproj project file upgraded to Visual Studio 2017 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 From: Simon Rozman 1. The project file was ported to VS2017. 2. All non-essential settings reset to MSVC defaults. 3. -ls flags added to NMake to reduce output clutter. --- build/msvc/msvc-generate/msvc-generate.vcxproj | 42 +++++++++------------- .../msvc-generate/msvc-generate.vcxproj.filters | 7 ++++ 2 files changed, 24 insertions(+), 25 deletions(-) create mode 100644 build/msvc/msvc-generate/msvc-generate.vcxproj.filters diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj b/build/msvc/msvc-generate/msvc-generate.vcxproj index 8b7ec22..f5fc921 100644 --- a/build/msvc/msvc-generate/msvc-generate.vcxproj +++ b/build/msvc/msvc-generate/msvc-generate.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -11,6 +11,7 @@ + 15.0 {8598C2C8-34C4-47A1-99B0-7C295A890615} msvc-generate MakeFileProj @@ -18,13 +19,19 @@ Makefile + $(Configuration)\ + $(Configuration)\ Makefile + $(Configuration)\ + $(Configuration)\ + + @@ -32,30 +39,15 @@ - - <_ProjectFileVersion>10.0.30319.1 - $(Configuration)\ - $(Configuration)\ - nmake -f Makefile.mak all - nmake -f Makefile.mak clean all - nmake -f Makefile.mak clean - config-msvc-version.h - WIN32;_DEBUG;$(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) - $(Configuration)\ - $(Configuration)\ - nmake -f Makefile.mak all - nmake -f Makefile.mak clean all - nmake -f Makefile.mak clean - config-msvc-version.h - WIN32;NDEBUG;$(NMakePreprocessorDefinitions) - $(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) + + nmake -ls -f Makefile.mak all + nmake -ls -f Makefile.mak clean + nmake -lsa -f Makefile.mak all + + + nmake -ls -f Makefile.mak all + nmake -ls -f Makefile.mak clean + nmake -lsa -f Makefile.mak all diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj.filters b/build/msvc/msvc-generate/msvc-generate.vcxproj.filters new file mode 100644 index 0000000..1d04662 --- /dev/null +++ b/build/msvc/msvc-generate/msvc-generate.vcxproj.filters @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file From patchwork Tue Oct 10 12:11:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 21 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director3.mail.ord1d.rsapps.net ([172.30.157.9]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id IUISJ+BT3VkKawAAgoeIoA for ; Tue, 10 Oct 2017 19:12:32 -0400 Received: from proxy1.mail.ord1d.rsapps.net ([172.30.157.18]) by director3.mail.ord1d.rsapps.net (Dovecot) with LMTP id TTFdFeBT3VmhOQAAkXNnRw ; Tue, 10 Oct 2017 19:12:32 -0400 Received: from smtp7.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy1.mail.ord1d.rsapps.net (Dovecot) with LMTP id CcmaHChT3VlabAAAasrz9Q ; Tue, 10 Oct 2017 19:12:32 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-998-1196-w 0-298-998-1560-w 0-298-0-7911-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=H+SZ+KQi c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=bAj6_E9VoPTalv8rMq8A:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp7.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 7e712390-ae10-11e7-b841-bc305bf04148-1-1 Received: from [216.34.181.88] ([216.34.181.88:58556] helo=lists.sourceforge.net) by smtp7.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id C0/A2-08716-0E35DD95; Tue, 10 Oct 2017 19:12:32 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gs-0000YP-LC; Tue, 10 Oct 2017 23:11:58 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gs-0000YD-9O for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:58 +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:Cc:To:From; bh=6bLaIfAj3qXERoCY0rmfuzAdKxO44pfFyYKWJs5NNAY=; b=RFnCLf09gMYE2JpUxIcqoTFs+IwNsPFMmud3QOUpTy3CqrwFtClS6E8Sxt0SJ7OBbpqZeilu+uzyW3bySZH3IRdcFyfdITVTlwbLpzyOHWNoWpb7PKyLsdzQpxzIM5JeriYPpQ/Ll+2cHDtL3IhHGfnDtsLlD/zCUXe+kzTd/dw=; 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:Cc:To:From; bh=6bLaIfAj3qXERoCY0rmfuzAdKxO44pfFyYKWJs5NNAY=; b=dtzGjYwZTo/J7NKP+4nxVSpKSicyGRfyNJ3g1Ap7MqpUnzmy9NnQFlPM/2t6nhx4ogzzV8aRwRrpt2EMVZ6wf76dvY+xUg0Nl8+kbU4X2yCtGl4Wq+DGl1ToQ536wq2U+vHyNpoxsK6IOrJeziyIwjlGG8lTxVZx7FvGhJlEY/Q=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gr-0000i6-Gt for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:58 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id 7D25A407BA; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=CuOp83guOEqC8Yh0+2Ib6+ACfFEOX6J4J69WDJbr7Mg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=i2We4F/v/gNG8SajA8AB195uhvkwBL4u6VvHEOhn15HaxVr2ePYrO+xxRxMs1NByh 9IvtBqVkVDc8Ok2uKKtJRlGMZBfDpHvaVQZJ34sIw+DAqgLXeo8PtYqIU/UZwL6fis J7Eu6ri6DvKdkRm+p1C7f/5LmmtR3CzC4vsiTyWc= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:28 +0200 Message-Id: <20171010231130.6832-11-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gr-0000i6-Gt Subject: [Openvpn-devel] [PATCH 11/13] openvpn.vcxproj temporarily disabled from building in openvpn.sln until we re-establish MSVC building for it 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 From: Simon Rozman --- openvpn.sln | 2 -- 1 file changed, 2 deletions(-) diff --git a/openvpn.sln b/openvpn.sln index 9f50f11..ac865bb 100644 --- a/openvpn.sln +++ b/openvpn.sln @@ -22,9 +22,7 @@ Global {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.ActiveCfg = Release|Win32 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.Build.0 = Release|Win32 {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.ActiveCfg = Debug|Win32 - {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.Build.0 = Debug|Win32 {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.ActiveCfg = Release|Win32 - {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.Build.0 = Release|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.ActiveCfg = Debug|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.Build.0 = Debug|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.ActiveCfg = Release|Win32 From patchwork Tue Oct 10 12:11:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 20 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director6.mail.ord1d.rsapps.net ([172.30.157.13]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id OAaRH95T3Vn0TAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:30 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.157.44]) by director6.mail.ord1d.rsapps.net (Dovecot) with LMTP id 2bLyLN5T3VnhPQAAhgvE6Q ; Tue, 10 Oct 2017 19:12:30 -0400 Received: from smtp1.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net (Dovecot) with LMTP id 9azlInxT3VmHQQAA8Zzt7w ; Tue, 10 Oct 2017 19:12:30 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1000-1198-w 0-298-1000-1562-w 0-298-0-12983-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=bqYOPwSi c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=G9hyuhLczAr52wfc7ekA:9 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp1.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 7c9eb5b4-ae10-11e7-9a71-842b2b47c027-1-1 Received: from [216.34.181.88] ([216.34.181.88:15698] helo=lists.sourceforge.net) by smtp1.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 95/52-29879-DD35DD95; Tue, 10 Oct 2017 19:12:29 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gt-00008a-7Q; Tue, 10 Oct 2017 23:11:59 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gs-00008P-Pg for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:58 +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:Cc:To:From; bh=DdDkcioBMf5N+fAxkHkFIf3aT6DGVSN2GU4ue6YhTcQ=; b=caOtAqiO1qNzUyIKd/6hdfR2D16U9zBbE1+Y7iOi3QYLHtwHRVqTKK1Pg1C7aLCjTqupeh91P8VTLsKeWIREnKY4BVjjAbNagq8gRvJeL6fGE/+Bs6Wj5vlBayM0fZT8XPdmCtolxI0YAQ5MJjgdhcQjn+8neQt2XF9BHdJKNoE=; 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:Cc:To:From; bh=DdDkcioBMf5N+fAxkHkFIf3aT6DGVSN2GU4ue6YhTcQ=; b=hv7tDJi6lMA+GPOoapWJbjGLOZp0aHz9fMtbaxKj1w6DJcnLT8zH9Goomhd95p4aViLidbUbBJ4w4doJaROvtk5W4TV01mz0VZq78X3cDowtrNMPGKqa+C95yQfD1xKqGq4PtaJ1xHeC21FDsmO8D2l4fCzoNpAf4dHSuVaH2u8=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gr-0000i7-Mn for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:11:58 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id A266F407BB; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=yw65itfIycaAKgKCbYyzJxNgzGFAs8ICrDTc+f8cdtY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=mr+Nfha9MZUBC0P8VOBGWqq91DAcwODsZfEg9g1OOaqwmDL747+s8qZgPd27xLySg hb8nPPIqz0k4PWkDlVcTp/ILkwxz0WhOINJ0iRmIU58Ny4/FIv4W4pg+FCwhWhjBCQ 1jiCBrWT1HmB4yHo1kfFuqrbZDq8zvFDLVhGGIIY= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:29 +0200 Message-Id: <20171010231130.6832-12-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gr-0000i7-Mn Subject: [Openvpn-devel] [PATCH 12/13] Memory size arithmetic reviewed according to 64-bit MSVC complaints 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 From: Simon Rozman --- src/openvpnserv/automatic.c | 14 ++++++++------ src/openvpnserv/interactive.c | 12 ++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/openvpnserv/automatic.c b/src/openvpnserv/automatic.c index 6c39aaa..3e8f6ed 100644 --- a/src/openvpnserv/automatic.c +++ b/src/openvpnserv/automatic.c @@ -130,24 +130,26 @@ close_if_open(HANDLE h) static bool match(const WIN32_FIND_DATA *find, LPCTSTR ext) { - int i; + size_t i, len_filename, len_ext; if (find->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { return false; } - if (!_tcslen(ext)) + len_ext = _tcslen(ext); + if (!len_ext) { return true; } - i = _tcslen(find->cFileName) - _tcslen(ext) - 1; - if (i < 1) + len_filename = _tcslen(find->cFileName); + if (len_filename < len_ext + 2) { return false; } + i = len_filename - len_ext - 1; return find->cFileName[i] == '.' && !_tcsicmp(find->cFileName + i + 1, ext); } @@ -157,14 +159,14 @@ match(const WIN32_FIND_DATA *find, LPCTSTR ext) static bool modext(LPTSTR dest, size_t size, LPCTSTR src, LPCTSTR newext) { - int i; + size_t i; if (size > 0 && (_tcslen(src) + 1) <= size) { _tcscpy(dest, src); dest [size - 1] = TEXT('\0'); i = _tcslen(dest); - while (--i >= 0) + while (i-- > 0) { if (dest[i] == TEXT('\\')) { diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 96e0de0..9a4c01a 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -280,7 +280,7 @@ ReturnProcessId(HANDLE pipe, DWORD pid, DWORD count, LPHANDLE events) _snwprintf(buf, _countof(buf), L"0x%08x\n0x%08x\n%s", 0, pid, msg); buf[_countof(buf) - 1] = '\0'; - WritePipeAsync(pipe, buf, wcslen(buf) * 2, count, events); + WritePipeAsync(pipe, buf, (DWORD)(wcslen(buf) * 2), count, events); } static VOID @@ -308,7 +308,7 @@ ReturnError(HANDLE pipe, DWORD error, LPCWSTR func, DWORD count, LPHANDLE events L"0x%1!08x!\n%2!s!\n%3!s!", 0, 0, (LPWSTR) &result, 0, (va_list *) args); - WritePipeAsync(pipe, result, wcslen(result) * 2, count, events); + WritePipeAsync(pipe, result, (DWORD)(wcslen(result) * 2), count, events); #ifdef UNICODE MsgToEventLog(MSG_FLAGS_ERROR, result); #else @@ -452,10 +452,10 @@ out: static BOOL GetStartupData(HANDLE pipe, STARTUP_DATA *sud) { - size_t len; + size_t size, len; BOOL ret = FALSE; WCHAR *data = NULL; - DWORD size, bytes, read; + DWORD bytes, read; bytes = PeekNamedPipeAsync(pipe, 1, &exit_event); if (bytes == 0) @@ -1163,7 +1163,7 @@ netsh_dns_cmd(const wchar_t *action, const wchar_t *proto, const wchar_t *if_nam const wchar_t *fmt = L"netsh interface %s %s dns \"%s\" %s"; /* max cmdline length in wchars -- include room for worst case and some */ - int ncmdline = wcslen(fmt) + wcslen(if_name) + wcslen(addr) + 32 + 1; + size_t ncmdline = wcslen(fmt) + wcslen(if_name) + wcslen(addr) + 32 + 1; wchar_t *cmdline = malloc(ncmdline*sizeof(wchar_t)); if (!cmdline) { @@ -1683,7 +1683,7 @@ RunOpenvpn(LPVOID p) { DWORD written; WideCharToMultiByte(CP_UTF8, 0, sud.std_input, -1, input, input_size, NULL, NULL); - WriteFile(stdin_write, input, strlen(input), &written, NULL); + WriteFile(stdin_write, input, (DWORD)strlen(input), &written, NULL); free(input); } From patchwork Tue Oct 10 12:11:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Rozman X-Patchwork-Id: 22 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director6.mail.ord1d.rsapps.net ([172.30.157.13]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id EfHRHeJT3Vn8EAAAgoeIoA for ; Tue, 10 Oct 2017 19:12:34 -0400 Received: from proxy19.mail.ord1d.rsapps.net ([172.30.157.64]) by director6.mail.ord1d.rsapps.net (Dovecot) with LMTP id gaq3HeJT3VlQQAAAhgvE6Q ; Tue, 10 Oct 2017 19:12:34 -0400 Received: from smtp1.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.ord1d.rsapps.net (Dovecot) with LMTP id EPNpOt9T3VkAKAAAyH2SIw ; Tue, 10 Oct 2017 19:12:34 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-MessageSniffer-Scan-Result: 0 X-MessageSniffer-Rules: 0-298-1023-1236-w 0-298-1023-1600-w 0-298-0-30839-f X-CMAE-Scan-Result: 0 X-CNFS-Analysis: v=2.2 cv=bqYOPwSi c=1 sm=1 tr=0 a=Q8DxjiC8O3VT/NpP1XjEZQ==:117 a=Q8DxjiC8O3VT/NpP1XjEZQ==:17 a=kj9zAlcOel0A:10 a=02M-m0pO-4AA:10 a=WiVod9pSvdkA:10 a=9sSjY8p1AAAA:8 a=P_JWiMecAAAA:8 a=FP58Ms26AAAA:8 a=yIP3nxjOAL4h-Q_rWUAA:9 a=h2uRgyYg0cpIqSzG:21 a=CjuIK1q_8ugA:10 a=-FEs8UIgK8oA:10 a=NWVoK91CQyQA:10 a=ub54wNWiXv_DzeFsgEJW:22 a=D0-HAvA3Hk9NMREbgwuX:22 X-Orig-To: justin@openvpn.net X-Originating-Ip: [216.34.181.88] Authentication-Results: smtp1.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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; dkim=fail (signature verification failed) header.d=rozman.si; dmarc=fail (p=none; dis=none) header.from=rozman.si X-Classification-ID: 7f806570-ae10-11e7-9a71-842b2b47c027-1-1 Received: from [216.34.181.88] ([216.34.181.88:12846] helo=lists.sourceforge.net) by smtp1.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 05/62-29879-2E35DD95; Tue, 10 Oct 2017 19:12:34 -0400 Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1e23gv-00009P-AS; Tue, 10 Oct 2017 23:12:01 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.89) (envelope-from ) id 1e23gu-00009B-AF for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:12:00 +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:Cc:To:From; bh=68SKzFi7brfknMyeie7x9IJuYxnZs637zX5AxobQCts=; b=MsCxtDBlg5/Ic03rFkGTirVS7uKuYaE9R8UUMaReq/0iahg3zngnuW+k5QhZ3gmlw75OyeZ+PAj4kmf07/jFcIeKdhEV9gnC4yU1zNte84MEK0+W5zvHudlQgswwEKRtgVL2irUuyLupkeD3mbW6YVLaCblpVvvhOMe3uiEQjoc=; 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:Cc:To:From; bh=68SKzFi7brfknMyeie7x9IJuYxnZs637zX5AxobQCts=; b=K5V5qp9Sg/9wlXS11ItgFQes8+H9wxyOQDpblWl4j0RTRTQRqXt+lJvxAQ1kOpb94zU/KnwdC22QgxCX0omzorr7aa/ZBuDkRrQEmhXHe6I8JoFbfRd/AFzUWK+bccIPexIEOVltONdD/oSjqNDBgQhlPWOZb3wKiTcMPsGm8Dg=; Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of rozman.si designates 89.212.80.145 as permitted sender) client-ip=89.212.80.145; envelope-from=simon@rozman.si; helo=amebis01.amebis.si; Received: from amebis01.amebis.si ([89.212.80.145]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1e23gr-0000iL-WF for openvpn-devel@lists.sourceforge.net; Tue, 10 Oct 2017 23:12:00 +0000 Received: from SR5.amebis.doma (unknown [192.168.100.253]) by amebis01.amebis.si (Postfix) with ESMTP id BE091407BC; Wed, 11 Oct 2017 01:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=rozman.si; s=default; t=1507677093; bh=tJ2svUhn/G5svcQEkYXOm2prRx5lznxhCvOhFf5GR8U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=ldC4oHluD/0/g6Gu6WOWpp/7gpKYLNBqnEQ0sD4AUEf/wnYg0OMtoXh0khcuOUIMl DkCPFm2IWXLWsBopHzOW7fq4FgVR7JY/TO1IbzYT3Wh/oVOLHP5otH0YYrN3csmGBw liltigOuW5Df3xjyjWc4B8c3b+VjUrcGv5nqplO0= From: simon@rozman.si To: openvpn-devel@lists.sourceforge.net Date: Wed, 11 Oct 2017 01:11:30 +0200 Message-Id: <20171010231130.6832-13-simon@rozman.si> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20171010231130.6832-1-simon@rozman.si> References: <20171010231130.6832-1-simon@rozman.si> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [89.212.80.145 listed in list.dnswl.org] -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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.1 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1e23gr-0000iL-WF Subject: [Openvpn-devel] [PATCH 13/13] x64 MSVC configurations introduced 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 From: Simon Rozman --- .gitignore | 1 + build/msvc/msvc-generate/msvc-generate.vcxproj | 42 ++++++++++++-- msvc-env.bat | 1 - openvpn.sln | 16 ++++++ src/compat/compat.vcxproj | 61 +++++++++++++++++++- src/openvpnserv/openvpnserv.vcxproj | 77 ++++++++++++++++++++++++-- 6 files changed, 186 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 4543674..ced65ec 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ Release Debug Win32-Output +x64-Output .vs .deps .libs diff --git a/build/msvc/msvc-generate/msvc-generate.vcxproj b/build/msvc/msvc-generate/msvc-generate.vcxproj index f5fc921..8978197 100644 --- a/build/msvc/msvc-generate/msvc-generate.vcxproj +++ b/build/msvc/msvc-generate/msvc-generate.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + 15.0 @@ -19,13 +27,23 @@ Makefile - $(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + Makefile + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ Makefile - $(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ + + + Makefile + $(Configuration)\$(Platform)\ + $(Configuration)\$(Platform)\ @@ -35,20 +53,36 @@ + + + + + + nmake -ls -f Makefile.mak all nmake -ls -f Makefile.mak clean nmake -lsa -f Makefile.mak all + + nmake -ls -f Makefile.mak all + nmake -ls -f Makefile.mak clean + nmake -lsa -f Makefile.mak all + nmake -ls -f Makefile.mak all nmake -ls -f Makefile.mak clean nmake -lsa -f Makefile.mak all + + nmake -ls -f Makefile.mak all + nmake -ls -f Makefile.mak clean + nmake -lsa -f Makefile.mak all + diff --git a/msvc-env.bat b/msvc-env.bat index aabed75..56b469f 100644 --- a/msvc-env.bat +++ b/msvc-env.bat @@ -13,7 +13,6 @@ set SOURCEBASE=%cd% set SOLUTION=openvpn.sln set CPPFLAGS=%CPPFLAGS%;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS set CPPFLAGS=%CPPFLAGS%;NTDDI_VERSION=NTDDI_VISTA;_WIN32_WINNT=_WIN32_WINNT_VISTA -set CPPFLAGS=%CPPFLAGS%;_USE_32BIT_TIME_T set CPPFLAGS=%CPPFLAGS%;%EXTRA_CPPFLAGS% if exist config-msvc-local.h set CPPFLAGS="%CPPFLAGS%;HAVE_CONFIG_MSVC_LOCAL_H" diff --git a/openvpn.sln b/openvpn.sln index ac865bb..cf5a089 100644 --- a/openvpn.sln +++ b/openvpn.sln @@ -14,23 +14,39 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.ActiveCfg = Debug|Win32 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|Win32.Build.0 = Debug|Win32 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|x64.ActiveCfg = Debug|x64 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Debug|x64.Build.0 = Debug|x64 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.ActiveCfg = Release|Win32 {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|Win32.Build.0 = Release|Win32 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|x64.ActiveCfg = Release|x64 + {9C91EE0B-817D-420A-A1E6-15A5A9D98BAD}.Release|x64.Build.0 = Release|x64 {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|Win32.ActiveCfg = Debug|Win32 + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Debug|x64.ActiveCfg = Debug|Win32 {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|Win32.ActiveCfg = Release|Win32 + {29DF226E-4D4E-440F-ADAF-5829CFD4CA94}.Release|x64.ActiveCfg = Release|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.ActiveCfg = Debug|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|Win32.Build.0 = Debug|Win32 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|x64.ActiveCfg = Debug|x64 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Debug|x64.Build.0 = Debug|x64 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.ActiveCfg = Release|Win32 {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|Win32.Build.0 = Release|Win32 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|x64.ActiveCfg = Release|x64 + {8598C2C8-34C4-47A1-99B0-7C295A890615}.Release|x64.Build.0 = Release|x64 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.ActiveCfg = Debug|Win32 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|Win32.Build.0 = Debug|Win32 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|x64.ActiveCfg = Debug|x64 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Debug|x64.Build.0 = Debug|x64 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.ActiveCfg = Release|Win32 {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|Win32.Build.0 = Release|Win32 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|x64.ActiveCfg = Release|x64 + {4B2E2719-E661-45D7-9203-F6F456B22F19}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/compat/compat.vcxproj b/src/compat/compat.vcxproj index 997aaf7..0ebd3d5 100644 --- a/src/compat/compat.vcxproj +++ b/src/compat/compat.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + 15.0 @@ -23,11 +31,22 @@ true v141 + + StaticLibrary + Unicode + true + v141 + StaticLibrary Unicode v141 + + StaticLibrary + Unicode + v141 + @@ -36,17 +55,31 @@ + + + + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ @@ -59,6 +92,17 @@ Level3 + + + Disabled + $(SOURCEBASE);$(SOURCEBASE)\include;$(OPENSSL_HOME)\include;$(LZO_HOME)\include;$(PKCS11H_HOME)\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Level3 + + MaxSpeed @@ -70,6 +114,17 @@ Level3 + + + MaxSpeed + $(SOURCEBASE);$(SOURCEBASE)\include;$(OPENSSL_HOME)\include;$(LZO_HOME)\include;$(PKCS11H_HOME)\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + + @@ -85,4 +140,4 @@ - + \ No newline at end of file diff --git a/src/openvpnserv/openvpnserv.vcxproj b/src/openvpnserv/openvpnserv.vcxproj index a865bf0..3cbc287 100644 --- a/src/openvpnserv/openvpnserv.vcxproj +++ b/src/openvpnserv/openvpnserv.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + 15.0 @@ -23,11 +31,22 @@ true v141 + + Application + Unicode + true + v141 + Application Unicode v141 + + Application + Unicode + v141 + @@ -36,17 +55,31 @@ + + + + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ $(SolutionDir)$(Platform)-Output\$(Configuration)\ - $(Configuration)\ + $(Configuration)\$(Platform)\ + + + $(SolutionDir)$(Platform)-Output\$(Configuration)\ + $(Configuration)\$(Platform)\ @@ -63,7 +96,24 @@ Console - MachineX86 + fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + Disabled + $(SOURCEBASE);$(SOURCEBASE)\include;$(SOURCEBASE)\src\openvpn;$(SOURCEBASE)\src\compat;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + Level3 + + + $(SOURCEBASE);%(AdditionalIncludeDirectories) + + + Console fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -84,7 +134,26 @@ Console true true - MachineX86 + fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + MaxSpeed + $(SOURCEBASE);$(SOURCEBASE)\include;$(SOURCEBASE)\src\openvpn;$(SOURCEBASE)\src\compat;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;$(CPPFLAGS);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + + + $(SOURCEBASE);%(AdditionalIncludeDirectories) + + + Console + true + true fwpuclnt.lib;ntdll.lib;shlwapi.lib;netapi32.lib;userenv.lib;iphlpapi.lib;%(AdditionalDependencies)