diff options
| author |  Hongwei Wang <hongweiw@google.com> | 2015-07-27 16:46:30 -0700 |
|---|---|---|
| committer | Hongwei Wang <hongweiw@google.com> | 2015-07-27 16:46:30 -0700 |
| commit | e3f12a91faacf2f6eb6a624440a3e37149c000b4 (patch) | |
| tree | 10d0c162828e141f2027ebe473f2ef5580cb7715 /src/core/surface/init.c | |
| parent | 6e732ea17f684a58773d3489074763d44d1813af (diff) | |
| parent | 0ff8e0514adbd99f73724299c166b3e54ec29bfe (diff) | |
Merge branch 'iomgr-refcounting' of https://github.com/nicolasnoble/grpc into zookeeper
Diffstat (limited to 'src/core/surface/init.c')
| -rw-r--r-- | src/core/surface/init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/surface/init.c b/src/core/surface/init.c index aa2ec5a0d7..c7a42db7dd 100644 --- a/src/core/surface/init.c +++ b/src/core/surface/init.c @@ -42,6 +42,7 @@ #include "src/core/channel/channel_stack.h" #include "src/core/client_config/resolver_registry.h" #include "src/core/client_config/resolvers/dns_resolver.h" +#include "src/core/client_config/resolvers/sockaddr_resolver.h" #include "src/core/debug/trace.h" #include "src/core/iomgr/iomgr.h" #include "src/core/profiling/timers.h" @@ -50,10 +51,6 @@ #include "src/core/surface/surface_trace.h" #include "src/core/transport/chttp2_transport.h" -#ifdef GPR_POSIX_SOCKET -#include "src/core/client_config/resolvers/unix_resolver_posix.h" -#endif - static gpr_once g_basic_init = GPR_ONCE_INIT; static gpr_mu g_init_mu; static int g_initializations; @@ -95,6 +92,8 @@ void grpc_init(void) { gpr_time_init(); grpc_resolver_registry_init("dns:///"); grpc_register_resolver_type("dns", grpc_dns_resolver_factory_create()); + grpc_register_resolver_type("ipv4", grpc_ipv4_resolver_factory_create()); + grpc_register_resolver_type("ipv6", grpc_ipv6_resolver_factory_create()); #ifdef GPR_POSIX_SOCKET grpc_register_resolver_type("unix", grpc_unix_resolver_factory_create()); #endif |