Merge #62

#62: windows/console: Use select() on session socket for read detection r=townsend2010 a=Saviq
canonical · Nov 15, 2018 · ae206af · ae206af
2 parents f39ef22 + 2674d0d
commit ae206af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/platform/console/windows_console.cpp b/src/platform/console/windows_console.cpp
@@ -19,6 +19,8 @@
 
 #include <multipass/cli/client_platform.h>
 
+#include <winsock2.h>
+
 #include <array>
 #include <mutex>
 
@@ -82,6 +84,7 @@ mp::WindowsConsole::WindowsConsole(ssh_channel channel)
       input_handle{GetStdHandle(STD_INPUT_HANDLE)},
       output_handle{GetStdHandle(STD_OUTPUT_HANDLE)},
       channel{channel},
+      session_socket_fd{ssh_get_fd(ssh_channel_get_session(channel))},
       console_event_thread{[this] { monitor_console_resize(hook); }}
 {
     global_channel = channel;
@@ -107,7 +110,7 @@ void mp::WindowsConsole::setup_console()
 
 void mp::WindowsConsole::read_console()
 {
-    std::array<char, 1024> buffer;
+    std::array<char, 4096> buffer;
     int bytes_read{0};
 
     FlushConsoleInputBuffer(input_handle);
@@ -120,10 +123,14 @@ void mp::WindowsConsole::read_console()
 void mp::WindowsConsole::write_console()
 {
     DWORD write;
-    std::array<char, 1024> buffer;
+    std::array<char, 4096> buffer;
     int num_bytes{0};
+    fd_set read_set;
+
+    FD_ZERO(&read_set);
+    FD_SET(session_socket_fd, &read_set);
 
-    if (ssh_channel_poll(channel, 0) < 1)
+    if (select(0, &read_set, nullptr, nullptr, nullptr) < 1)
         return;
 
     {

diff --git a/src/platform/console/windows_console.h b/src/platform/console/windows_console.h
@@ -47,6 +47,7 @@ class WindowsConsole final : public Console
     DWORD console_input_mode;
     DWORD console_output_mode;
     ssh_channel channel;
+    socket_t session_socket_fd;
     HWINEVENTHOOK hook;
     std::thread console_event_thread;
 };

diff --git a/src/ssh/ssh_client.cpp b/src/ssh/ssh_client.cpp
@@ -75,7 +75,6 @@ int mp::SSHClient::exec(const std::vector<std::string>& args)
 
 void mp::SSHClient::handle_ssh_events()
 {
-    using ConnectorUPtr = std::unique_ptr<ssh_connector_struct, void (*)(ssh_connector)>;
 #ifndef MULTIPASS_PLATFORM_WINDOWS
     using ConnectorUPtr = std::unique_ptr<ssh_connector_struct, void (*)(ssh_connector)>;
     std::unique_ptr<ssh_event_struct, void (*)(ssh_event)> event{ssh_event_new(), ssh_event_free};