diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2012-05-13 07:43:32 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-06-01 22:20:18 -0700 |
| commit | 3dc56cbd16b1074d7ca1a4fe4c5bf44400eb63ff (patch) | |
| tree | 8e8a4ff69e3314f5d1fb96937442af30e2680704 /rpc/rpc-transport/rdma/src | |
| parent | 6aa52274afb95c0c79df23d8a2093fbd557935d2 (diff) | |
Use inet as default listener
This patch was proposed by Anand Babu Periasamy on gluster-devel@
It fixes the inet/inet6 mismatch between client/glusterfsd/glusterd at mine
BUG: 764655
Change-Id: I172570aa58ea08c4c74cfd28f121d3d4e02a55e0
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.com/3319
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: Anand Babu Periasamy <abperiasamy@gmail.com>
Reviewed-by: Anand Babu Periasamy <abperiasamy@gmail.com>
Diffstat (limited to 'rpc/rpc-transport/rdma/src')
| -rw-r--r-- | rpc/rpc-transport/rdma/src/name.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c index e5f7ba2cae5..3718cd7648e 100644 --- a/rpc/rpc-transport/rdma/src/name.c +++ b/rpc/rpc-transport/rdma/src/name.c @@ -153,13 +153,11 @@ client_fill_address_family (rpc_transport_t *this, struct sockaddr *sockaddr) sockaddr->sa_family = AF_INET6; } else if (!strcasecmp (address_family, "inet-sdp")) { sockaddr->sa_family = AF_INET_SDP; - } else if (!strcasecmp (address_family, "inet/inet6") - || !strcasecmp (address_family, "inet6/inet")) { - sockaddr->sa_family = AF_UNSPEC; } else { gf_log (this->name, GF_LOG_ERROR, "unknown address-family (%s) specified", address_family); + sockaddr->sa_family = AF_UNSPEC; return -1; } } @@ -521,21 +519,19 @@ gf_rdma_server_get_local_sockaddr (rpc_transport_t *this, addr->sa_family = AF_INET_SDP; } else if (!strcasecmp (address_family, "unix")) { addr->sa_family = AF_UNIX; - } else if (!strcasecmp (address_family, "inet/inet6") - || !strcasecmp (address_family, "inet6/inet")) { - addr->sa_family = AF_UNSPEC; } else { gf_log (this->name, GF_LOG_ERROR, "unknown address family (%s) specified", address_family); + addr->sa_family = AF_UNSPEC; ret = -1; goto err; } } else { gf_log (this->name, GF_LOG_DEBUG, "option address-family not specified, defaulting " - "to inet/inet6"); - addr->sa_family = AF_UNSPEC; + "to inet"); + addr->sa_family = AF_INET; } switch (addr->sa_family) |