Merge pull request #197 from nicolasnoble/win32-sockets

Fixing some win32 sockets misuses

Makefile

@@ -1396,7 +1396,7 @@ LIBGRPC_SRC = \
     src/core/iomgr/pollset_multipoller_with_poll_posix.c \
     src/core/iomgr/pollset_posix.c \
     src/core/iomgr/pollset_windows.c \
-    src/core/iomgr/resolve_address_posix.c \
+    src/core/iomgr/resolve_address.c \
     src/core/iomgr/sockaddr_utils.c \
     src/core/iomgr/socket_utils_common_posix.c \
     src/core/iomgr/socket_utils_linux.c \
@@ -1515,7 +1515,7 @@ src/core/iomgr/pollset_kick_posix.c: $(OPENSSL_DEP)
 src/core/iomgr/pollset_multipoller_with_poll_posix.c: $(OPENSSL_DEP)
 src/core/iomgr/pollset_posix.c: $(OPENSSL_DEP)
 src/core/iomgr/pollset_windows.c: $(OPENSSL_DEP)
-src/core/iomgr/resolve_address_posix.c: $(OPENSSL_DEP)
+src/core/iomgr/resolve_address.c: $(OPENSSL_DEP)
 src/core/iomgr/sockaddr_utils.c: $(OPENSSL_DEP)
 src/core/iomgr/socket_utils_common_posix.c: $(OPENSSL_DEP)
 src/core/iomgr/socket_utils_linux.c: $(OPENSSL_DEP)
@@ -1655,7 +1655,7 @@ objs/$(CONFIG)/src/core/iomgr/pollset_kick_posix.o:
 objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/pollset_windows.o: 
-objs/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/resolve_address.o: 
 objs/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
 objs/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 
@@ -1815,7 +1815,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/iomgr/pollset_multipoller_with_poll_posix.c \
     src/core/iomgr/pollset_posix.c \
     src/core/iomgr/pollset_windows.c \
-    src/core/iomgr/resolve_address_posix.c \
+    src/core/iomgr/resolve_address.c \
     src/core/iomgr/sockaddr_utils.c \
     src/core/iomgr/socket_utils_common_posix.c \
     src/core/iomgr/socket_utils_linux.c \
@@ -1938,7 +1938,7 @@ objs/$(CONFIG)/src/core/iomgr/pollset_kick_posix.o:
 objs/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/pollset_windows.o: 
-objs/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
+objs/$(CONFIG)/src/core/iomgr/resolve_address.o: 
 objs/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
 objs/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 

build.json

@@ -129,7 +129,7 @@
         "src/core/iomgr/pollset_multipoller_with_poll_posix.c",
         "src/core/iomgr/pollset_posix.c",
         "src/core/iomgr/pollset_windows.c",
-        "src/core/iomgr/resolve_address_posix.c",
+        "src/core/iomgr/resolve_address.c",
         "src/core/iomgr/sockaddr_utils.c",
         "src/core/iomgr/socket_utils_common_posix.c",
         "src/core/iomgr/socket_utils_linux.c",

src/core/httpcli/httpcli.c

@@ -31,6 +31,7 @@
  *
  */
 
+#include "src/core/iomgr/sockaddr.h"
 #include "src/core/httpcli/httpcli.h"
 
 #include <string.h>

src/core/iomgr/resolve_address_posix.c → src/core/iomgr/resolve_address.c

@@ -33,17 +33,14 @@
 
 #define _POSIX_SOURCE
 
+#include "src/core/iomgr/sockaddr.h"
 #include "src/core/iomgr/resolve_address.h"
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <unistd.h>
 #include <string.h>
 
 #include "src/core/iomgr/iomgr_internal.h"
 #include "src/core/iomgr/sockaddr_utils.h"
-#include "src/core/iomgr/socket_utils_posix.h"
 #include "src/core/support/string.h"
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>

src/core/iomgr/sockaddr_posix.h

@@ -34,7 +34,11 @@
 #ifndef __GRPC_INTERNAL_IOMGR_SOCKADDR_POSIX_H_
 #define __GRPC_INTERNAL_IOMGR_SOCKADDR_POSIX_H_
 
+#include <arpa/inet.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <netdb.h>
+#include <unistd.h>
 
 #endif /* __GRPC_INTERNAL_IOMGR_SOCKADDR_POSIX_H_ */

src/core/iomgr/sockaddr_utils.c

@@ -33,7 +33,6 @@
 
 #include "src/core/iomgr/sockaddr_utils.h"
 
-#include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 

src/core/iomgr/sockaddr_win32.h

@@ -34,4 +34,6 @@
 #ifndef __GRPC_INTERNAL_IOMGR_SOCKADDR_WIN32_H_
 #define __GRPC_INTERNAL_IOMGR_SOCKADDR_WIN32_H_
 
+#include <ws2tcpip.h>
+
 #endif  // __GRPC_INTERNAL_IOMGR_SOCKADDR_WIN32_H_

src/core/surface/channel_create.c

@@ -31,6 +31,8 @@
  *
  */
 
+#include "src/core/iomgr/sockaddr.h"
+
 #include <grpc/grpc.h>
 
 #include <stdlib.h>

src/core/surface/secure_channel_create.c

@@ -31,6 +31,8 @@
  *
  */
 
+#include "src/core/iomgr/sockaddr.h"
+
 #include <grpc/grpc.h>
 
 #include <stdlib.h>

src/core/transport/metadata.c

@@ -31,6 +31,7 @@
  *
  */
 
+#include "src/core/iomgr/sockaddr.h"
 #include "src/core/transport/metadata.h"
 
 #include <stddef.h>

vsprojects/vs2013/grpc.vcxproj

@@ -258,7 +258,7 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\pollset_windows.c">
     </ClCompile>
-    <ClCompile Include="..\..\src\core\iomgr\resolve_address_posix.c">
+    <ClCompile Include="..\..\src\core\iomgr\resolve_address.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\sockaddr_utils.c">
     </ClCompile>

vsprojects/vs2013/grpc.vcxproj.filters

@@ -130,7 +130,7 @@
     <ClCompile Include="..\..\src\core\iomgr\pollset_windows.c">
       <Filter>src\core\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\iomgr\resolve_address_posix.c">
+    <ClCompile Include="..\..\src\core\iomgr\resolve_address.c">
       <Filter>src\core\iomgr</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\sockaddr_utils.c">

vsprojects/vs2013/grpc_unsecure.vcxproj

@@ -258,7 +258,7 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\pollset_windows.c">
     </ClCompile>
-    <ClCompile Include="..\..\src\core\iomgr\resolve_address_posix.c">
+    <ClCompile Include="..\..\src\core\iomgr\resolve_address.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\sockaddr_utils.c">
     </ClCompile>

vsprojects/vs2013/grpc_unsecure.vcxproj.filters

@@ -91,7 +91,7 @@
     <ClCompile Include="..\..\src\core\iomgr\pollset_windows.c">
       <Filter>src\core\iomgr</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\iomgr\resolve_address_posix.c">
+    <ClCompile Include="..\..\src\core\iomgr\resolve_address.c">
       <Filter>src\core\iomgr</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\sockaddr_utils.c">