grpc 1.7.3 → 1.8.0

data/src/core/lib/iomgr/sockaddr_windows.h

@@ -19,10 +19,16 @@
 #ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H
 #define GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H
 
+#include "src/core/lib/iomgr/port.h"
+
+#ifdef GRPC_WINSOCK_SOCKET
+
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
 // must be included after the above
 #include <mswsock.h>
 
+#endif
+
 #endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H */

data/src/core/lib/iomgr/{socket_factory_posix.c → socket_factory_posix.cc}

@@ -27,28 +27,28 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/useful.h>
 
-void grpc_socket_factory_init(grpc_socket_factory *factory,
-                              const grpc_socket_factory_vtable *vtable) {
+void grpc_socket_factory_init(grpc_socket_factory* factory,
+                              const grpc_socket_factory_vtable* vtable) {
   factory->vtable = vtable;
   gpr_ref_init(&factory->refcount, 1);
 }
 
-int grpc_socket_factory_socket(grpc_socket_factory *factory, int domain,
+int grpc_socket_factory_socket(grpc_socket_factory* factory, int domain,
                                int type, int protocol) {
   return factory->vtable->socket(factory, domain, type, protocol);
 }
 
-int grpc_socket_factory_bind(grpc_socket_factory *factory, int sockfd,
-                             const grpc_resolved_address *addr) {
+int grpc_socket_factory_bind(grpc_socket_factory* factory, int sockfd,
+                             const grpc_resolved_address* addr) {
   return factory->vtable->bind(factory, sockfd, addr);
 }
 
-int grpc_socket_factory_compare(grpc_socket_factory *a,
-                                grpc_socket_factory *b) {
+int grpc_socket_factory_compare(grpc_socket_factory* a,
+                                grpc_socket_factory* b) {
   int c = GPR_ICMP(a, b);
   if (c != 0) {
-    grpc_socket_factory *sma = a;
-    grpc_socket_factory *smb = b;
+    grpc_socket_factory* sma = a;
+    grpc_socket_factory* smb = b;
     c = GPR_ICMP(sma->vtable, smb->vtable);
     if (c == 0) {
       c = sma->vtable->compare(sma, smb);
@@ -57,35 +57,35 @@ int grpc_socket_factory_compare(grpc_socket_factory *a,
   return c;
 }
 
-grpc_socket_factory *grpc_socket_factory_ref(grpc_socket_factory *factory) {
+grpc_socket_factory* grpc_socket_factory_ref(grpc_socket_factory* factory) {
   gpr_ref(&factory->refcount);
   return factory;
 }
 
-void grpc_socket_factory_unref(grpc_socket_factory *factory) {
+void grpc_socket_factory_unref(grpc_socket_factory* factory) {
   if (gpr_unref(&factory->refcount)) {
     factory->vtable->destroy(factory);
   }
 }
 
-static void *socket_factory_arg_copy(void *p) {
-  return grpc_socket_factory_ref((grpc_socket_factory *)p);
+static void* socket_factory_arg_copy(void* p) {
+  return grpc_socket_factory_ref((grpc_socket_factory*)p);
 }
 
-static void socket_factory_arg_destroy(grpc_exec_ctx *exec_ctx, void *p) {
-  grpc_socket_factory_unref((grpc_socket_factory *)p);
+static void socket_factory_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) {
+  grpc_socket_factory_unref((grpc_socket_factory*)p);
 }
 
-static int socket_factory_cmp(void *a, void *b) {
-  return grpc_socket_factory_compare((grpc_socket_factory *)a,
-                                     (grpc_socket_factory *)b);
+static int socket_factory_cmp(void* a, void* b) {
+  return grpc_socket_factory_compare((grpc_socket_factory*)a,
+                                     (grpc_socket_factory*)b);
 }
 
 static const grpc_arg_pointer_vtable socket_factory_arg_vtable = {
     socket_factory_arg_copy, socket_factory_arg_destroy, socket_factory_cmp};
 
-grpc_arg grpc_socket_factory_to_arg(grpc_socket_factory *factory) {
-  return grpc_channel_arg_pointer_create((char *)GRPC_ARG_SOCKET_FACTORY,
+grpc_arg grpc_socket_factory_to_arg(grpc_socket_factory* factory) {
+  return grpc_channel_arg_pointer_create((char*)GRPC_ARG_SOCKET_FACTORY,
                                          factory, &socket_factory_arg_vtable);
 }
 

data/src/core/lib/iomgr/socket_factory_posix.h

@@ -30,43 +30,43 @@ extern "C" {
 /** The virtual table of grpc_socket_factory */
 typedef struct {
   /** Replacement for socket(2) */
-  int (*socket)(grpc_socket_factory *factory, int domain, int type,
+  int (*socket)(grpc_socket_factory* factory, int domain, int type,
                 int protocol);
   /** Replacement for bind(2) */
-  int (*bind)(grpc_socket_factory *factory, int sockfd,
-              const grpc_resolved_address *addr);
+  int (*bind)(grpc_socket_factory* factory, int sockfd,
+              const grpc_resolved_address* addr);
   /** Compare socket factory \a a and \a b */
-  int (*compare)(grpc_socket_factory *a, grpc_socket_factory *b);
+  int (*compare)(grpc_socket_factory* a, grpc_socket_factory* b);
   /** Destroys the socket factory instance */
-  void (*destroy)(grpc_socket_factory *factory);
+  void (*destroy)(grpc_socket_factory* factory);
 } grpc_socket_factory_vtable;
 
 /** The Socket Factory interface allows changes on socket options */
 struct grpc_socket_factory {
-  const grpc_socket_factory_vtable *vtable;
+  const grpc_socket_factory_vtable* vtable;
   gpr_refcount refcount;
 };
 
 /** called by concrete implementations to initialize the base struct */
-void grpc_socket_factory_init(grpc_socket_factory *factory,
-                              const grpc_socket_factory_vtable *vtable);
+void grpc_socket_factory_init(grpc_socket_factory* factory,
+                              const grpc_socket_factory_vtable* vtable);
 
 /** Wrap \a factory as a grpc_arg */
-grpc_arg grpc_socket_factory_to_arg(grpc_socket_factory *factory);
+grpc_arg grpc_socket_factory_to_arg(grpc_socket_factory* factory);
 
 /** Perform the equivalent of a socket(2) operation using \a factory */
-int grpc_socket_factory_socket(grpc_socket_factory *factory, int domain,
+int grpc_socket_factory_socket(grpc_socket_factory* factory, int domain,
                                int type, int protocol);
 
 /** Perform the equivalent of a bind(2) operation using \a factory */
-int grpc_socket_factory_bind(grpc_socket_factory *factory, int sockfd,
-                             const grpc_resolved_address *addr);
+int grpc_socket_factory_bind(grpc_socket_factory* factory, int sockfd,
+                             const grpc_resolved_address* addr);
 
 /** Compare if \a a and \a b are the same factory or have same settings */
-int grpc_socket_factory_compare(grpc_socket_factory *a, grpc_socket_factory *b);
+int grpc_socket_factory_compare(grpc_socket_factory* a, grpc_socket_factory* b);
 
-grpc_socket_factory *grpc_socket_factory_ref(grpc_socket_factory *factory);
-void grpc_socket_factory_unref(grpc_socket_factory *factory);
+grpc_socket_factory* grpc_socket_factory_ref(grpc_socket_factory* factory);
+void grpc_socket_factory_unref(grpc_socket_factory* factory);
 
 #ifdef __cplusplus
 }

data/src/core/lib/iomgr/{socket_mutator.c → socket_mutator.cc}

@@ -24,27 +24,27 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/useful.h>
 
-void grpc_socket_mutator_init(grpc_socket_mutator *mutator,
-                              const grpc_socket_mutator_vtable *vtable) {
+void grpc_socket_mutator_init(grpc_socket_mutator* mutator,
+                              const grpc_socket_mutator_vtable* vtable) {
   mutator->vtable = vtable;
   gpr_ref_init(&mutator->refcount, 1);
 }
 
-grpc_socket_mutator *grpc_socket_mutator_ref(grpc_socket_mutator *mutator) {
+grpc_socket_mutator* grpc_socket_mutator_ref(grpc_socket_mutator* mutator) {
   gpr_ref(&mutator->refcount);
   return mutator;
 }
 
-bool grpc_socket_mutator_mutate_fd(grpc_socket_mutator *mutator, int fd) {
+bool grpc_socket_mutator_mutate_fd(grpc_socket_mutator* mutator, int fd) {
   return mutator->vtable->mutate_fd(fd, mutator);
 }
 
-int grpc_socket_mutator_compare(grpc_socket_mutator *a,
-                                grpc_socket_mutator *b) {
+int grpc_socket_mutator_compare(grpc_socket_mutator* a,
+                                grpc_socket_mutator* b) {
   int c = GPR_ICMP(a, b);
   if (c != 0) {
-    grpc_socket_mutator *sma = a;
-    grpc_socket_mutator *smb = b;
+    grpc_socket_mutator* sma = a;
+    grpc_socket_mutator* smb = b;
     c = GPR_ICMP(sma->vtable, smb->vtable);
     if (c == 0) {
       c = sma->vtable->compare(sma, smb);
@@ -53,29 +53,29 @@ int grpc_socket_mutator_compare(grpc_socket_mutator *a,
   return c;
 }
 
-void grpc_socket_mutator_unref(grpc_socket_mutator *mutator) {
+void grpc_socket_mutator_unref(grpc_socket_mutator* mutator) {
   if (gpr_unref(&mutator->refcount)) {
     mutator->vtable->destory(mutator);
   }
 }
 
-static void *socket_mutator_arg_copy(void *p) {
-  return grpc_socket_mutator_ref((grpc_socket_mutator *)p);
+static void* socket_mutator_arg_copy(void* p) {
+  return grpc_socket_mutator_ref((grpc_socket_mutator*)p);
 }
 
-static void socket_mutator_arg_destroy(grpc_exec_ctx *exec_ctx, void *p) {
-  grpc_socket_mutator_unref((grpc_socket_mutator *)p);
+static void socket_mutator_arg_destroy(grpc_exec_ctx* exec_ctx, void* p) {
+  grpc_socket_mutator_unref((grpc_socket_mutator*)p);
 }
 
-static int socket_mutator_cmp(void *a, void *b) {
-  return grpc_socket_mutator_compare((grpc_socket_mutator *)a,
-                                     (grpc_socket_mutator *)b);
+static int socket_mutator_cmp(void* a, void* b) {
+  return grpc_socket_mutator_compare((grpc_socket_mutator*)a,
+                                     (grpc_socket_mutator*)b);
 }
 
 static const grpc_arg_pointer_vtable socket_mutator_arg_vtable = {
     socket_mutator_arg_copy, socket_mutator_arg_destroy, socket_mutator_cmp};
 
-grpc_arg grpc_socket_mutator_to_arg(grpc_socket_mutator *mutator) {
-  return grpc_channel_arg_pointer_create((char *)GRPC_ARG_SOCKET_MUTATOR,
+grpc_arg grpc_socket_mutator_to_arg(grpc_socket_mutator* mutator) {
+  return grpc_channel_arg_pointer_create((char*)GRPC_ARG_SOCKET_MUTATOR,
                                          mutator, &socket_mutator_arg_vtable);
 }

data/src/core/lib/iomgr/socket_mutator.h

@@ -31,34 +31,34 @@ extern "C" {
 /** The virtual table of grpc_socket_mutator */
 typedef struct {
   /** Mutates the socket opitons of \a fd */
-  bool (*mutate_fd)(int fd, grpc_socket_mutator *mutator);
+  bool (*mutate_fd)(int fd, grpc_socket_mutator* mutator);
   /** Compare socket mutator \a a and \a b */
-  int (*compare)(grpc_socket_mutator *a, grpc_socket_mutator *b);
+  int (*compare)(grpc_socket_mutator* a, grpc_socket_mutator* b);
   /** Destroys the socket mutator instance */
-  void (*destory)(grpc_socket_mutator *mutator);
+  void (*destory)(grpc_socket_mutator* mutator);
 } grpc_socket_mutator_vtable;
 
 /** The Socket Mutator interface allows changes on socket options */
 struct grpc_socket_mutator {
-  const grpc_socket_mutator_vtable *vtable;
+  const grpc_socket_mutator_vtable* vtable;
   gpr_refcount refcount;
 };
 
 /** called by concrete implementations to initialize the base struct */
-void grpc_socket_mutator_init(grpc_socket_mutator *mutator,
-                              const grpc_socket_mutator_vtable *vtable);
+void grpc_socket_mutator_init(grpc_socket_mutator* mutator,
+                              const grpc_socket_mutator_vtable* vtable);
 
 /** Wrap \a mutator as a grpc_arg */
-grpc_arg grpc_socket_mutator_to_arg(grpc_socket_mutator *mutator);
+grpc_arg grpc_socket_mutator_to_arg(grpc_socket_mutator* mutator);
 
 /** Perform the file descriptor mutation operation of \a mutator on \a fd */
-bool grpc_socket_mutator_mutate_fd(grpc_socket_mutator *mutator, int fd);
+bool grpc_socket_mutator_mutate_fd(grpc_socket_mutator* mutator, int fd);
 
 /** Compare if \a a and \a b are the same mutator or have same settings */
-int grpc_socket_mutator_compare(grpc_socket_mutator *a, grpc_socket_mutator *b);
+int grpc_socket_mutator_compare(grpc_socket_mutator* a, grpc_socket_mutator* b);
 
-grpc_socket_mutator *grpc_socket_mutator_ref(grpc_socket_mutator *mutator);
-void grpc_socket_mutator_unref(grpc_socket_mutator *mutator);
+grpc_socket_mutator* grpc_socket_mutator_ref(grpc_socket_mutator* mutator);
+void grpc_socket_mutator_unref(grpc_socket_mutator* mutator);
 
 #ifdef __cplusplus
 }

data/src/core/lib/iomgr/socket_utils.h

@@ -21,7 +21,15 @@
 
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* A wrapper for inet_ntop on POSIX systems and InetNtop on Windows systems */
-const char *grpc_inet_ntop(int af, const void *src, char *dst, size_t size);
+const char* grpc_inet_ntop(int af, const void* src, char* dst, size_t size);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* GRPC_CORE_LIB_IOMGR_SOCKET_UTILS_H */

data/src/core/lib/iomgr/{socket_utils_common_posix.c → socket_utils_common_posix.cc}

@@ -44,7 +44,7 @@
 #include "src/core/lib/support/string.h"
 
 /* set a socket to non blocking mode */
-grpc_error *grpc_set_socket_nonblocking(int fd, int non_blocking) {
+grpc_error* grpc_set_socket_nonblocking(int fd, int non_blocking) {
   int oldflags = fcntl(fd, F_GETFL, 0);
   if (oldflags < 0) {
     return GRPC_OS_ERROR(errno, "fcntl");
@@ -63,7 +63,7 @@ grpc_error *grpc_set_socket_nonblocking(int fd, int non_blocking) {
   return GRPC_ERROR_NONE;
 }
 
-grpc_error *grpc_set_socket_no_sigpipe_if_possible(int fd) {
+grpc_error* grpc_set_socket_no_sigpipe_if_possible(int fd) {
 #ifdef GRPC_HAVE_SO_NOSIGPIPE
   int val = 1;
   int newval;
@@ -81,7 +81,7 @@ grpc_error *grpc_set_socket_no_sigpipe_if_possible(int fd) {
   return GRPC_ERROR_NONE;
 }
 
-grpc_error *grpc_set_socket_ip_pktinfo_if_possible(int fd) {
+grpc_error* grpc_set_socket_ip_pktinfo_if_possible(int fd) {
 #ifdef GRPC_HAVE_IP_PKTINFO
   int get_local_ip = 1;
   if (0 != setsockopt(fd, IPPROTO_IP, IP_PKTINFO, &get_local_ip,
@@ -92,7 +92,7 @@ grpc_error *grpc_set_socket_ip_pktinfo_if_possible(int fd) {
   return GRPC_ERROR_NONE;
 }
 
-grpc_error *grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd) {
+grpc_error* grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd) {
 #ifdef GRPC_HAVE_IPV6_RECVPKTINFO
   int get_local_ip = 1;
   if (0 != setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &get_local_ip,
@@ -103,14 +103,14 @@ grpc_error *grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd) {
   return GRPC_ERROR_NONE;
 }
 
-grpc_error *grpc_set_socket_sndbuf(int fd, int buffer_size_bytes) {
+grpc_error* grpc_set_socket_sndbuf(int fd, int buffer_size_bytes) {
   return 0 == setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buffer_size_bytes,
                          sizeof(buffer_size_bytes))
              ? GRPC_ERROR_NONE
              : GRPC_OS_ERROR(errno, "setsockopt(SO_SNDBUF)");
 }
 
-grpc_error *grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes) {
+grpc_error* grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes) {
   return 0 == setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &buffer_size_bytes,
                          sizeof(buffer_size_bytes))
              ? GRPC_ERROR_NONE
@@ -118,7 +118,7 @@ grpc_error *grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes) {
 }
 
 /* set a socket to close on exec */
-grpc_error *grpc_set_socket_cloexec(int fd, int close_on_exec) {
+grpc_error* grpc_set_socket_cloexec(int fd, int close_on_exec) {
   int oldflags = fcntl(fd, F_GETFD, 0);
   if (oldflags < 0) {
     return GRPC_OS_ERROR(errno, "fcntl");
@@ -138,7 +138,7 @@ grpc_error *grpc_set_socket_cloexec(int fd, int close_on_exec) {
 }
 
 /* set a socket to reuse old addresses */
-grpc_error *grpc_set_socket_reuse_addr(int fd, int reuse) {
+grpc_error* grpc_set_socket_reuse_addr(int fd, int reuse) {
   int val = (reuse != 0);
   int newval;
   socklen_t intlen = sizeof(newval);
@@ -156,7 +156,7 @@ grpc_error *grpc_set_socket_reuse_addr(int fd, int reuse) {
 }
 
 /* set a socket to reuse old addresses */
-grpc_error *grpc_set_socket_reuse_port(int fd, int reuse) {
+grpc_error* grpc_set_socket_reuse_port(int fd, int reuse) {
 #ifndef SO_REUSEPORT
   return GRPC_ERROR_CREATE_FROM_STATIC_STRING(
       "SO_REUSEPORT unavailable on compiling system");
@@ -179,7 +179,7 @@ grpc_error *grpc_set_socket_reuse_port(int fd, int reuse) {
 }
 
 /* disable nagle */
-grpc_error *grpc_set_socket_low_latency(int fd, int low_latency) {
+grpc_error* grpc_set_socket_low_latency(int fd, int low_latency) {
   int val = (low_latency != 0);
   int newval;
   socklen_t intlen = sizeof(newval);
@@ -196,7 +196,7 @@ grpc_error *grpc_set_socket_low_latency(int fd, int low_latency) {
 }
 
 /* set a socket using a grpc_socket_mutator */
-grpc_error *grpc_set_socket_with_mutator(int fd, grpc_socket_mutator *mutator) {
+grpc_error* grpc_set_socket_with_mutator(int fd, grpc_socket_mutator* mutator) {
   GPR_ASSERT(mutator);
   if (!grpc_socket_mutator_mutate_fd(mutator, fd)) {
     return GRPC_ERROR_CREATE_FROM_STATIC_STRING("grpc_socket_mutator failed.");
@@ -217,7 +217,7 @@ static void probe_ipv6_once(void) {
     memset(&addr, 0, sizeof(addr));
     addr.sin6_family = AF_INET6;
     addr.sin6_addr.s6_addr[15] = 1; /* [::1]:0 */
-    if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == 0) {
+    if (bind(fd, (struct sockaddr*)&addr, sizeof(addr)) == 0) {
       g_ipv6_loopback_available = 1;
     } else {
       gpr_log(GPR_INFO,
@@ -249,35 +249,35 @@ static int set_socket_dualstack(int fd) {
   }
 }
 
-static grpc_error *error_for_fd(int fd, const grpc_resolved_address *addr) {
+static grpc_error* error_for_fd(int fd, const grpc_resolved_address* addr) {
   if (fd >= 0) return GRPC_ERROR_NONE;
-  char *addr_str;
+  char* addr_str;
   grpc_sockaddr_to_string(&addr_str, addr, 0);
-  grpc_error *err = grpc_error_set_str(GRPC_OS_ERROR(errno, "socket"),
+  grpc_error* err = grpc_error_set_str(GRPC_OS_ERROR(errno, "socket"),
                                        GRPC_ERROR_STR_TARGET_ADDRESS,
                                        grpc_slice_from_copied_string(addr_str));
   gpr_free(addr_str);
   return err;
 }
 
-grpc_error *grpc_create_dualstack_socket(
-    const grpc_resolved_address *resolved_addr, int type, int protocol,
-    grpc_dualstack_mode *dsmode, int *newfd) {
-  return grpc_create_dualstack_socket_using_factory(NULL, resolved_addr, type,
-                                                    protocol, dsmode, newfd);
+grpc_error* grpc_create_dualstack_socket(
+    const grpc_resolved_address* resolved_addr, int type, int protocol,
+    grpc_dualstack_mode* dsmode, int* newfd) {
+  return grpc_create_dualstack_socket_using_factory(
+      nullptr, resolved_addr, type, protocol, dsmode, newfd);
 }
 
-static int create_socket(grpc_socket_factory *factory, int domain, int type,
+static int create_socket(grpc_socket_factory* factory, int domain, int type,
                          int protocol) {
-  return (factory != NULL)
+  return (factory != nullptr)
              ? grpc_socket_factory_socket(factory, domain, type, protocol)
              : socket(domain, type, protocol);
 }
 
-grpc_error *grpc_create_dualstack_socket_using_factory(
-    grpc_socket_factory *factory, const grpc_resolved_address *resolved_addr,
-    int type, int protocol, grpc_dualstack_mode *dsmode, int *newfd) {
-  const struct sockaddr *addr = (const struct sockaddr *)resolved_addr->addr;
+grpc_error* grpc_create_dualstack_socket_using_factory(
+    grpc_socket_factory* factory, const grpc_resolved_address* resolved_addr,
+    int type, int protocol, grpc_dualstack_mode* dsmode, int* newfd) {
+  const struct sockaddr* addr = (const struct sockaddr*)resolved_addr->addr;
   int family = addr->sa_family;
   if (family == AF_INET6) {
     if (grpc_ipv6_loopback_available()) {
@@ -292,7 +292,7 @@ grpc_error *grpc_create_dualstack_socket_using_factory(
       return GRPC_ERROR_NONE;
     }
     /* If this isn't an IPv4 address, then return whatever we've got. */
-    if (!grpc_sockaddr_is_v4mapped(resolved_addr, NULL)) {
+    if (!grpc_sockaddr_is_v4mapped(resolved_addr, nullptr)) {
       *dsmode = GRPC_DSMODE_IPV6;
       return error_for_fd(*newfd, resolved_addr);
     }
@@ -307,7 +307,7 @@ grpc_error *grpc_create_dualstack_socket_using_factory(
   return error_for_fd(*newfd, resolved_addr);
 }
 
-const char *grpc_inet_ntop(int af, const void *src, char *dst, size_t size) {
+const char* grpc_inet_ntop(int af, const void* src, char* dst, size_t size) {
   GPR_ASSERT(size <= (socklen_t)-1);
   return inet_ntop(af, src, dst, (socklen_t)size);
 }