diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-08-29 17:51:49 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-08-29 17:51:49 +0000 |
| commit | 9bd10d81a6676a8fae6a4ff03c4142f80a27f011 (patch) | |
| tree | b577718d67e269f2151b2437e12077cb97daaf4c /qpid/cpp/src | |
| parent | 0c56f9d6e17faf6d63a4f038afae250501888a25 (diff) | |
| download | qpid-python-9bd10d81a6676a8fae6a4ff03c4142f80a27f011.tar.gz | |
NO-JIRA: Make ssl setTcpNoDelay interface same as TCP
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1378663 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/sys/SslPlugin.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp | 12 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/sys/ssl/SslSocket.h | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/qpid/cpp/src/qpid/sys/SslPlugin.cpp b/qpid/cpp/src/qpid/sys/SslPlugin.cpp index 5520320ef2..c14cb5f016 100644 --- a/qpid/cpp/src/qpid/sys/SslPlugin.cpp +++ b/qpid/cpp/src/qpid/sys/SslPlugin.cpp @@ -174,7 +174,7 @@ void SslEstablished(Poller::shared_ptr poller, const qpid::sys::SslSocket& s, qpid::sys::ssl::SslHandler* async = new qpid::sys::ssl::SslHandler(s.getFullAddress(), f, nodict); if (tcpNoDelay) { - s.setTcpNoDelay(tcpNoDelay); + s.setTcpNoDelay(); QPID_LOG(info, "Set TCP_NODELAY on connection to " << s.getPeerAddress()); } diff --git a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp index 352415128b..0568ed8350 100644 --- a/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp +++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp @@ -303,14 +303,12 @@ int SslSocket::write(const void *buf, size_t count) const return PR_Write(socket, buf, count); } -void SslSocket::setTcpNoDelay(bool nodelay) const +void SslSocket::setTcpNoDelay() const { - if (nodelay) { - PRSocketOptionData option; - option.option = PR_SockOpt_NoDelay; - option.value.no_delay = true; - PR_SetSocketOption(socket, &option); - } + PRSocketOptionData option; + option.option = PR_SockOpt_NoDelay; + option.value.no_delay = true; + PR_SetSocketOption(socket, &option); } void SslSocket::setCertName(const std::string& name) diff --git a/qpid/cpp/src/qpid/sys/ssl/SslSocket.h b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h index 4d28b231a0..0f7e74f977 100644 --- a/qpid/cpp/src/qpid/sys/ssl/SslSocket.h +++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h @@ -47,7 +47,7 @@ public: void setNonblocking() const; /** Set tcp-nodelay */ - void setTcpNoDelay(bool nodelay) const; + void setTcpNoDelay() const; /** Set SSL cert-name. Allows the cert-name to be set per * connection, overriding global cert-name settings from |