Merge pull request #5755 from ahedberg/unix_sockets_optional
Make unix sockets optionalpull/5926/merge
Jan Tattermusch
9 years ago
commit
f1050f6f4a
27 changed files with 332 additions and 88 deletions
@ -0,0 +1,103 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* Copyright 2016, Google Inc. |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or without |
||||||
|
* modification, are permitted provided that the following conditions are |
||||||
|
* met: |
||||||
|
* |
||||||
|
* * Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* * Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following disclaimer |
||||||
|
* in the documentation and/or other materials provided with the |
||||||
|
* distribution. |
||||||
|
* * Neither the name of Google Inc. nor the names of its |
||||||
|
* contributors may be used to endorse or promote products derived from |
||||||
|
* this software without specific prior written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
* |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "src/core/iomgr/unix_sockets_posix.h" |
||||||
|
|
||||||
|
#ifdef GPR_HAVE_UNIX_SOCKET |
||||||
|
|
||||||
|
#include <string.h> |
||||||
|
#include <sys/types.h> |
||||||
|
#include <sys/stat.h> |
||||||
|
#include <sys/un.h> |
||||||
|
|
||||||
|
#include <grpc/support/alloc.h> |
||||||
|
|
||||||
|
void grpc_create_socketpair_if_unix(int sv[2]) { |
||||||
|
GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); |
||||||
|
} |
||||||
|
|
||||||
|
grpc_resolved_addresses *grpc_resolve_unix_domain_address(const char *name) { |
||||||
|
struct sockaddr_un *un; |
||||||
|
|
||||||
|
grpc_resolved_addresses *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); |
||||||
|
addrs->addrs->len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; |
||||||
|
return addrs; |
||||||
|
} |
||||||
|
|
||||||
|
int grpc_is_unix_socket(const struct sockaddr *addr) { |
||||||
|
return addr->sa_family == AF_UNIX; |
||||||
|
} |
||||||
|
|
||||||
|
void grpc_unlink_if_unix_domain_socket(const struct sockaddr *addr) { |
||||||
|
if (addr->sa_family != AF_UNIX) { |
||||||
|
return; |
||||||
|
} |
||||||
|
struct sockaddr_un *un = (struct sockaddr_un *)addr; |
||||||
|
struct stat st; |
||||||
|
|
||||||
|
if (stat(un->sun_path, &st) == 0 && (st.st_mode & S_IFMT) == S_IFSOCK) { |
||||||
|
unlink(un->sun_path); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
int grpc_parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { |
||||||
|
struct sockaddr_un *un = (struct sockaddr_un *)addr; |
||||||
|
|
||||||
|
un->sun_family = AF_UNIX; |
||||||
|
strcpy(un->sun_path, uri->path); |
||||||
|
*len = strlen(un->sun_path) + sizeof(un->sun_family) + 1; |
||||||
|
|
||||||
|
return 1; |
||||||
|
} |
||||||
|
|
||||||
|
char *grpc_unix_get_default_authority(grpc_resolver_factory *factory, |
||||||
|
grpc_uri *uri) { |
||||||
|
return gpr_strdup("localhost"); |
||||||
|
} |
||||||
|
|
||||||
|
char *grpc_sockaddr_to_uri_unix_if_possible(const struct sockaddr *addr) { |
||||||
|
if (addr->sa_family != AF_UNIX) { |
||||||
|
return NULL; |
||||||
|
} |
||||||
|
|
||||||
|
char *result; |
||||||
|
gpr_asprintf(&result, "unix:%s", ((struct sockaddr_un *)addr)->sun_path); |
||||||
|
return result; |
||||||
|
} |
||||||
|
|
||||||
|
#endif |
||||||
@ -0,0 +1,61 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* Copyright 2016, Google Inc. |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or without |
||||||
|
* modification, are permitted provided that the following conditions are |
||||||
|
* met: |
||||||
|
* |
||||||
|
* * Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* * Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following disclaimer |
||||||
|
* in the documentation and/or other materials provided with the |
||||||
|
* distribution. |
||||||
|
* * Neither the name of Google Inc. nor the names of its |
||||||
|
* contributors may be used to endorse or promote products derived from |
||||||
|
* this software without specific prior written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
* |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef GRPC_CORE_IOMGR_UNIX_SOCKETS_POSIX_H |
||||||
|
#define GRPC_CORE_IOMGR_UNIX_SOCKETS_POSIX_H |
||||||
|
|
||||||
|
#include <grpc/support/port_platform.h> |
||||||
|
|
||||||
|
#include <grpc/support/string_util.h> |
||||||
|
|
||||||
|
#include "src/core/client_config/resolver_factory.h" |
||||||
|
#include "src/core/client_config/uri_parser.h" |
||||||
|
#include "src/core/iomgr/resolve_address.h" |
||||||
|
#include "src/core/iomgr/sockaddr.h" |
||||||
|
|
||||||
|
void grpc_create_socketpair_if_unix(int sv[2]); |
||||||
|
|
||||||
|
grpc_resolved_addresses *grpc_resolve_unix_domain_address(const char *name); |
||||||
|
|
||||||
|
int grpc_is_unix_socket(const struct sockaddr *addr); |
||||||
|
|
||||||
|
void grpc_unlink_if_unix_domain_socket(const struct sockaddr *addr); |
||||||
|
|
||||||
|
int grpc_parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len); |
||||||
|
|
||||||
|
char *grpc_unix_get_default_authority(grpc_resolver_factory *factory, |
||||||
|
grpc_uri *uri); |
||||||
|
|
||||||
|
char *grpc_sockaddr_to_uri_unix_if_possible(const struct sockaddr *addr); |
||||||
|
|
||||||
|
#endif /* GRPC_CORE_IOMGR_UNIX_SOCKETS_POSIX_H */ |
||||||
@ -0,0 +1,61 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* Copyright 2016, Google Inc. |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or without |
||||||
|
* modification, are permitted provided that the following conditions are |
||||||
|
* met: |
||||||
|
* |
||||||
|
* * Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* * Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following disclaimer |
||||||
|
* in the documentation and/or other materials provided with the |
||||||
|
* distribution. |
||||||
|
* * Neither the name of Google Inc. nor the names of its |
||||||
|
* contributors may be used to endorse or promote products derived from |
||||||
|
* this software without specific prior written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||||
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||||
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||||
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||||
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||||
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||||
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
* |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "src/core/iomgr/unix_sockets_posix.h" |
||||||
|
|
||||||
|
#ifndef GPR_HAVE_UNIX_SOCKET |
||||||
|
|
||||||
|
void grpc_create_socketpair_if_unix(int sv[2]) {} |
||||||
|
|
||||||
|
grpc_resolved_addresses *grpc_resolve_unix_domain_address(const char *name) { |
||||||
|
return NULL; |
||||||
|
} |
||||||
|
|
||||||
|
int grpc_is_unix_socket(const struct sockaddr *addr) { return false; } |
||||||
|
|
||||||
|
void grpc_unlink_if_unix_domain_socket(const struct sockaddr *addr) {} |
||||||
|
|
||||||
|
int grpc_parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) { |
||||||
|
return 0; |
||||||
|
} |
||||||
|
|
||||||
|
char *grpc_unix_get_default_authority(grpc_resolver_factory *factory, |
||||||
|
grpc_uri *uri) { |
||||||
|
return NULL; |
||||||
|
} |
||||||
|
|
||||||
|
char *grpc_sockaddr_to_uri_unix_if_possible(const struct sockaddr *addr) { |
||||||
|
return NULL; |
||||||
|
} |
||||||
|
|
||||||
|
#endif |
||||||
Loading…
Reference in new issue