You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2012/08/29 19:51:40 UTC
svn commit: r1378662 - in /qpid/trunk/qpid/cpp/src/qpid:
broker/windows/SslProtocolFactory.cpp client/windows/SslConnector.cpp
sys/ProtocolFactory.h sys/SslPlugin.cpp
Author: astitcher
Date: Wed Aug 29 17:51:40 2012
New Revision: 1378662
URL: http://svn.apache.org/viewvc?rev=1378662&view=rev
Log:
NO-JIRA: Remove obsolete and now unused code
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
qpid/trunk/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h
qpid/trunk/qpid/cpp/src/qpid/sys/SslPlugin.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp?rev=1378662&r1=1378661&r2=1378662&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp Wed Aug 29 17:51:40 2012
@@ -103,7 +103,6 @@ class SslProtocolFactory : public qpid::
ConnectFailedCallback failed);
uint16_t getPort() const;
- bool supports(const std::string& capability);
private:
void connectFailed(const qpid::sys::Socket&,
@@ -337,16 +336,4 @@ void SslProtocolFactory::connect(sys::Po
this, _1, _2, _3));
}
-namespace
-{
-const std::string SSL = "ssl";
-}
-
-bool SslProtocolFactory::supports(const std::string& capability)
-{
- std::string s = capability;
- transform(s.begin(), s.end(), s.begin(), tolower);
- return s == SSL;
-}
-
}}} // namespace qpid::sys::windows
Modified: qpid/trunk/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/windows/SslConnector.cpp?rev=1378662&r1=1378661&r2=1378662&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/windows/SslConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/windows/SslConnector.cpp Wed Aug 29 17:51:40 2012
@@ -79,7 +79,6 @@ public:
ConnectionImpl*);
virtual void connect(const std::string& host, const std::string& port);
virtual void connected(const Socket&);
- unsigned int getSSF();
};
// Static constructor which registers connector here
@@ -173,9 +172,4 @@ void SslConnector::connected(const Socke
shim->start(poller);
}
-unsigned int SslConnector::getSSF()
-{
- return shim->getSslKeySize();
-}
-
}}} // namespace qpid::client::windows
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h?rev=1378662&r1=1378661&r2=1378662&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ProtocolFactory.h Wed Aug 29 17:51:40 2012
@@ -45,7 +45,6 @@ class ProtocolFactory : public qpid::Sha
const std::string& host, const std::string& port,
ConnectionCodec::Factory* codec,
ConnectFailedCallback failed) = 0;
- virtual bool supports(const std::string& /*capability*/) { return false; }
};
inline ProtocolFactory::~ProtocolFactory() {}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/SslPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/SslPlugin.cpp?rev=1378662&r1=1378661&r2=1378662&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/SslPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/SslPlugin.cpp Wed Aug 29 17:51:40 2012
@@ -86,7 +86,6 @@ class SslProtocolFactoryTmpl : public Pr
boost::function2<void, int, std::string> failed);
uint16_t getPort() const;
- bool supports(const std::string& capability);
private:
void established(Poller::shared_ptr, const Socket&, ConnectionCodec::Factory*,
@@ -270,25 +269,4 @@ void SslProtocolFactoryTmpl<T>::connect(
failed);
}
-namespace
-{
-const std::string SSL = "ssl";
-}
-
-template <>
-bool SslProtocolFactory::supports(const std::string& capability)
-{
- std::string s = capability;
- transform(s.begin(), s.end(), s.begin(), tolower);
- return s == SSL;
-}
-
-template <>
-bool SslMuxProtocolFactory::supports(const std::string& capability)
-{
- std::string s = capability;
- transform(s.begin(), s.end(), s.begin(), tolower);
- return s == SSL || s == "tcp";
-}
-
}} // namespace qpid::sys
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org