1 files changed, 42 insertions, 2 deletions

diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index e224dcc022e..5556740ca81 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -166,6 +166,19 @@ out:
 
 
 
+int rpc_transport_lib_path (char **name, char *type)
+{
+        int                ret = -1;
+        char               *libdir_env = getenv ("GLUSTER_LIBDIR");
+
+        ret = libdir_env == NULL
+            ? gf_asprintf (name, "%s/%s.so", RPC_TRANSPORTDIR, type)
+            : gf_asprintf (name, "%s/rpc-transport/%s.so", libdir_env, type);
+        return ret;
+}
+
+
+
 rpc_transport_t *
 rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 {
@@ -274,7 +287,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
 		goto fail;
 	}
 
-	ret = gf_asprintf (&name, "%s/%s.so", RPC_TRANSPORTDIR, type);
+        ret = rpc_transport_lib_path (&name, type);
         if (-1 == ret) {
                 goto fail;
         }
@@ -652,18 +665,37 @@ out:
         return ret;
 }
 
+/** @brief build a dictionary containing basic transport options.
+ *
+ * @param[out] options: will be set to a newly created dictionary on success.
+ * @param[in]  hostname: desired target hostname.
+ * @param[in]  port: desired target port.
+ * @param[in]  addr_family (optional): desired address family. If NULL,
+ *             default will be used.
+ *
+ * @returns zero on success.
+ */
 int
 rpc_transport_inet_options_build (dict_t **options, const char *hostname,
-                                  int port)
+                                  int port, const char *addr_family)
 {
         dict_t          *dict = NULL;
         char            *host = NULL;
         int             ret = -1;
+#ifdef IPV6_DEFAULT
+        const char      *addr_family_default = "inet6";
+#else
+        const char      *addr_family_default = "inet";
+#endif
 
         GF_ASSERT (options);
         GF_ASSERT (hostname);
         GF_ASSERT (port >= 1024);
 
+        if (!addr_family) {
+                addr_family = addr_family_default;
+        }
+
         dict = dict_new ();
         if (!dict)
                 goto out;
@@ -688,6 +720,14 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
                 goto out;
         }
 
+        ret = dict_set_str (dict, "transport.address-family",
+                            (char *)addr_family);
+        if (ret) {
+                gf_log (THIS->name, GF_LOG_WARNING,
+                        "failed to set address-family to %s", addr_family);
+                goto out;
+        }
+
         ret = dict_set_str (dict, "transport-type", "socket");
         if (ret) {
                 gf_log (THIS->name, GF_LOG_WARNING,