From 3c20c8427f0062c88cb90bac3c345addc8bbfb73 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Thu, 6 Feb 2014 16:24:25 +0100 Subject: Clean up some weirdness with the gf_resolve inet defines Change-Id: I6bf6101aa0b5d6624891a8ebed2ac1fec2e11e1c Reviewed-on: http://review.gluster.org/6948 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Anand Avati --- libglusterfs/src/common-utils.h | 3 ++- rpc/rpc-transport/socket/src/name.c | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index e3b019b9e..f877590f4 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -115,7 +115,8 @@ typedef int (*gf_cmp) (void *, void *); void gf_global_variable_init(void); -in_addr_t gf_resolve_ip (const char *hostname, void **dnscache); +int32_t gf_resolve_ip6 (const char *hostname, uint16_t port, int family, + void **dnscache, struct addrinfo **addr_info); void gf_log_dump_graph (FILE *specfp, glusterfs_graph_t *graph); void gf_print_trace (int32_t signal, glusterfs_ctx_t *ctx); diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index c6eae9739..f731bab4b 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -23,13 +23,6 @@ #include "socket.h" #include "common-utils.h" -int32_t -gf_resolve_ip6 (const char *hostname, - uint16_t port, - int family, - void **dnscache, - struct addrinfo **addr_info); - static int32_t af_inet_bind_to_port_lt_ceiling (int fd, struct sockaddr *sockaddr, socklen_t sockaddr_len, int ceiling) -- cgit