diff options
| author | Raghavendra G <raghavendra@gluster.com> | 2010-01-27 06:57:16 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-01-28 06:11:41 -0800 |
| commit | 2d85ef645f3048419d905cfc9da10a28885a6775 (patch) | |
| tree | a59e601206554d8cd20555812d45a646a2b0a848 /transport/socket/src/socket.c | |
| parent | 6b8435359140cb08f9580a4a304ab4a070452f8f (diff) | |
transport/socket: guess an appropriate address family when it is not specified in configuration.v2.0.10rc1
Signed-off-by: Raghavendra G <raghavendra@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
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
Diffstat (limited to 'transport/socket/src/socket.c')
| -rw-r--r-- | transport/socket/src/socket.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/transport/socket/src/socket.c b/transport/socket/src/socket.c index 23d5661ec4f..b28212a5fde 100644 --- a/transport/socket/src/socket.c +++ b/transport/socket/src/socket.c @@ -971,13 +971,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; @@ -1119,13 +1114,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; } |