Skip to contentSkip to conversation

Correct error text when no Windows TAP device is present

PATCH In review Josh Cepek 3 participants 3 messages Aug 22, 2013

lore
Share & tools
lore

Josh Cepek

author
#0 lore raw

PATCH 1/1 Correct error text when no Windows TAP device is present

Patch/description attached; this resolves bug #320.

On an unrelated note, I'm trying out OpenPGP/MIME (RFCs 4880 & 3156) in this submission since it appears the only non-broken way to sign patches. Sane clients should eat this fine (Outlook Express may not.) If this poses a particular problem for you or an archiving service (sf.net, gmane, etc) I'd like to know about it.

--
Josh Cepek

From 24be21ea2f1d02631685a0a11bf187372cf10fa4 Mon Sep 17 00:00:00 2001
From: Josh Cepek <[email protected]...>
Date: Wed, 21 Aug 2013 16:20:30 -0500
Subject: [PATCH] Correct error text when no Windows TAP device is present

Starting with the 2.3-series, the TAP-Windows driver/utilities and OpenVPN are separately installed components. The error message given to users without available TAP devices uses the pre-2.3 path that does not exist. The path should be listed under the TAP-Windows program group that the tap-windows project installer uses.

Resolves bug #320

---
 src/openvpn/tun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/tun.c +1 -1
index f0ea2c4..86a43f2 100644
@@ -3403,7 +3403,7 @@ static void
 at_least_one_tap_win (const struct tap_reg *tap_reg)
 {
   if (!tap_reg)
-    msg (M_FATAL, "There are no TAP-Windows adapters on this system.  You should be able to create a TAP-Windows adapter by going to Start -> All Programs -> " PACKAGE_NAME " -> Add a new TAP-Windows virtual ethernet adapter.");
+    msg (M_FATAL, "There are no TAP-Windows adapters on this system.  You should be able to create a TAP-Windows adapter by going to Start -> All Programs -> TAP-Windows -> Utilities -> Add a new TAP-Windows virtual ethernet adapter.");
 }
 
 /*
Signature · 1 line
1.8.1.5
#1 lore raw
Quoted 1 line · Josh Cepek

Patch/description attached; this resolves bug #320.

ACK to patch 24be21ea2f1d02631685a0a11bf187372cf10fa4 in the attachement.

Quoted 5 lines

On an unrelated note, I'm trying out OpenPGP/MIME (RFCs 4880 & 3156) in this submission since it appears the only non-broken way to sign patches. Sane clients should eat this fine (Outlook Express may not.) If this poses a particular problem for you or an archiving service (sf.net, gmane, etc) I'd like to know about it.

I've had issues without PGP/MIME as well, mostly due to bad wrapping. Not sure if that was issues caused by GPG, Engimail or Thunderbird. I've used PGP/MIME here for quite some time now without any complaints.

Other than that, I usually just use 'git send-email' when sending patches to the mailing list. It makes the patch submission easier, and you avoid MUAs messing up the content.

Signature · 3 lines
kind regards,

David Sommerseth
#2 lore raw
In reply to Josh Cepek

Your patch has been applied to the master and release/2.3 branches.

commit 2d34628af995676c8ecddb953897c334b96a6a6b (master) commit 4276540e698d18838f62e2b06c7b875a55a37f77 (2.3)

Author: Josh Cepek
Date:   Wed Aug 21 16:20:30 2013 -0500
     Correct error text when no Windows TAP device is present

     Signed-off-by: Josh Cepek <[email protected]...>
     Acked-by: David Sommerseth <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/7825
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering