You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/02/03 00:30:06 UTC
git commit: THRIFT-2224 cpp: TSSLSocket.h and TSSLServerSocket.h
should use the platfromsocket too Patch: soyer
Updated Branches:
refs/heads/master 301dfa94d -> 0f60bd4f5
THRIFT-2224 cpp: TSSLSocket.h and TSSLServerSocket.h should use the platfromsocket too
Patch: soyer
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/0f60bd4f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/0f60bd4f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/0f60bd4f
Branch: refs/heads/master
Commit: 0f60bd4f54cc120836415982a8cc457a4175ce08
Parents: 301dfa9
Author: Roger Meier <ro...@apache.org>
Authored: Mon Feb 3 00:29:23 2014 +0100
Committer: Roger Meier <ro...@apache.org>
Committed: Mon Feb 3 00:29:23 2014 +0100
----------------------------------------------------------------------
lib/cpp/src/thrift/transport/TSSLServerSocket.cpp | 2 +-
lib/cpp/src/thrift/transport/TSSLServerSocket.h | 2 +-
lib/cpp/src/thrift/transport/TSSLSocket.cpp | 4 ++--
lib/cpp/src/thrift/transport/TSSLSocket.h | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/0f60bd4f/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
index 7520e50..e7a0d74 100644
--- a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
@@ -40,7 +40,7 @@ TSSLServerSocket::TSSLServerSocket(int port, int sendTimeout, int recvTimeout,
factory_->server(true);
}
-shared_ptr<TSocket> TSSLServerSocket::createSocket(int client) {
+shared_ptr<TSocket> TSSLServerSocket::createSocket(THRIFT_SOCKET client) {
return factory_->createSocket(client);
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/0f60bd4f/lib/cpp/src/thrift/transport/TSSLServerSocket.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.h b/lib/cpp/src/thrift/transport/TSSLServerSocket.h
index 18a868b..3a4b44d 100644
--- a/lib/cpp/src/thrift/transport/TSSLServerSocket.h
+++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.h
@@ -50,7 +50,7 @@ class TSSLServerSocket: public TServerSocket {
TSSLServerSocket(int port, int sendTimeout, int recvTimeout,
boost::shared_ptr<TSSLSocketFactory> factory);
protected:
- boost::shared_ptr<TSocket> createSocket(int socket);
+ boost::shared_ptr<TSocket> createSocket(THRIFT_SOCKET socket);
boost::shared_ptr<TSSLSocketFactory> factory_;
};
http://git-wip-us.apache.org/repos/asf/thrift/blob/0f60bd4f/lib/cpp/src/thrift/transport/TSSLSocket.cpp
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
index 5f39f1c..57b530f 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
@@ -88,7 +88,7 @@ TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx):
TSocket(), server_(false), ssl_(NULL), ctx_(ctx) {
}
-TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, int socket):
+TSSLSocket::TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket):
TSocket(socket), server_(false), ssl_(NULL), ctx_(ctx) {
}
@@ -376,7 +376,7 @@ boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket() {
return ssl;
}
-boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(int socket) {
+boost::shared_ptr<TSSLSocket> TSSLSocketFactory::createSocket(THRIFT_SOCKET socket) {
boost::shared_ptr<TSSLSocket> ssl(new TSSLSocket(ctx_, socket));
setup(ssl);
return ssl;
http://git-wip-us.apache.org/repos/asf/thrift/blob/0f60bd4f/lib/cpp/src/thrift/transport/TSSLSocket.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.h b/lib/cpp/src/thrift/transport/TSSLSocket.h
index 82a2e91..b379d23 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.h
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.h
@@ -75,7 +75,7 @@ protected:
*
* @param socket An existing socket
*/
- TSSLSocket(boost::shared_ptr<SSLContext> ctx, int socket);
+ TSSLSocket(boost::shared_ptr<SSLContext> ctx, THRIFT_SOCKET socket);
/**
* Constructor.
*
@@ -120,7 +120,7 @@ class TSSLSocketFactory {
*
* @param socket An existing socket.
*/
- virtual boost::shared_ptr<TSSLSocket> createSocket(int socket);
+ virtual boost::shared_ptr<TSSLSocket> createSocket(THRIFT_SOCKET socket);
/**
* Create an instance of TSSLSocket.
*