Merge branch 'net' (early part)

2 files changed, 55 insertions, 0 deletions

diff --git a/win32/Kbuild b/win32/Kbuild
index a4a7f32d4..bc005c23a 100644
--- a/win32/Kbuild
+++ b/win32/Kbuild
@@ -9,5 +9,6 @@ lib-$(CONFIG_PLATFORM_MINGW32) += fnmatch.o
 lib-$(CONFIG_PLATFORM_MINGW32) += mingw.o
 lib-$(CONFIG_PLATFORM_MINGW32) += process.o
 lib-$(CONFIG_PLATFORM_MINGW32) += regex.o
+lib-$(CONFIG_WIN32_NET) += net.o
 lib-$(CONFIG_PLATFORM_MINGW32) += termios.o
 lib-$(CONFIG_PLATFORM_MINGW32) += winansi.o
diff --git a/win32/net.c b/win32/net.c
new file mode 100644
index 000000000..eadda6b69
--- /dev/null
+++ b/win32/net.c
@@ -0,0 +1,54 @@
+#include "libbb.h"
+
+int inet_aton(const char *cp, struct in_addr *inp)
+{
+        unsigned long val = inet_addr(cp);
+
+        if (val == INADDR_NONE)
+                return 0;
+        inp->S_un.S_addr = val;
+        return 1;
+}
+
+void init_winsock(void)
+{
+        WSADATA wsa;
+        if (WSAStartup(MAKEWORD(2,2), &wsa))
+                bb_error_msg_and_die("unable to initialize winsock subsystem, error %d",
+                                     WSAGetLastError());
+        atexit((void(*)(void)) WSACleanup); /* may conflict with other atexit? */
+}
+
+int mingw_socket(int domain, int type, int protocol)
+{
+        int sockfd;
+        SOCKET s = WSASocket(domain, type, protocol, NULL, 0, 0);
+        if (s == INVALID_SOCKET) {
+                /*
+                 * WSAGetLastError() values are regular BSD error codes
+                 * biased by WSABASEERR.
+                 * However, strerror() does not know about networking
+                 * specific errors, which are values beginning at 38 or so.
+                 * Therefore, we choose to leave the biased error code
+                 * in errno so that _if_ someone looks up the code somewhere,
+                 * then it is at least the number that are usually listed.
+                 */
+                errno = WSAGetLastError();
+                return -1;
+        }
+        /* convert into a file descriptor */
+        if ((sockfd = _open_osfhandle(s, O_RDWR|O_BINARY)) < 0) {
+                closesocket(s);
+                bb_error_msg("unable to make a socket file descriptor: %s",
+                             strerror(errno));
+                return -1;
+        }
+        return sockfd;
+}
+
+#undef connect
+int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz)
+{
+        SOCKET s = (SOCKET)_get_osfhandle(sockfd);
+        return connect(s, sa, sz);
+}