backward compatibility of protocol

* made most of the 'legacy' server and transport functions as
 'static' as they were getting cross linked with newer functions.

* changed the name of few functions with prefix 'gf_'

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875

3 files changed, 33 insertions, 32 deletions

diff --git a/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c
index c14be17e6e8..6714d32e7d8 100644
--- a/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c
+++ b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c
@@ -2135,7 +2135,7 @@ tcp_connect_finish (transport_t *this)
                                 goto unlock;
                         }
 
-                        get_transport_identifiers (this);
+                        gf_ibverbs_get_transport_identifiers (this);
                         priv->tcp_connected = 1;
                 }
 
@@ -2249,8 +2249,9 @@ ib_verbs_connect (struct transport *this)
                 }
         }
 
-        ret = ibverbs_client_get_remote_sockaddr (this, (struct sockaddr *)&sockaddr, 
-                                                  &sockaddr_len);
+        ret = gf_ibverbs_client_get_remote_sockaddr (this,
+                                                     (struct sockaddr *)&sockaddr,
+                                                     &sockaddr_len);
         if (ret != 0) {
                 gf_log (this->xl->name, GF_LOG_DEBUG,
                         "cannot get remote address to connect");
@@ -2299,9 +2300,9 @@ ib_verbs_connect (struct transport *this)
                         }
                 }
 
-                ret = client_bind (this, 
-                                   (struct sockaddr *)&this->myinfo.sockaddr, 
-                                   &this->myinfo.sockaddr_len, priv->sock);
+                ret = gf_ibverbs_client_bind (this,
+                                              (struct sockaddr *)&this->myinfo.sockaddr,
+                                              &this->myinfo.sockaddr_len, priv->sock);
                 if (ret == -1)
                 {
                         gf_log (this->xl->name, GF_LOG_WARNING,
@@ -2393,7 +2394,7 @@ ib_verbs_server_event_handler (int fd, int idx, void *data,
         priv->peer.trans = this;
         transport_ref (this);
 
-        get_transport_identifiers (this);
+        gf_ibverbs_get_transport_identifiers (this);
 
         priv->tcp_connected = 1;
         priv->handshake.incoming.state = IB_VERBS_HANDSHAKE_START;
@@ -2434,9 +2435,9 @@ ib_verbs_listen (transport_t *this)
         char service[NI_MAXSERV], host[NI_MAXHOST];
 
         memset (&sockaddr, 0, sizeof (sockaddr));
-        ret = ibverbs_server_get_local_sockaddr (this, 
-                                                 (struct sockaddr *)&sockaddr,
-                                                 &sockaddr_len);
+        ret = gf_ibverbs_server_get_local_sockaddr (this,
+                                                    (struct sockaddr *)&sockaddr,
+                                                    &sockaddr_len);
         if (ret != 0) {
                 gf_log (this->xl->name, GF_LOG_DEBUG,
                         "cannot find network address of server to bind to");
diff --git a/xlators/protocol/legacy/transport/ib-verbs/src/name.c b/xlators/protocol/legacy/transport/ib-verbs/src/name.c
index a3e18481458..1b8f83c293e 100644
--- a/xlators/protocol/legacy/transport/ib-verbs/src/name.c
+++ b/xlators/protocol/legacy/transport/ib-verbs/src/name.c
@@ -412,11 +412,11 @@ out:
         return ret;
 }
 
-int32_t 
-client_bind (transport_t *this, 
-             struct sockaddr *sockaddr, 
-             socklen_t *sockaddr_len, 
-             int sock)
+int32_t
+gf_ibverbs_client_bind (transport_t *this,
+                        struct sockaddr *sockaddr,
+                        socklen_t *sockaddr_len,
+                        int sock)
 {
         int ret = 0;
 
@@ -457,9 +457,9 @@ client_bind (transport_t *this,
 }
 
 int32_t
-ibverbs_client_get_remote_sockaddr (transport_t *this, 
-                                    struct sockaddr *sockaddr, 
-                                    socklen_t *sockaddr_len)
+gf_ibverbs_client_get_remote_sockaddr (transport_t *this,
+                                       struct sockaddr *sockaddr,
+                                       socklen_t *sockaddr_len)
 {
         int32_t ret = 0;
         char is_inet_sdp = 0;
@@ -506,9 +506,9 @@ err:
 }
 
 int32_t
-ibverbs_server_get_local_sockaddr (transport_t *this, 
-                                   struct sockaddr *addr, 
-                                   socklen_t *addr_len)
+gf_ibverbs_server_get_local_sockaddr (transport_t *this,
+                                      struct sockaddr *addr,
+                                      socklen_t *addr_len)
 {
         data_t *address_family_data = NULL;
         int32_t ret = 0;
@@ -647,7 +647,7 @@ fill_inet6_inet_identifiers (transport_t *this, struct sockaddr_storage *addr,
 }
 
 int32_t
-get_transport_identifiers (transport_t *this)
+gf_ibverbs_get_transport_identifiers (transport_t *this)
 {
         int32_t ret = 0;
         char is_inet_sdp = 0;
diff --git a/xlators/protocol/legacy/transport/ib-verbs/src/name.h b/xlators/protocol/legacy/transport/ib-verbs/src/name.h
index 4f0f47711d2..e2575794bc7 100644
--- a/xlators/protocol/legacy/transport/ib-verbs/src/name.h
+++ b/xlators/protocol/legacy/transport/ib-verbs/src/name.h
@@ -25,23 +25,23 @@
 
 #include "compat.h"
 
-int32_t 
-client_bind (transport_t *this, 
-             struct sockaddr *sockaddr, 
-             socklen_t *sockaddr_len, 
-             int sock);
+int32_t
+gf_ibverbs_client_bind (transport_t *this,
+                        struct sockaddr *sockaddr,
+                        socklen_t *sockaddr_len,
+                        int sock);
 
 int32_t
-ibverbs_client_get_remote_sockaddr (transport_t *this, 
-                                    struct sockaddr *sockaddr, 
+gf_ibverbs_client_get_remote_sockaddr (transport_t *this,
+                                    struct sockaddr *sockaddr,
                                     socklen_t *sockaddr_len);
 
 int32_t
-ibverbs_server_get_local_sockaddr (transport_t *this, 
-                                   struct sockaddr *addr, 
+gf_ibverbs_server_get_local_sockaddr (transport_t *this,
+                                   struct sockaddr *addr,
                                    socklen_t *addr_len);
 
 int32_t
-get_transport_identifiers (transport_t *this);
+gf_ibverbs_get_transport_identifiers (transport_t *this);
 
 #endif /* _IB_VERBS_NAME_H */