Merge branch 'net' (early part)

2 files changed, 22 insertions, 3 deletions

diff --git a/include/libbb.h b/include/libbb.h
index e82954fd0..221837b64 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -484,7 +484,6 @@ void xlisten(int s, int backlog) FAST_FUNC;
 void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen) FAST_FUNC;
 ssize_t xsendto(int s, const void *buf, size_t len, const struct sockaddr *to,
                                 socklen_t tolen) FAST_FUNC;
-#if !ENABLE_PLATFORM_MINGW32
 /* SO_REUSEADDR allows a server to rebind to an address that is already
  * "in use" by old connections to e.g. previous server instance which is
  * killed or crashed. Without it bind will fail until all such connections
@@ -597,7 +596,6 @@ ssize_t recv_from_to(int fd, void *buf, size_t len, int flags,
                 struct sockaddr *from,
                 struct sockaddr *to,
                 socklen_t sa_size) FAST_FUNC;
-#endif
 
 
 char *xstrdup(const char *s) FAST_FUNC RETURNS_MALLOC;
diff --git a/include/mingw.h b/include/mingw.h
index 85c97b702..8927b1362 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -15,6 +15,7 @@ typedef int pid_t;
  */
 static inline unsigned int git_ntohl(unsigned int x) { return (unsigned int)ntohl(x); }
 #define ntohl git_ntohl
+int inet_aton(const char *cp, struct in_addr *inp);
 
 /*
  * fcntl.h
@@ -48,6 +49,19 @@ static inline void endgrent(void) {}
 #define NAME_MAX 255
 #define MAXSYMLINKS 20
 
+/*
+ * netdb.h
+ */
+
+typedef int sa_family_t;
+
+/*
+ * linux/un.h
+ */
+struct sockaddr_un {
+        sa_family_t sun_family;
+        char sun_path[1]; /* to make compiler happy, don't bother */
+};
 
 /*
  * poll.h
@@ -173,7 +187,13 @@ NOIMPL(ioctl,int fd UNUSED_PARAM, int code UNUSED_PARAM,...);
  */
 #define hstrerror strerror
 
-NOIMPL(mingw_socket,int domain UNUSED_PARAM, int type UNUSED_PARAM, int protocol UNUSED_PARAM);
+#ifdef CONFIG_WIN32_NET
+int mingw_socket(int domain, int type, int protocol);
+int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz);
+
+# define socket mingw_socket
+# define connect mingw_connect
+#endif
 NOIMPL(mingw_sendto,SOCKET s UNUSED_PARAM, const char *buf UNUSED_PARAM, int len UNUSED_PARAM, int flags UNUSED_PARAM, const struct sockaddr *sa UNUSED_PARAM, int salen UNUSED_PARAM);
 NOIMPL(mingw_listen,SOCKET s UNUSED_PARAM,int backlog UNUSED_PARAM);
 NOIMPL(mingw_bind,SOCKET s UNUSED_PARAM,const struct sockaddr* sa UNUSED_PARAM,int salen UNUSED_PARAM);
@@ -349,3 +369,4 @@ void free_environ(char **env);
 char **env_setenv(char **env, const char *name);
 
 const char *get_busybox_exec_path(void);
+void init_winsock(void);