From fdf91b713658b83936383dc53b0f241876f5ead1 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Fri, 13 May 2016 13:17:16 +0530 Subject: rpc: change client insecure port ceiling from 65535 to 49151 current port allocation to various processes (clumsy): 1023 - 1 -> client ports range if bind secure is turned on 49151 - 1024 -> fall back to this, if in above case ports exhaust 65535 - 1024 -> client port range if bind insecure is on 49152 - 65535 -> brick port range now, we have segregated port ranges 0 - 65535 to below 3 ranges 1023 - 1 -> client ports range if bind secure is turned on 49151 - 1024 -> client port range if bind insecure is on (fall back to this, if in above case ports exhaust) 49152 - 65535 -> brick port range so now we have a clean segregation of port mapping Backport of: > Change-Id: Ie3b4e7703e0bbeabbe0adbdd6c60d9ef78ef7c65 > BUG: 1335776 > Signed-off-by: Prasanna Kumar Kalever > Reviewed-on: http://review.gluster.org/14326 > Tested-by: Prasanna Kumar Kalever > Reviewed-by: Raghavendra Talur > Tested-by: Gluster Build System > CentOS-regression: Gluster Build System > NetBSD-regression: NetBSD Build System > Smoke: Gluster Build System > Reviewed-by: Kaleb KEITHLEY > Reviewed-by: Raghavendra G Change-Id: Ie3b4e7703e0bbeabbe0adbdd6c60d9ef78ef7c65 BUG: 1335813 Signed-off-by: Prasanna Kumar Kalever Reviewed-on: http://review.gluster.org/14412 Tested-by: Prasanna Kumar Kalever Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra G --- rpc/rpc-transport/rdma/src/name.c | 11 ++++++----- rpc/rpc-transport/socket/src/name.c | 17 +++++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) (limited to 'rpc/rpc-transport') diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c index d5de6f8f5bc..8003b1c87a0 100644 --- a/rpc/rpc-transport/rdma/src/name.c +++ b/rpc/rpc-transport/rdma/src/name.c @@ -448,8 +448,8 @@ gf_rdma_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr, case AF_INET6: if (!this->bind_insecure) { ret = af_inet_bind_to_port_lt_ceiling (cm_id, sockaddr, - *sockaddr_len, - GF_CLIENT_PORT_CEILING); + *sockaddr_len, + GF_CLIENT_PORT_CEILING); if (ret == -1) { gf_msg (this->name, GF_LOG_WARNING, errno, RDMA_MSG_PORT_BIND_FAILED, @@ -458,13 +458,14 @@ gf_rdma_client_bind (rpc_transport_t *this, struct sockaddr *sockaddr, } } else { ret = af_inet_bind_to_port_lt_ceiling (cm_id, sockaddr, - *sockaddr_len, - GF_PORT_MAX); + *sockaddr_len, + GF_IANA_PRIV_PORTS_START); if (ret == -1) { gf_msg (this->name, GF_LOG_WARNING, errno, RDMA_MSG_PORT_BIND_FAILED, "cannot bind rdma_cm_id to port " - "less than %d", GF_PORT_MAX); + "less than %d", + GF_IANA_PRIV_PORTS_START); } } break; diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 3f85b9f7d60..8c5884ea775 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -458,20 +458,25 @@ client_bind (rpc_transport_t *this, case AF_INET6: if (!this->bind_insecure) { ret = af_inet_bind_to_port_lt_ceiling (sock, sockaddr, - *sockaddr_len, GF_CLIENT_PORT_CEILING); + *sockaddr_len, + GF_CLIENT_PORT_CEILING); if (ret == -1) { gf_log (this->name, GF_LOG_DEBUG, - "cannot bind inet socket (%d) to port less than %d (%s)", - sock, GF_CLIENT_PORT_CEILING, strerror (errno)); + "cannot bind inet socket (%d) " + "to port less than %d (%s)", + sock, GF_CLIENT_PORT_CEILING, + strerror (errno)); ret = 0; } } else { ret = af_inet_bind_to_port_lt_ceiling (sock, sockaddr, - *sockaddr_len, GF_PORT_MAX); + *sockaddr_len, + GF_IANA_PRIV_PORTS_START); if (ret == -1) { gf_log (this->name, GF_LOG_DEBUG, - "failed while binding to less than %d (%s)", - GF_PORT_MAX, strerror (errno)); + "failed while binding to less than " + "%d (%s)", GF_IANA_PRIV_PORTS_START, + strerror (errno)); ret = 0; } } -- cgit