Attachment 916832 Details for Bug 1117886 – Reversal of commit 3dc56cbd16b1074d7ca1a4fe4c5bf44400eb63ff

[patch] Reversal of commit 3dc56cbd16b1074d7ca1a4fe4c5bf44400eb63ff

gluster-ipv6.patch (text/plain), 7.36 KB, created by Anders Blomdell on 2014-07-09 15:17:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anders Blomdell

Created: 2014-07-09 15:17:58 UTC

Size: 7.36 KB

patch

obsolete

>commit 1ef9396b838fd5ccf85239a6d42c5c3f0f56a0de
>Author: Anders Blomdell <anders.blomdell@control.lth.se>
>Date:   Wed Jul 9 16:58:58 2014 +0200
>
>    Reinstating ipv6 support by reverting
>    3dc56cbd16b1074d7ca1a4fe4c5bf44400eb63ff
>    
>    Make sure to check for regressions in:
>    
>    https://bugzilla.redhat.com/show_bug.cgi?id=764655
>
>diff --git a/cli/src/cli.c b/cli/src/cli.c
>index 745b0b4..744eba6 100644
>--- a/cli/src/cli.c
>+++ b/cli/src/cli.c
>@@ -579,8 +579,8 @@ cli_rpc_init (struct cli_state *state)
>                 if (ret)
>                         goto out;
> 
>-                ret = dict_set_str (options, "transport.address-family",
>-                                    "inet");
>+                ret = dict_set_str (options, "transport.address-family", 
>+                                    "inet/inet6");
>                 if (ret)
>                         goto out;
>         } else {
>diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
>index cf7f903..82d597e 100644
>--- a/rpc/rpc-lib/src/rpc-transport.c
>+++ b/rpc/rpc-lib/src/rpc-transport.c
>@@ -657,7 +657,7 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
>                         "failed to set remote-port with %d", port);
>                 goto out;
>         }
>-        ret = dict_set_str (dict, "transport.address-family", "inet");
>+        ret = dict_set_str (dict, "transport.address-family", "inet/inet6");
>         if (ret) {
>                 gf_log (THIS->name, GF_LOG_WARNING,
>                         "failed to set addr-family with inet");
>diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c
>index c57428a..2b36e7d 100644
>--- a/rpc/rpc-transport/rdma/src/name.c
>+++ b/rpc/rpc-transport/rdma/src/name.c
>@@ -165,11 +165,13 @@ client_fill_address_family (rpc_transport_t *this, struct sockaddr *sockaddr)
>                         sockaddr->sa_family = AF_INET6;
>                 } else if (!strcasecmp (address_family, "inet-sdp")) {
>                         sockaddr->sa_family = AF_INET_SDP;
>+                } else if (!strcasecmp (address_family, "inet/inet6")
>+                           || !strcasecmp (address_family, "inet6/inet")) {
>+                        sockaddr->sa_family = AF_UNSPEC;
>                 } else {
>                         gf_log (this->name, GF_LOG_ERROR,
>                                 "unknown address-family (%s) specified",
>                                 address_family);
>-                        sockaddr->sa_family = AF_UNSPEC;
>                         return -1;
>                 }
>         }
>@@ -533,19 +535,21 @@ gf_rdma_server_get_local_sockaddr (rpc_transport_t *this,
>                         addr->sa_family = AF_INET_SDP;
>                 } else if (!strcasecmp (address_family, "unix")) {
>                         addr->sa_family = AF_UNIX;
>+                } else if (!strcasecmp (address_family, "inet/inet6")
>+                           || !strcasecmp (address_family, "inet6/inet")) {
>+                        addr->sa_family = AF_UNSPEC;
>                 } else {
>                         gf_log (this->name, GF_LOG_ERROR,
>                                 "unknown address family (%s) specified",
>                                 address_family);
>-                        addr->sa_family = AF_UNSPEC;
>                         ret = -1;
>                         goto err;
>                 }
>         } else {
>                 gf_log (this->name, GF_LOG_DEBUG,
>                         "option address-family not specified, defaulting "
>-                        "to inet");
>-                addr->sa_family = AF_INET;
>+                        "to inet/inet6");
>+                addr->sa_family = AF_UNSPEC;
>         }
> 
>         switch (addr->sa_family)
>diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c
>index f731bab..25d26f7 100644
>--- a/rpc/rpc-transport/socket/src/name.c
>+++ b/rpc/rpc-transport/socket/src/name.c
>@@ -138,15 +138,15 @@ client_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
>                                 "transport.unix.connect-path:%s) options",
>                                 data_to_str (remote_host_data),
>                                 data_to_str (connect_path_data));
>-                        *sa_family = AF_UNSPEC;
>                         goto out;
>                 }
> 
>                 if (remote_host_data) {
>                         gf_log (this->name, GF_LOG_DEBUG,
>                                 "address-family not specified, guessing it "
>-                                "to be inet from (remote-host: %s)", data_to_str (remote_host_data));
>-                        *sa_family = AF_INET;
>+                                "to be inet/inet6 from (remote-host: %s)", 
>+                                data_to_str (remote_host_data));
>+                        *sa_family = AF_UNSPEC;
>                 } else {
>                         gf_log (this->name, GF_LOG_DEBUG,
>                                 "address-family not specified, guessing it "
>@@ -164,11 +164,13 @@ client_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
>                         *sa_family = AF_INET6;
>                 } else if (!strcasecmp (address_family, "inet-sdp")) {
>                         *sa_family = AF_INET_SDP;
>+                } else if (!strcasecmp (address_family, "inet/inet6")
>+                           || !strcasecmp (address_family, "inet6/inet")) {
>+                        *sa_family = AF_UNSPEC;
>                 } else {
>                         gf_log (this->name, GF_LOG_ERROR,
>                                 "unknown address-family (%s) specified",
>                                 address_family);
>-                        *sa_family = AF_UNSPEC;
>                         goto out;
>                 }
>         }
>@@ -539,16 +541,18 @@ server_fill_address_family (rpc_transport_t *this, sa_family_t *sa_family)
>                         *sa_family = AF_INET_SDP;
>                 } else if (!strcasecmp (address_family, "unix")) {
>                         *sa_family = AF_UNIX;
>+                } else if (!strcasecmp (address_family, "inet/inet6")
>+                           || !strcasecmp (address_family, "inet6/inet")) {
>+                        *sa_family = AF_UNSPEC;
>                 } else {
>                         gf_log (this->name, GF_LOG_ERROR,
>                                 "unknown address family (%s) specified", address_family);
>-                        *sa_family = AF_UNSPEC;
>                         goto out;
>                 }
>         } else {
>                 gf_log (this->name, GF_LOG_DEBUG,
>-                        "option address-family not specified, defaulting to inet");
>-                *sa_family = AF_INET;
>+                        "option address-family not specified, defaulting to inet/inet6");
>+                *sa_family = AF_UNSPEC;
>         }
> 
>         ret = 0;
>diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
>index ccef2f6..a7ce782 100644
>--- a/rpc/rpc-transport/socket/src/socket.c
>+++ b/rpc/rpc-transport/socket/src/socket.c
>@@ -3828,7 +3828,8 @@ struct volume_options options[] = {
>         },
>         { .key   = { "transport.address-family",
>                      "address-family" },
>-          .value = {"inet", "inet6", "unix", "inet-sdp" },
>+          .value = {"inet", "inet6", "inet/inet6", "inet6/inet",
>+                    "unix", "inet-sdp" },
>           .type  = GF_OPTION_TYPE_STR
>         },
>

Actions: View | Diff

Attachments on bug 1117886: 916832 | 1037799 | 1065976 | 1065977 | 1067846 | 1067847 | 1067848 | 1072956 | 1072957