[Openvpn-devel,7/7] tun.c: reword the at_least_one_tap_win() error

Message ID 20191219223917.1614-7-simon@rozman.si
State Changes Requested
Headers show
Series [Openvpn-devel,1/7] tun.c: make Windows device lookup functions more general | expand

Commit Message

Simon Rozman Dec. 19, 2019, 11:39 a.m. UTC
Signed-off-by: Simon Rozman <simon@rozman.si>
---
 src/openvpn/tun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lev Stipakov Dec. 20, 2019, 1:06 a.m. UTC | #1
Makes sense, since we now support both tap-windows and wintun.

Acked-by: Lev Stipakov <lstipakov@gmail.com>

pe 20. jouluk. 2019 klo 0.40 Simon Rozman (simon@rozman.si) kirjoitti:

> Signed-off-by: Simon Rozman <simon@rozman.si>
> ---
>  src/openvpn/tun.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
> index 8508b9c0..14ff0259 100644
> --- a/src/openvpn/tun.c
> +++ b/src/openvpn/tun.c
> @@ -4031,7 +4031,7 @@ 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 -> TAP-Windows -> Utilities -> Add a new TAP-Windows virtual
> ethernet adapter.");
> +        msg(M_FATAL, "There are no TAP-Windows nor Wintun adapters on
> this system.  You should be able to create an adapter by using tapctl.exe
> utility.");
>      }
>  }
>
> --
> 2.24.1.windows.2
>
>
>
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
>

Patch

diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 8508b9c0..14ff0259 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -4031,7 +4031,7 @@  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 -> TAP-Windows -> Utilities -> Add a new TAP-Windows virtual ethernet adapter.");
+        msg(M_FATAL, "There are no TAP-Windows nor Wintun adapters on this system.  You should be able to create an adapter by using tapctl.exe utility.");
     }
 }