Message ID | 20230109113046.1678-1-lstipakov@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [Openvpn-devel] tun: move print_windows_driver() out of tun.h | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> Thanks. Compile-tested on MinGW, it compiles and the warnings are gone. Your patch has been applied to the master and release/2.6 branch. commit a0eb1f764df39d9447b666e5a2cbd3aa01b41983 (master) commit 9dd0bfb5983fdfbbb9e1fe2195642fbc4cc5f200 (release/2.6) Author: Lev Stipakov Date: Mon Jan 9 13:30:46 2023 +0200 tun: move print_windows_driver() out of tun.h Signed-off-by: Lev Stipakov <lev@openvpn.net> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20230109113046.1678-1-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25923.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index a83ec9e6..6947312e 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -7028,6 +7028,25 @@ ipset2ascii_all(struct gc_arena *gc) return BSTR(&out); } +const char * +print_windows_driver(enum windows_driver_type windows_driver) +{ + switch (windows_driver) + { + case WINDOWS_DRIVER_TAP_WINDOWS6: + return "tap-windows6"; + + case WINDOWS_DRIVER_WINTUN: + return "wintun"; + + case WINDOWS_DRIVER_DCO: + return "ovpn-dco"; + + default: + return "unspecified"; + } +} + #else /* generic */ void diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 24d52670..ed22770a 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -661,24 +661,8 @@ tuntap_is_dco_win_timeout(struct tuntap *tt, int status) return tuntap_is_dco_win(tt) && (status < 0) && (openvpn_errno() == ERROR_NETNAME_DELETED); } -static const char * -print_windows_driver(enum windows_driver_type windows_driver) -{ - switch (windows_driver) - { - case WINDOWS_DRIVER_TAP_WINDOWS6: - return "tap-windows6"; - - case WINDOWS_DRIVER_WINTUN: - return "wintun"; - - case WINDOWS_DRIVER_DCO: - return "ovpn-dco"; - - default: - return "unspecified"; - } -} +const char * +print_windows_driver(enum windows_driver_type windows_driver); #else /* ifdef _WIN32 */