diff options
author | Raghavendra G <rgowdapp@redhat.com> | 2015-07-02 05:22:20 -0700 |
---|---|---|
committer | Raghavendra G <rgowdapp@redhat.com> | 2015-07-02 08:46:13 -0700 |
commit | 05f466f6337c56a95fcd090f0f3d286c611cc92b (patch) | |
tree | f50173918653433602c725cc3542c5b8b5263850 /rpc/rpc-transport | |
parent | 04350600eb6255e23e087a3a1d3d15431efc7c6c (diff) |
Revert "rpc: By default set allow-insecure, bind-insecure to on"
This reverts commit 243a5b429f225acb8e7132264fe0a0835ff013d5.
This patch introduced a regression where client no longer binds to
privileged port. This is causing lots of regressions. Hence reverting
this patch for now and will be resent after suitable modifications.
Change-Id: I302252fd3832b0a5a03b04e30cfa0def37597404
Reviewed-on: http://review.gluster.org/11508
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'rpc/rpc-transport')
-rw-r--r-- | rpc/rpc-transport/socket/src/name.c | 51 |
1 files changed, 17 insertions, 34 deletions
diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 93cb3c461f2..f731bab4b0a 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -23,21 +23,6 @@ #include "socket.h" #include "common-utils.h" -static void -_assign_port (struct sockaddr *sockaddr, uint16_t port) -{ - switch (sockaddr->sa_family) { - case AF_INET6: - ((struct sockaddr_in6 *)sockaddr)->sin6_port = htons (port); - break; - - case AF_INET_SDP: - case AF_INET: - ((struct sockaddr_in *)sockaddr)->sin_port = htons (port); - break; - } -} - static int32_t af_inet_bind_to_port_lt_ceiling (int fd, struct sockaddr *sockaddr, socklen_t sockaddr_len, int ceiling) @@ -56,7 +41,17 @@ af_inet_bind_to_port_lt_ceiling (int fd, struct sockaddr *sockaddr, while (port) { - _assign_port (sockaddr, port); + switch (sockaddr->sa_family) + { + case AF_INET6: + ((struct sockaddr_in6 *)sockaddr)->sin6_port = htons (port); + break; + + case AF_INET_SDP: + case AF_INET: + ((struct sockaddr_in *)sockaddr)->sin_port = htons (port); + break; + } // ignore the reserved ports if (ports[port] == _gf_true) { port--; @@ -445,24 +440,12 @@ client_bind (rpc_transport_t *this, if (!this->bind_insecure) { ret = af_inet_bind_to_port_lt_ceiling (sock, sockaddr, *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)); - ret = 0; - } - } else { - /* A port number of zero will let the bind function to - * pick any available local port dynamically - */ - _assign_port (sockaddr, 0); - ret = bind (sock, sockaddr, *sockaddr_len); - if (ret == -1) { - gf_log (this->name, GF_LOG_DEBUG, - "failed while binding to available ports (%s)", - strerror (errno)); - ret = 0; - } + } + 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)); + ret = 0; } break; |