diff options
| author | Amar Tumballi <amar@gluster.com> | 2010-06-29 03:39:16 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-07-01 03:31:47 -0700 |
| commit | c46f8452d75e2f1b4ab77306177f39bdbb4b232c (patch) | |
| tree | 6c583bc3d79fdaab83aac6933c5848583ff1fe66 /xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c | |
| parent | 0da2a6d08cc8fc2315742d010c8a8cab38ef75bb (diff) | |
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
Diffstat (limited to 'xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c')
| -rw-r--r-- | xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c | 21 |
1 files changed, 11 insertions, 10 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"); |