Merge branch 'c++api' of github.com:ctiller/grpc into c++api

2 files changed, 8 insertions, 11 deletions

diff --git a/src/core/channel/connected_channel.c b/src/core/channel/connected_channel.c
index 61a6caf032..2d61d389e4 100644
--- a/src/core/channel/connected_channel.c
+++ b/src/core/channel/connected_channel.c
@@ -467,17 +467,11 @@ static void transport_goaway(void *user_data, grpc_transport *transport,
   /* transport got goaway ==> call up and handle it */
   grpc_channel_element *elem = user_data;
   channel_data *chand = elem->channel_data;
-  char *msg;
   grpc_channel_op op;
 
   GPR_ASSERT(elem->filter == &grpc_connected_channel_filter);
   GPR_ASSERT(chand->transport == transport);
 
-  msg = gpr_hexdump((const char *)GPR_SLICE_START_PTR(debug),
-                    GPR_SLICE_LENGTH(debug), GPR_HEXDUMP_PLAINTEXT);
-  gpr_log(GPR_DEBUG, "got goaway: status=%d, message=%s", status, msg);
-  gpr_free(msg);
-
   op.type = GRPC_TRANSPORT_GOAWAY;
   op.dir = GRPC_CALL_UP;
   op.data.goaway.status = status;
diff --git a/src/core/iomgr/tcp_server_posix.c b/src/core/iomgr/tcp_server_posix.c
index d8b180f7f0..a4c766eba4 100644
--- a/src/core/iomgr/tcp_server_posix.c
+++ b/src/core/iomgr/tcp_server_posix.c
@@ -75,7 +75,11 @@ typedef struct {
   int fd;
   grpc_fd *emfd;
   grpc_tcp_server *server;
-  gpr_uint8 addr[GRPC_MAX_SOCKADDR_SIZE];
+  union {
+    gpr_uint8 untyped[GRPC_MAX_SOCKADDR_SIZE];
+    struct sockaddr sockaddr;
+    struct sockaddr_un un;
+  } addr;
   int addr_len;
 } server_port;
 
@@ -125,9 +129,8 @@ void grpc_tcp_server_destroy(grpc_tcp_server *s) {
   /* delete ALL the things */
   for (i = 0; i < s->nports; i++) {
     server_port *sp = &s->ports[i];
-    if (((struct sockaddr *)sp->addr)->sa_family == AF_UNIX) {
-      struct sockaddr_un *un = (struct sockaddr_un *)sp->addr;
-      unlink(un->sun_path);
+    if (sp->addr.sockaddr.sa_family == AF_UNIX) {
+      unlink(sp->addr.un.sun_path);
     }
     grpc_fd_orphan(sp->emfd, NULL, NULL);
   }
@@ -273,7 +276,7 @@ static int add_socket_to_server(grpc_tcp_server *s, int fd,
     sp->server = s;
     sp->fd = fd;
     sp->emfd = grpc_fd_create(fd);
-    memcpy(sp->addr, addr, addr_len);
+    memcpy(sp->addr.untyped, addr, addr_len);
     sp->addr_len = addr_len;
     GPR_ASSERT(sp->emfd);
     gpr_mu_unlock(&s->mu);