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>

5 files changed, 0 insertions, 117 deletions

diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 4c3d5279fe1..fc26f462c31 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -656,11 +656,7 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
         dict_t          *dict = NULL;
         char            *host = NULL;
         int             ret = -1;
-#ifdef IPV6_DEFAULT
-        char            *addr_family = "inet6";
-#else
         char            *addr_family = "inet";
-#endif
 
         GF_ASSERT (options);
         GF_ASSERT (hostname);
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 4cd2be17085..ce4e2bf0dc2 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -37,10 +37,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#ifdef IPV6_DEFAULT
-#include <netconfig.h>
-#endif
-
 #include "xdr-rpcclnt.h"
 #include "glusterfs-acl.h"
 
@@ -1390,82 +1386,6 @@ rpcsvc_error_reply (rpcsvc_request_t *req)
         return rpcsvc_submit_generic (req, &dummyvec, 0, NULL, 0, NULL);
 }
 
-#ifdef IPV6_DEFAULT
-int
-rpcsvc_program_register_rpcbind6 (rpcsvc_program_t *newprog, uint32_t port)
-{
-        const int IP_BUF_LEN = 64;
-        char addr_buf[IP_BUF_LEN];
-
-        int err = 0;
-        bool_t success = 0;
-        struct netconfig *nc;
-        struct netbuf *nb;
-
-        if (!newprog) {
-                goto out;
-        }
-
-        nc = getnetconfigent ("tcp6");
-        if (!nc) {
-                err = -1;
-                goto out;
-        }
-
-
-        err = sprintf (addr_buf, "::.%d.%d", port >> 8 & 0xff,
-                       port & 0xff);
-        if (err < 0) {
-                err = -1;
-                goto out;
-        }
-
-        nb = uaddr2taddr (nc, addr_buf);
-        if (!nb) {
-                err = -1;
-                goto out;
-        }
-
-        success = rpcb_set (newprog->prognum, newprog->progver, nc, nb);
-        if (!success) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Could not register the IPv6"
-                                                 " service with rpcbind");
-        }
-
-        err = 0;
-
-out:
-        return err;
-}
-
-int
-rpcsvc_program_unregister_rpcbind6 (rpcsvc_program_t *newprog)
-{
-        int err = 0;
-        bool_t success = 0;
-        struct netconfig *nc;
-
-        if (!newprog) {
-                goto out;
-        }
-
-        nc = getnetconfigent ("tcp6");
-        if (!nc) {
-                err = -1;
-                goto out;
-        }
-
-        success = rpcb_unset (newprog->prognum, newprog->progver, nc);
-        if (!success) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "Could not unregister the IPv6"
-                                                 " service with rpcbind");
-        }
-
-        err = 0;
-out:
-        return err;
-}
-#endif
 
 /* Register the program with the local portmapper service. */
 int
@@ -1630,14 +1550,6 @@ rpcsvc_program_unregister (rpcsvc_t *svc, rpcsvc_program_t *program)
                         " program failed");
                 goto out;
         }
-#ifdef IPV6_DEFAULT
-        ret = rpcsvc_program_unregister_rpcbind6 (program);
-        if (ret == -1) {
-                gf_log (GF_RPCSVC, GF_LOG_ERROR, "rpcbind (ipv6)"
-                        " unregistration of program failed");
-                goto out;
-        }
-#endif
         pthread_mutex_lock (&svc->rpclock);
         {
                 list_for_each_entry (prog, &svc->programs, program) {
diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h
index 8097a525dab..cf3e5906de1 100644
--- a/rpc/rpc-lib/src/rpcsvc.h
+++ b/rpc/rpc-lib/src/rpcsvc.h
@@ -434,11 +434,6 @@ rpcsvc_listener_destroy (rpcsvc_listener_t *listener);
 extern int
 rpcsvc_program_register_portmap (rpcsvc_program_t *newprog, uint32_t port);
 
-#ifdef IPV6_DEFAULT
-extern int
-rpcsvc_program_register_rpcbind6 (rpcsvc_program_t *newprog, uint32_t port);
-#endif
-
 extern int
 rpcsvc_program_unregister_portmap (rpcsvc_program_t *newprog);
 
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);