You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2016/03/08 22:28:25 UTC
svn commit: r1734163 - in /qpid/trunk/qpid/cpp/src/qpid/sys: Socket.h
posix/AsynchIO.cpp posix/BSDSocket.cpp posix/BSDSocket.h ssl/SslSocket.cpp
ssl/SslSocket.h windows/AsynchIO.cpp windows/WinSocket.cpp
windows/WinSocket.h
Author: gsim
Date: Tue Mar 8 21:28:25 2016
New Revision: 1734163
URL: http://svn.apache.org/viewvc?rev=1734163&view=rev
Log:
QPID-7130: [PATCH 5/5] Deleted old getClientAuthId function that was replaced by
getPeerAuthId.
Patch from Domen Vrankar <do...@halcom.si>
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.h
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h Tue Mar 8 21:28:25 2016
@@ -109,7 +109,6 @@ public:
/* Transport security related: */
virtual int getKeyLen() const = 0;
- virtual std::string getClientAuthId() const = 0;
virtual std::string getPeerAuthId() const = 0;
virtual std::string getLocalAuthId() const = 0;
};
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp Tue Mar 8 21:28:25 2016
@@ -620,7 +620,7 @@ void AsynchIO::close(DispatchHandle& h)
SecuritySettings AsynchIO::getSecuritySettings() {
SecuritySettings settings;
settings.ssf = socket.getKeyLen();
- settings.authid = socket.getClientAuthId();
+ settings.authid = socket.getPeerAuthId();
return settings;
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp Tue Mar 8 21:28:25 2016
@@ -271,11 +271,6 @@ int BSDSocket::getKeyLen() const
return 0;
}
-std::string BSDSocket::getClientAuthId() const
-{
- return std::string();
-}
-
std::string BSDSocket::getPeerAuthId() const
{
return std::string();
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.h?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.h Tue Mar 8 21:28:25 2016
@@ -71,7 +71,6 @@ public:
QPID_COMMON_EXTERN virtual void close() const;
QPID_COMMON_EXTERN virtual int getKeyLen() const;
- QPID_COMMON_EXTERN virtual std::string getClientAuthId() const;
QPID_COMMON_EXTERN virtual std::string getPeerAuthId() const;
QPID_COMMON_EXTERN virtual std::string getLocalAuthId() const;
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp Tue Mar 8 21:28:25 2016
@@ -396,11 +396,6 @@ int SslSocket::getKeyLen() const
return 0;
}
-std::string SslSocket::getClientAuthId() const
-{
- return getAuthId(PeerCertificateGetter(nssSocket));
-}
-
std::string SslSocket::getPeerAuthId() const
{
return getAuthId(PeerCertificateGetter(nssSocket));
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.h?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslSocket.h Tue Mar 8 21:28:25 2016
@@ -67,7 +67,6 @@ public:
void close() const;
int getKeyLen() const;
- std::string getClientAuthId() const;
std::string getPeerAuthId() const;
std::string getLocalAuthId() const;
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp Tue Mar 8 21:28:25 2016
@@ -527,7 +527,7 @@ void AsynchIO::close(void) {
SecuritySettings AsynchIO::getSecuritySettings() {
SecuritySettings settings;
settings.ssf = socket.getKeyLen();
- settings.authid = socket.getClientAuthId();
+ settings.authid = socket.getPeerAuthId();
return settings;
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp Tue Mar 8 21:28:25 2016
@@ -273,11 +273,6 @@ int WinSocket::getKeyLen() const
return 0;
}
-std::string WinSocket::getClientAuthId() const
-{
- return std::string();
-}
-
std::string WinSocket::getPeerAuthId() const
{
return std::string();
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.h?rev=1734163&r1=1734162&r2=1734163&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/WinSocket.h Tue Mar 8 21:28:25 2016
@@ -99,7 +99,6 @@ public:
QPID_COMMON_EXTERN virtual int write(const void *buf, size_t count) const;
QPID_COMMON_EXTERN int getKeyLen() const;
- QPID_COMMON_EXTERN std::string getClientAuthId() const;
QPID_COMMON_EXTERN std::string getPeerAuthId() const;
QPID_COMMON_EXTERN std::string getLocalAuthId() const;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org