From 15b3f715ac6c7dc127723908f269f0418b61de71 Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Wed, 27 Jan 2010 07:19:43 +0000 Subject: transport/socket: guess an appropriate address family when it is not specified in configuration. Signed-off-by: Raghavendra G Signed-off-by: Anand V. Avati BUG: 561 (with address family set to 'inet-sdp', transport/socket doesn't work correctly) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=561 --- transport/socket/src/socket.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'transport/socket/src/socket.c') diff --git a/transport/socket/src/socket.c b/transport/socket/src/socket.c index 151ce3c9350..15a69c1b7e8 100644 --- a/transport/socket/src/socket.c +++ b/transport/socket/src/socket.c @@ -995,13 +995,8 @@ socket_connect (transport_t *this) goto err; } - ret = client_fill_address_family (this, &sa_family); - if (ret == -1) { - goto err; - } - ret = socket_client_get_remote_sockaddr (this, SA (&sockaddr), - &sockaddr_len); + &sockaddr_len, &sa_family); if (ret == -1) { /* logged inside client_get_remote_sockaddr */ goto err; @@ -1140,13 +1135,8 @@ socket_listen (transport_t *this) return ret; } - ret = server_fill_address_family (this, &sa_family); - if (ret == -1) { - return ret; - } - ret = socket_server_get_local_sockaddr (this, SA (&sockaddr), - &sockaddr_len); + &sockaddr_len, &sa_family); if (ret == -1) { return ret; } -- cgit