From c2686b8febf2c57761cfa9e47c8dc533f84d1cb2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 17 Sep 2011 18:58:30 +0200
Subject: socket: Move socket function to right location.

---
 src/connect.c | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'src/connect.c')

diff --git a/src/connect.c b/src/connect.c
index 963971c..a47c652 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -84,16 +84,6 @@
 #endif
 
 #ifdef _WIN32
-void ssh_sock_set_nonblocking(socket_t sock) {
-  u_long nonblocking = 1;
-  ioctlsocket(sock, FIONBIO, &nonblocking);
-}
-
-void ssh_sock_set_blocking(socket_t sock) {
-  u_long nonblocking = 0;
-  ioctlsocket(sock, FIONBIO, &nonblocking);
-}
-
 #ifndef gai_strerror
 char WSAAPI *gai_strerrorA(int code) {
   static char buf[256];
@@ -103,16 +93,6 @@ char WSAAPI *gai_strerrorA(int code) {
   return buf;
 }
 #endif /* gai_strerror */
-
-#else /* _WIN32 */
-void ssh_sock_set_nonblocking(socket_t sock) {
-  fcntl(sock, F_SETFL, O_NONBLOCK);
-}
-
-void ssh_sock_set_blocking(socket_t sock) {
-  fcntl(sock, F_SETFL, 0);
-}
-
 #endif /* _WIN32 */
 
 static int ssh_connect_socket_close(socket_t s){
@@ -168,7 +148,7 @@ static int ssh_connect_ai_timeout(ssh_session session, const char *host,
    */
   timeout_ms=timeout * 1000 + usec / 1000;
 
-  ssh_sock_set_nonblocking(s);
+  ssh_socket_set_nonblocking(s);
 
   ssh_log(session, SSH_LOG_RARE, "Trying to connect to host: %s:%d with "
       "timeout %d ms", host, port, timeout_ms);
@@ -215,7 +195,7 @@ static int ssh_connect_ai_timeout(ssh_session session, const char *host,
 
   /* s is connected ? */
   ssh_log(session, SSH_LOG_PACKET, "Socket connected with timeout\n");
-  ssh_sock_set_blocking(s);
+  ssh_socket_set_blocking(s);
 
   leave_function();
   return s;
@@ -385,7 +365,7 @@ socket_t ssh_connect_host_nonblocking(ssh_session session, const char *host,
         continue;
       }
     }
-    ssh_sock_set_nonblocking(s);
+    ssh_socket_set_nonblocking(s);
 
     connect(s, itr->ai_addr, itr->ai_addrlen);
     break;
-- 
cgit