From d5a99855229542c149a91e4bb688442488f3c8c1 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 24 Jan 2015 01:27:48 -0800 Subject: [PATCH] Fixing a few winsocket misuses. --- Makefile | 10 +++++----- build.json | 2 +- src/core/httpcli/httpcli.c | 1 + .../{resolve_address_posix.c => resolve_address.c} | 5 +---- src/core/iomgr/sockaddr_posix.h | 4 ++++ src/core/iomgr/sockaddr_utils.c | 1 - src/core/iomgr/sockaddr_win32.h | 2 ++ src/core/surface/channel_create.c | 2 ++ src/core/surface/secure_channel_create.c | 2 ++ src/core/transport/metadata.c | 1 + vsprojects/vs2013/grpc.vcxproj | 2 +- vsprojects/vs2013/grpc.vcxproj.filters | 2 +- vsprojects/vs2013/grpc_unsecure.vcxproj | 2 +- vsprojects/vs2013/grpc_unsecure.vcxproj.filters | 2 +- 14 files changed, 23 insertions(+), 15 deletions(-) rename src/core/iomgr/{resolve_address_posix.c => resolve_address.c} (98%) diff --git a/Makefile b/Makefile index dff032fa65c..f4bb942b527 100644 --- a/Makefile +++ b/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: diff --git a/build.json b/build.json index 1884ed22cb8..4416c3fdd49 100644 --- a/build.json +++ b/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", diff --git a/src/core/httpcli/httpcli.c b/src/core/httpcli/httpcli.c index d6fd8ca8658..acd9fa7b55b 100644 --- a/src/core/httpcli/httpcli.c +++ b/src/core/httpcli/httpcli.c @@ -31,6 +31,7 @@ * */ +#include "src/core/iomgr/sockaddr.h" #include "src/core/httpcli/httpcli.h" #include diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address.c similarity index 98% rename from src/core/iomgr/resolve_address_posix.c rename to src/core/iomgr/resolve_address.c index f80eea7f46e..01681168ce4 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/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 -#include -#include -#include #include #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 #include diff --git a/src/core/iomgr/sockaddr_posix.h b/src/core/iomgr/sockaddr_posix.h index 79ef3ca3cf3..53c80386d43 100644 --- a/src/core/iomgr/sockaddr_posix.h +++ b/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 #include +#include #include +#include +#include #endif /* __GRPC_INTERNAL_IOMGR_SOCKADDR_POSIX_H_ */ diff --git a/src/core/iomgr/sockaddr_utils.c b/src/core/iomgr/sockaddr_utils.c index 5bb11242843..07bf7b3a35c 100644 --- a/src/core/iomgr/sockaddr_utils.c +++ b/src/core/iomgr/sockaddr_utils.c @@ -33,7 +33,6 @@ #include "src/core/iomgr/sockaddr_utils.h" -#include #include #include diff --git a/src/core/iomgr/sockaddr_win32.h b/src/core/iomgr/sockaddr_win32.h index 751ac3d2e7b..cdea33fec07 100644 --- a/src/core/iomgr/sockaddr_win32.h +++ b/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 + #endif // __GRPC_INTERNAL_IOMGR_SOCKADDR_WIN32_H_ diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 6939b92c60c..d3faf0c996a 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -31,6 +31,8 @@ * */ +#include "src/core/iomgr/sockaddr.h" + #include #include diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index a231b2708e6..defee797666 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -31,6 +31,8 @@ * */ +#include "src/core/iomgr/sockaddr.h" + #include #include diff --git a/src/core/transport/metadata.c b/src/core/transport/metadata.c index 6881b871ecb..74bbb02134d 100644 --- a/src/core/transport/metadata.c +++ b/src/core/transport/metadata.c @@ -31,6 +31,7 @@ * */ +#include "src/core/iomgr/sockaddr.h" #include "src/core/transport/metadata.h" #include diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index 8249272f78c..be72b6c8212 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -258,7 +258,7 @@ - + diff --git a/vsprojects/vs2013/grpc.vcxproj.filters b/vsprojects/vs2013/grpc.vcxproj.filters index ad3f1aece0b..4f03c14b767 100644 --- a/vsprojects/vs2013/grpc.vcxproj.filters +++ b/vsprojects/vs2013/grpc.vcxproj.filters @@ -130,7 +130,7 @@ src\core\iomgr - + src\core\iomgr diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj b/vsprojects/vs2013/grpc_unsecure.vcxproj index 8249272f78c..be72b6c8212 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj @@ -258,7 +258,7 @@ - + diff --git a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters index 636e95fbacc..a7ba173dcc0 100644 --- a/vsprojects/vs2013/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vs2013/grpc_unsecure.vcxproj.filters @@ -91,7 +91,7 @@ src\core\iomgr - + src\core\iomgr