diff options
author | Craig Tiller <ctiller@google.com> | 2015-07-10 11:17:28 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-07-10 11:17:28 -0700 |
commit | 2a3ec16a32030b1aa1e8e1dab3a15698f70ddcd5 (patch) | |
tree | 987c28b3ce655525e3c8371ec9da086a6e7116df /src/core/iomgr/socket_windows.c | |
parent | 1199bfb27eb713fe5376786fe9f6dca71d288a5d (diff) | |
parent | d8539f0132d31f7e6b9c19d0772b8bb1768dae18 (diff) |
Merge branch 'master' into release-0_10
Diffstat (limited to 'src/core/iomgr/socket_windows.c')
-rw-r--r-- | src/core/iomgr/socket_windows.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c index fbf3fdc949..897408ded2 100644 --- a/src/core/iomgr/socket_windows.c +++ b/src/core/iomgr/socket_windows.c @@ -45,11 +45,14 @@ #include "src/core/iomgr/socket_windows.h" grpc_winsocket *grpc_winsocket_create(SOCKET socket, const char *name) { + char *final_name; grpc_winsocket *r = gpr_malloc(sizeof(grpc_winsocket)); memset(r, 0, sizeof(grpc_winsocket)); r->socket = socket; gpr_mu_init(&r->state_mu); - grpc_iomgr_register_object(&r->iomgr_object, name); + gpr_asprintf(&final_name, "%s:socket=0x%p", name, r); + grpc_iomgr_register_object(&r->iomgr_object, final_name); + gpr_free(final_name); grpc_iocp_add_socket(r); return r; } |