diff options
| -rw-r--r-- | rpc/rpc-lib/src/rpc-transport.c | 16 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-transport.h | 1 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/name.c | 6 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 3 |
4 files changed, 25 insertions, 1 deletions
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c index 87011470b89..3db73f652bb 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -575,6 +575,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name) int32_t ret = -1; int8_t is_tcp = 0, is_unix = 0, is_ibsdp = 0; volume_opt_list_t *vol_opt = NULL; + gf_boolean_t client_bind_insecure = _gf_false; GF_VALIDATE_OR_GOTO("rpc-transport", options, fail); GF_VALIDATE_OR_GOTO("rpc-transport", ctx, fail); @@ -639,6 +640,21 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name) } } + ret = dict_get_str (options, "client-bind-insecure", &type); + if (ret == 0) { + ret = gf_string2boolean (type, &client_bind_insecure); + if (ret < 0) { + gf_log ("rcp-transport", GF_LOG_WARNING, + "client-bind-insecure option %s is not a" + " valid bool option", type); + goto fail; + } + if (_gf_true == client_bind_insecure) + trans->client_bind_insecure = 1; + } else { + trans->client_bind_insecure = 0; + } + ret = dict_get_str (options, "transport-type", &type); if (ret < 0) { gf_log ("rpc-transport", GF_LOG_ERROR, diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h index e6883885757..59bec99fd4e 100644 --- a/rpc/rpc-lib/src/rpc-transport.h +++ b/rpc/rpc-lib/src/rpc-transport.h @@ -211,6 +211,7 @@ struct rpc_transport { uint64_t total_bytes_write; struct list_head list; + int client_bind_insecure; }; struct rpc_transport_ops { diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 3bbf31010ae..45d01111ea2 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -437,8 +437,12 @@ client_bind (rpc_transport_t *this, *sockaddr_len = sizeof (struct sockaddr_in); case AF_INET6: - ret = af_inet_bind_to_port_lt_ceiling (sock, sockaddr, + if (this->client_bind_insecure) { + ret = bind (sock, sockaddr, *sockaddr_len); + } else { + ret = af_inet_bind_to_port_lt_ceiling (sock, sockaddr, *sockaddr_len, CLIENT_PORT_CEILING); + } if (ret == -1) { gf_log (this->name, GF_LOG_DEBUG, "cannot bind inet socket (%d) to port less than %d (%s)", diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index ff766844d84..4153db429a1 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -2488,5 +2488,8 @@ struct volume_options options[] = { .min = 1, .max = 1013, }, + { .key = {"client-bind-insecure"}, + .type = GF_OPTION_TYPE_BOOL + }, { .key = {NULL} }, }; |