Revert "Use openvpn_io::detail::socket_type instead of "int""

This reverts commit 8f7fdd1.
schwabe · Nov 30, 2023 · 7f2e42c · 7f2e42c
1 parent c5d37c4
commit 7f2e42c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/client/ovpncli.cpp b/client/ovpncli.cpp
@@ -271,7 +271,7 @@ class MySocketProtect : public SocketProtect
         rg_local = rg_local_arg;
     }
 
-    bool socket_protect(openvpn_io::detail::socket_type socket, IP::Addr endpoint) override
+    bool socket_protect(int socket, IP::Addr endpoint) override
     {
         if (parent)
         {
@@ -801,7 +801,7 @@ OPENVPN_CLIENT_EXPORT Status OpenVPNClient::provide_creds(const ProvideCreds &cr
     return ret;
 }
 
-OPENVPN_CLIENT_EXPORT bool OpenVPNClient::socket_protect(openvpn_io::detail::socket_type socket, std::string remote, bool ipv6)
+OPENVPN_CLIENT_EXPORT bool OpenVPNClient::socket_protect(int socket, std::string remote, bool ipv6)
 {
     return true;
 }

diff --git a/client/ovpncli.hpp b/client/ovpncli.hpp
@@ -607,7 +607,7 @@ class OpenVPNClient : public TunBuilderBase,             // expose tun builder v
     // Callback to "protect" a socket from being routed through the tunnel.
     // Will be called from the thread executing connect().
     // The remote and ipv6 are the remote host this socket will connect to
-    virtual bool socket_protect(openvpn_io::detail::socket_type socket, std::string remote, bool ipv6);
+    virtual bool socket_protect(int socket, std::string remote, bool ipv6);
 
     // Primary VPN client connect method, doesn't return until disconnect.
     // Should be called by a worker thread.  This method will make callbacks

diff --git a/openvpn/asio/asiopolysock.hpp b/openvpn/asio/asiopolysock.hpp
@@ -86,7 +86,7 @@ class Base : public RC<thread_unsafe_refcount>
     {
     }
 
-    virtual openvpn_io::detail::socket_type native_handle()
+    virtual int native_handle()
     {
         return -1;
     }
@@ -216,7 +216,7 @@ struct TCP : public Base
         return false;
     }
 
-    virtual openvpn_io::detail::socket_type native_handle() override
+    virtual int native_handle() override
     {
         return socket.native_handle();
     }
@@ -320,7 +320,7 @@ struct Unix : public Base
         return true;
     }
 
-    virtual openvpn_io::detail::socket_type native_handle() override
+    virtual int native_handle() override
     {
         return socket.native_handle();
     }

diff --git a/openvpn/omi/openvpn.cpp b/openvpn/omi/openvpn.cpp
@@ -69,7 +69,7 @@ class Client : public ClientAPI::OpenVPNClient
     }
 
   private:
-    bool socket_protect(openvpn_io::detail::socket_type socket, std::string remote, bool ipv6) override
+    bool socket_protect(int socket, std::string remote, bool ipv6) override
     {
         return true;
     }

diff --git a/openvpn/transport/client/tcpcli.hpp b/openvpn/transport/client/tcpcli.hpp
@@ -171,7 +171,7 @@ class Client : public TransportClient, AsyncResolvableTCP
         return server_endpoint.port();
     }
 
-    openvpn_io::detail::socket_type native_handle() override
+    int native_handle() override
     {
         return socket.native_handle();
     }

diff --git a/openvpn/transport/client/transbase.hpp b/openvpn/transport/client/transbase.hpp
@@ -59,7 +59,7 @@ struct TransportClient : public virtual RC<thread_unsafe_refcount>
     {
         return 0;
     }
-    virtual openvpn_io::detail::socket_type native_handle()
+    virtual int native_handle()
     {
         return 0;
     }

diff --git a/openvpn/transport/client/udpcli.hpp b/openvpn/transport/client/udpcli.hpp
@@ -171,7 +171,7 @@ class Client : public TransportClient, AsyncResolvableUDP
         return server_endpoint.port();
     }
 
-    openvpn_io::detail::socket_type native_handle() override
+    int native_handle() override
     {
         return socket.native_handle();
     }

diff --git a/openvpn/transport/socket_protect.hpp b/openvpn/transport/socket_protect.hpp
@@ -35,7 +35,7 @@ namespace openvpn {
 class BaseSocketProtect
 {
   public:
-    virtual bool socket_protect(openvpn_io::detail::socket_type socket, IP::Addr endpoint) = 0;
+    virtual bool socket_protect(int socket, IP::Addr endpoint) = 0;
 };
 
 #ifdef OPENVPN_PLATFORM_UWP

diff --git a/test/ovpncli/cli.cpp b/test/ovpncli/cli.cpp
@@ -189,7 +189,7 @@ class ClientBase : public ClientAPI::OpenVPNClient
         tun->destroy(os);
     }
 
-    bool socket_protect([[maybe_unused]] openvpn_io::detail::socket_type socket, std::string remote, bool ipv6) override
+    bool socket_protect([[maybe_unused]] int socket, std::string remote, bool ipv6) override
     {
         std::ostringstream os;
         auto os_print = Cleanup([&os]()
@@ -205,7 +205,7 @@ class ClientBase : public ClientAPI::OpenVPNClient
 class ClientBase : public ClientAPI::OpenVPNClient
 {
   public:
-    bool socket_protect(openvpn_io::detail::socket_type socket, std::string remote, bool ipv6) override
+    bool socket_protect(int socket, std::string remote, bool ipv6) override
     {
         std::cout << "NOT IMPLEMENTED: *** socket_protect " << socket << " " << remote << std::endl;
         return true;