win32: fix networking problems

The subprocess that handles incoming connections for httpd didn't
work.  It has an accepted connection on stdin and calls getpeername()
to obtain its details, but getpeername() didn't initialise networking.

ssl_client only seems to deal with file descriptors.  Expose
init_winsock() again and call it from ssl_client.

3 files changed, 6 insertions, 2 deletions

diff --git a/include/mingw.h b/include/mingw.h
index fa8f705b0..e2d6299b9 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -509,6 +509,7 @@ void qsort_string_vector_case(char **sv, unsigned count) FAST_FUNC;
  */
 
 const char *get_busybox_exec_path(void);
+void init_winsock(void);
 void init_codepage(void);
 
 int has_bat_suffix(const char *p);
diff --git a/networking/ssl_client.c b/networking/ssl_client.c
index cd0ee5722..27575a2bf 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -64,6 +64,7 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
         else {
                 if (!hstr || sscanf(hstr, "%p", &h) != 1)
                         bb_error_msg_and_die("invalid handle");
+                init_winsock();
                 tls->ifd = tls->ofd = _open_osfhandle((intptr_t)h, _O_RDWR|_O_BINARY);
         }
 #endif
diff --git a/win32/net.c b/win32/net.c
index 880b807b7..33dc837fa 100644
--- a/win32/net.c
+++ b/win32/net.c
@@ -10,7 +10,7 @@ int inet_aton(const char *cp, struct in_addr *inp)
         return 1;
 }
 
-static void init_winsock(void)
+void init_winsock(void)
 {
         WSADATA wsa;
         static int initialized = 0;
@@ -134,8 +134,10 @@ int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
 #undef getpeername
 int mingw_getpeername(int fd, struct sockaddr *sa, socklen_t *sz)
 {
-        SOCKET sock = (SOCKET)_get_osfhandle(fd);
+        SOCKET sock;
 
+        init_winsock();
+        sock = (SOCKET)_get_osfhandle(fd);
         if (sock == INVALID_SOCKET) {
                 errno = EBADF;
                 return -1;