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:17 UTC
svn commit: r1734162 - in /qpid/trunk/qpid/cpp/src/qpid/sys: Socket.h
posix/BSDSocket.cpp posix/BSDSocket.h ssl/SslSocket.cpp ssl/SslSocket.h
windows/WinSocket.cpp windows/WinSocket.h
Author: gsim
Date: Tue Mar 8 21:28:16 2016
New Revision: 1734162
URL: http://svn.apache.org/viewvc?rev=1734162&view=rev
Log:
QPID-7130: [PATCH 4/5] Added getPeerAuthId as an alias for getClientAuthId since
the function returns client auth id on server side and server auth id on
client side so the new name is more appropriate.
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/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/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=1734162&r1=1734161&r2=1734162&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:16 2016
@@ -110,6 +110,7 @@ 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/BSDSocket.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp?rev=1734162&r1=1734161&r2=1734162&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:16 2016
@@ -276,6 +276,11 @@ std::string BSDSocket::getClientAuthId()
return std::string();
}
+std::string BSDSocket::getPeerAuthId() const
+{
+ return std::string();
+}
+
std::string BSDSocket::getLocalAuthId() const
{
return "dummy";
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=1734162&r1=1734161&r2=1734162&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:16 2016
@@ -72,6 +72,7 @@ public:
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;
protected:
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=1734162&r1=1734161&r2=1734162&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:16 2016
@@ -401,6 +401,11 @@ std::string SslSocket::getClientAuthId()
return getAuthId(PeerCertificateGetter(nssSocket));
}
+std::string SslSocket::getPeerAuthId() const
+{
+ return getAuthId(PeerCertificateGetter(nssSocket));
+}
+
std::string SslSocket::getLocalAuthId() const
{
return getAuthId(LocalCertificateGetter(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=1734162&r1=1734161&r2=1734162&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:16 2016
@@ -68,6 +68,7 @@ public:
int getKeyLen() const;
std::string getClientAuthId() const;
+ std::string getPeerAuthId() const;
std::string getLocalAuthId() const;
protected:
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=1734162&r1=1734161&r2=1734162&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:16 2016
@@ -278,6 +278,11 @@ std::string WinSocket::getClientAuthId()
return std::string();
}
+std::string WinSocket::getPeerAuthId() const
+{
+ return std::string();
+}
+
std::string WinSocket::getLocalAuthId() const
{
return "dummy";
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=1734162&r1=1734161&r2=1734162&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:16 2016
@@ -100,6 +100,7 @@ public:
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;
protected:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org