diff options
| author | Raghavendra G <raghavendra@gluster.com> | 2010-01-22 02:47:11 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-01-22 05:21:43 -0800 |
| commit | dc7448e508fdba87d161be7695a2c449f2cb573d (patch) | |
| tree | ce229feb4818589b51b31cd26d6ff50b4e5bdf4a /transport/socket/src/socket.c | |
| parent | 813f9870d558512c377d4a116284d8abb58e9e63 (diff) | |
transport/socket: use appropriate address family macro when address family is inet-sdp.
- sa_family should be set to AF_INET_SDP only during call to socket system
call. For all other calls, sa_family should be AF_INET.
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 | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/transport/socket/src/socket.c b/transport/socket/src/socket.c index cd8427a888f..23d5661ec4f 100644 --- a/transport/socket/src/socket.c +++ b/transport/socket/src/socket.c @@ -947,6 +947,7 @@ socket_connect (transport_t *this) socklen_t sockaddr_len = 0; glusterfs_ctx_t *ctx = NULL; int on = 1; + sa_family_t sa_family = {0, }; priv = this->private; ctx = this->xl->ctx; @@ -970,6 +971,11 @@ 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); if (ret == -1) { @@ -988,9 +994,7 @@ socket_connect (transport_t *this) memcpy (&this->peerinfo.sockaddr, &sockaddr, sockaddr_len); this->peerinfo.sockaddr_len = sockaddr_len; - priv->sock = socket (SA (&sockaddr)->sa_family, - SOCK_STREAM, 0); - + priv->sock = socket (sa_family, SOCK_STREAM, 0); if (priv->sock == -1) { gf_log (this->xl->name, GF_LOG_ERROR, "socket creation failed (%s)", @@ -1097,6 +1101,7 @@ socket_listen (transport_t *this) peer_info_t *myinfo = NULL; glusterfs_ctx_t *ctx = NULL; int on = 1; + sa_family_t sa_family = {0, }; priv = this->private; myinfo = &this->myinfo; @@ -1114,9 +1119,13 @@ 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); - if (ret == -1) { return ret; } @@ -1132,9 +1141,7 @@ socket_listen (transport_t *this) memcpy (&myinfo->sockaddr, &sockaddr, sockaddr_len); myinfo->sockaddr_len = sockaddr_len; - priv->sock = socket (SA (&sockaddr)->sa_family, - SOCK_STREAM, 0); - + priv->sock = socket (sa_family, SOCK_STREAM, 0); if (priv->sock == -1) { gf_log (this->xl->name, GF_LOG_ERROR, "socket creation failed (%s)", |