diff options
author | 2016-03-23 14:57:52 -0700 | |
---|---|---|
committer | 2016-03-23 14:57:52 -0700 | |
commit | 995bc78441cbd58fe026644265c204d2a2a7551b (patch) | |
tree | dfa81e4a49ab5b77c0313c9acc6b09a260aafb43 /src/core/iomgr/resolve_address_posix.c | |
parent | e5b19fe84f0c4b473872632553b3cf5b21e82e60 (diff) | |
parent | 634e67617b3b445185b5485f493b591b53b35d9d (diff) |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'src/core/iomgr/resolve_address_posix.c')
-rw-r--r-- | src/core/iomgr/resolve_address_posix.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index a6c9893f23..26b3aa8189 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -39,7 +39,6 @@ #include <string.h> #include <sys/types.h> -#include <sys/un.h> #include <grpc/support/alloc.h> #include <grpc/support/host_port.h> @@ -51,6 +50,7 @@ #include "src/core/iomgr/executor.h" #include "src/core/iomgr/iomgr_internal.h" #include "src/core/iomgr/sockaddr_utils.h" +#include "src/core/iomgr/unix_sockets_posix.h" #include "src/core/support/block_annotate.h" #include "src/core/support/string.h" @@ -71,18 +71,10 @@ static grpc_resolved_addresses *blocking_resolve_address_impl( int s; size_t i; grpc_resolved_addresses *addrs = NULL; - struct sockaddr_un *un; if (name[0] == 'u' && name[1] == 'n' && name[2] == 'i' && name[3] == 'x' && name[4] == ':' && name[5] != 0) { - addrs = gpr_malloc(sizeof(grpc_resolved_addresses)); - addrs->naddrs = 1; - addrs->addrs = gpr_malloc(sizeof(grpc_resolved_address)); - un = (struct sockaddr_un *)addrs->addrs->addr; - un->sun_family = AF_UNIX; - strcpy(un->sun_path, name + 5); - addrs->addrs->len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; - return addrs; + return grpc_resolve_unix_domain_address(name + 5); } /* parse name, splitting it into host and port parts */ |