diff options
| author | Kaushal M <kaushal@redhat.com> | 2017-05-04 12:15:09 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2017-05-05 11:39:28 +0000 |
| commit | de80a9153e3b681d8b83aa6164c94e2829b9cf49 (patch) | |
| tree | c811c06876f415991b63c5b3b6388e3bfb3a2528 /rpc/rpc-transport | |
| parent | 93ecfcddbfc6bdc77a720f55dbd51fc256961d68 (diff) | |
rpc: Remove accidental IPV6 changes
They snuck in with the HALO patch (07cc8679c)
Change-Id: I8ced6cbb0b49554fc9d348c453d4d5da00f981f6
BUG: 1447953
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: https://review.gluster.org/17174
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'rpc/rpc-transport')
| -rw-r--r-- | rpc/rpc-transport/socket/src/name.c | 6 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 14 |
2 files changed, 0 insertions, 20 deletions
diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 56e9bb8d31b..04dc2a989a7 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -561,14 +561,8 @@ server_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family) { data_t *address_family_data = NULL; int32_t ret = -1; - -#ifdef IPV6_DEFAULT - char *addr_family = "inet6"; - sa_family_t default_family = AF_INET6; -#else char *addr_family = "inet"; sa_family_t default_family = AF_INET; -#endif GF_VALIDATE_OR_GOTO ("socket", sa_family, out); diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index e3e9d98801b..8ba2692cdc6 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -3132,20 +3132,6 @@ socket_connect (rpc_transport_t *this, int port) } } - /* Make sure we are not vulnerable to someone setting - * net.ipv6.bindv6only to 1 so that gluster services are - * avalable over IPv4 & IPv6. - */ - int disable_v6only = 0; - - if (setsockopt (priv->sock, IPPROTO_IPV6, IPV6_V6ONLY, - (void *)&disable_v6only, - sizeof (disable_v6only)) < 0) { - gf_log (this->name, GF_LOG_WARNING, - "Error disabling sockopt IPV6_V6ONLY: \"%s\"", - strerror (errno)); - } - if (priv->nodelay && (sa_family != AF_UNIX)) { ret = __socket_nodelay (priv->sock); |