From 786b46a05369912c5883a5bc549b02287b91086e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 9 Jul 2012 19:16:27 -0500 Subject: [PATCH] Do not wait for incoming data when using socket read functions --- lib/libtdekrb/src/tdekrbclientsocket.cpp | 8 ++++---- lib/libtdekrb/src/tdekrbserversocket.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libtdekrb/src/tdekrbclientsocket.cpp b/lib/libtdekrb/src/tdekrbclientsocket.cpp index 9e9a27a..64929cb 100644 --- a/lib/libtdekrb/src/tdekrbclientsocket.cpp +++ b/lib/libtdekrb/src/tdekrbclientsocket.cpp @@ -287,7 +287,7 @@ int TDEKerberosClientSocket::processPendingData() { int reclen; int wrlen; char* buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return -1; @@ -348,7 +348,7 @@ TQ_LONG TDEKerberosClientSocket::readBlock(char *data, TQ_ULONG maxlen) { int wrlen; if (m_bufferLength <= 0) { char* buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return -1; @@ -412,7 +412,7 @@ TQ_LONG TDEKerberosClientSocket::readLine(char *data, TQ_ULONG maxlen) { int wrlen; if (m_bufferLength <= 0) { char* buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return -1; @@ -467,7 +467,7 @@ TQString TDEKerberosClientSocket::readLine() { maxlen = m_negotiatedMaxBufferSize; if (m_bufferLength <= 0) { buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return TQString::null; diff --git a/lib/libtdekrb/src/tdekrbserversocket.cpp b/lib/libtdekrb/src/tdekrbserversocket.cpp index f715af8..26e49f7 100644 --- a/lib/libtdekrb/src/tdekrbserversocket.cpp +++ b/lib/libtdekrb/src/tdekrbserversocket.cpp @@ -288,7 +288,7 @@ int TDEKerberosServerSocket::processPendingData() { int reclen; int wrlen; char* buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return -1; @@ -357,7 +357,7 @@ TQ_LONG TDEKerberosServerSocket::readBlock(char *data, TQ_ULONG maxlen) { int wrlen; if (m_bufferLength <= 0) { char* buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return -1; @@ -421,7 +421,7 @@ TQ_LONG TDEKerberosServerSocket::readLine(char *data, TQ_ULONG maxlen) { int wrlen; if (m_bufferLength <= 0) { char* buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return -1; @@ -476,7 +476,7 @@ TQString TDEKerberosServerSocket::readLine() { maxlen = m_negotiatedMaxBufferSize; if (m_bufferLength <= 0) { buf = (char*)malloc(m_negotiatedMaxBufferSize); - reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize); + reclen = receiveEncryptedData(buf, m_negotiatedMaxBufferSize, false); if (reclen < 0) { free(buf); return TQString::null;