| Message ID | 20191219223917.1614-6-simon@rozman.si |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [Openvpn-devel,1/7] tun.c: make Windows device lookup functions more general | expand |
Hi, @@ -688,7 +688,10 @@ x_check_status(int status, > } > #elif defined(_WIN32) > /* get possible driver error from TAP-Windows driver */ > - extended_msg = tap_win_getinfo(tt, &gc); > + if (!tt->wintun) > + { > + extended_msg = tap_win_getinfo(tt, &gc); > + } > What if we make error.c device type agnostic and move that check into tun.c, tap_win_getinfo(): const char * tap_win_getinfo(const struct tuntap *tt, struct gc_arena *gc) { if (tuntap_defined(tt) && !tuntap_is_wintun(tt)) { /* get debug log from tap-windows6 */ -Lev <div dir="ltr"><div dir="ltr">Hi,<div><br></div></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">@@ -688,7 +688,10 @@ x_check_status(int status,<br> }<br> #elif defined(_WIN32)<br> /* get possible driver error from TAP-Windows driver */<br> - extended_msg = tap_win_getinfo(tt, &gc);<br> + if (!tt->wintun)<br> + {<br> + extended_msg = tap_win_getinfo(tt, &gc);<br> + }<br></blockquote><div><br></div><div><br></div><div>What if we make error.c device type agnostic and move that check into tun.c, tap_win_getinfo():</div><div><br></div><div> const char *<br> tap_win_getinfo(const struct tuntap *tt, struct gc_arena *gc)<br> {<br> if (tuntap_defined(tt) && !tuntap_is_wintun(tt))<br> {<br></div><div> /* get debug log from tap-windows6 */</div><div><br></div><div>-Lev</div></div></div>
diff --git a/src/openvpn/error.c b/src/openvpn/error.c index b2492f2b..8d91a131 100644 --- a/src/openvpn/error.c +++ b/src/openvpn/error.c @@ -688,7 +688,10 @@ x_check_status(int status, } #elif defined(_WIN32) /* get possible driver error from TAP-Windows driver */ - extended_msg = tap_win_getinfo(tt, &gc); + if (!tt->wintun) + { + extended_msg = tap_win_getinfo(tt, &gc); + } #endif if (!ignore_sys_error(my_errno)) { diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 6b823613..2bc9d871 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1956,7 +1956,7 @@ pre_select(struct context *c) if (check_debug_level(D_TAP_WIN_DEBUG)) { c->c2.timeval.tv_sec = 1; - if (tuntap_defined(c->c1.tuntap)) + if (tuntap_defined(c->c1.tuntap) && !c->c1.tuntap->wintun) { tun_show_debug(c->c1.tuntap); } diff --git a/src/openvpn/sig.c b/src/openvpn/sig.c index d7f2abb8..f02aa57c 100644 --- a/src/openvpn/sig.c +++ b/src/openvpn/sig.c @@ -315,7 +315,7 @@ print_status(const struct context *c, struct status_output *so) status_printf(so, "Post-decrypt truncations," counter_format, c->c2.n_trunc_post_decrypt); #endif #ifdef _WIN32 - if (tuntap_defined(c->c1.tuntap)) + if (tuntap_defined(c->c1.tuntap) && !c->c1.tuntap->wintun) { status_printf(so, "TAP-WIN32 driver status,\"%s\"", tap_win_getinfo(c->c1.tuntap, &gc));
Wintun doesn't have its own I/O device. Rather, it taps on existing Windows-provided NDIS device. Sending TAP-Windows6 IOCTL requests to it is risky, as TAP-Windows6 is using one of the well-known device types (FILE_DEVICE_UNKNOWN) with function IDs as 1, 2, 3 etc. raising a chance of collision as NDIS might react to one of these IOCTLs. Signed-off-by: Simon Rozman <simon@rozman.si> --- src/openvpn/error.c | 5 ++++- src/openvpn/forward.c | 2 +- src/openvpn/sig.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)