Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed RsFdBinInterface to use recv/send for sockets and read/write for file descriptors on Windows

Browse Source
This commit is contained in:
thunder2 2021-12-21 07:43:44 +01:00
parent 057e872eca
commit 38b4c50635
4 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libretroshare/src/pqi/pqifdbin.cc
View File

@ -21,10 +21,11 @@
******************************************************************************/ ******************************************************************************/
#include "util/rsprint.h" #include "util/rsprint.h"
#include "util/rsfile.h"
#include "pqi/pqifdbin.h" #include "pqi/pqifdbin.h"
RsFdBinInterface::RsFdBinInterface(int file_descriptor) RsFdBinInterface::RsFdBinInterface(int file_descriptor, bool is_socket)
: mCLintConnt(file_descriptor),mIsActive(false) : mCLintConnt(file_descriptor),mIsSocket(is_socket),mIsActive(false)
{ {
mTotalReadBytes=0; mTotalReadBytes=0;
mTotalInBufferBytes=0; mTotalInBufferBytes=0;
@ -53,8 +54,11 @@ void RsFdBinInterface::setSocket(int s)
#else #else
// On windows, there is no way to determine whether a socket is blocking or not, so we set it to non blocking whatsoever. // On windows, there is no way to determine whether a socket is blocking or not, so we set it to non blocking whatsoever.
unsigned long int on = 1; if (mIsSocket) {
ioctlsocket(s, FIONBIO, &on); unix_fcntl_nonblock(s);
} else {
RsFileUtil::set_fd_nonblock(s);
}
#endif #endif
mCLintConnt = s; mCLintConnt = s;
@ -82,8 +86,15 @@ int RsFdBinInterface::read_pending()
char inBuffer[1025]; char inBuffer[1025];
memset(inBuffer,0,1025); memset(inBuffer,0,1025);
ssize_t readbytes = read(mCLintConnt, inBuffer, sizeof(inBuffer)); // Needs read instead of recv which is only for sockets. ssize_t readbytes;
// Sockets should be set to non blocking by the client process. #if WINDOWS_SYS
if (mIsSocket)
// Windows needs recv for sockets
readbytes = recv(mCLintConnt, inBuffer, sizeof(inBuffer), 0);
else
#endif
readbytes = read(mCLintConnt, inBuffer, sizeof(inBuffer)); // Needs read instead of recv which is only for sockets.
// Sockets should be set to non blocking by the client process.
if(readbytes == 0) if(readbytes == 0)
{ {
@ -95,7 +106,11 @@ int RsFdBinInterface::read_pending()
} }
if(readbytes < 0) if(readbytes < 0)
{ {
if(errno != EWOULDBLOCK && errno != EAGAIN) if(errno != 0 && errno != EWOULDBLOCK && errno != EAGAIN)
#ifdef WINDOWS_SYS
// A non blocking read to file descriptor gets ERROR_NO_DATA for empty data
if (mIsSocket == true || GetLastError() != ERROR_NO_DATA)
#endif
RsErr() << "read() failed. Errno=" << errno ; RsErr() << "read() failed. Errno=" << errno ;
return mTotalInBufferBytes; return mTotalInBufferBytes;
@ -138,7 +153,14 @@ int RsFdBinInterface::write_pending()
return mTotalOutBufferBytes; return mTotalOutBufferBytes;
auto& p = out_buffer.front(); auto& p = out_buffer.front();
int written = write(mCLintConnt, p.first, p.second); int written;
#if WINDOWS_SYS
if (mIsSocket)
// Windows needs send for sockets
written = send(mCLintConnt, (char*) p.first, p.second, 0);
else
#endif
written = write(mCLintConnt, p.first, p.second);
if(written < 0) if(written < 0)
{ {

3
libretroshare/src/pqi/pqifdbin.h
View File

@ -25,7 +25,7 @@
class RsFdBinInterface: public BinInterface class RsFdBinInterface: public BinInterface
{ {
public: public:
RsFdBinInterface(int file_descriptor); RsFdBinInterface(int file_descriptor, bool is_socket);
~RsFdBinInterface(); ~RsFdBinInterface();
// Implements BinInterface methods // Implements BinInterface methods
@ -70,6 +70,7 @@ private:
int write_pending(); int write_pending();
int mCLintConnt; int mCLintConnt;
bool mIsSocket;
bool mIsActive; bool mIsActive;
uint32_t mTotalReadBytes; uint32_t mTotalReadBytes;
uint32_t mTotalInBufferBytes; uint32_t mTotalInBufferBytes;

4
libretroshare/src/pqi/rstcpsocket.cc
View File

@ -18,12 +18,12 @@
#include "rstcpsocket.h" #include "rstcpsocket.h"
RsTcpSocket::RsTcpSocket(const std::string& tcp_address,uint16_t tcp_port) RsTcpSocket::RsTcpSocket(const std::string& tcp_address,uint16_t tcp_port)
:RsFdBinInterface(0),mState(DISCONNECTED),mConnectAddress(tcp_address),mConnectPort(tcp_port),mSocket(0) :RsFdBinInterface(0, true),mState(DISCONNECTED),mConnectAddress(tcp_address),mConnectPort(tcp_port),mSocket(0)
{ {
} }
RsTcpSocket::RsTcpSocket() RsTcpSocket::RsTcpSocket()
:RsFdBinInterface(0),mState(DISCONNECTED),mConnectAddress("0.0.0.0"),mConnectPort(0),mSocket(0) :RsFdBinInterface(0, true),mState(DISCONNECTED),mConnectAddress("0.0.0.0"),mConnectPort(0),mSocket(0)
{ {
} }

4
libretroshare/src/tor/TorProcess.cpp
View File

@ -274,8 +274,8 @@ void TorProcess::start()
RsFileUtil::set_fd_nonblock(fd[STDOUT_FILENO]); RsFileUtil::set_fd_nonblock(fd[STDOUT_FILENO]);
RsFileUtil::set_fd_nonblock(fd[STDERR_FILENO]); RsFileUtil::set_fd_nonblock(fd[STDERR_FILENO]);
mStdOutFD = new RsFdBinInterface(fd[STDOUT_FILENO]); mStdOutFD = new RsFdBinInterface(fd[STDOUT_FILENO], false);
mStdErrFD = new RsFdBinInterface(fd[STDERR_FILENO]); mStdErrFD = new RsFdBinInterface(fd[STDERR_FILENO], false);
} }
void TorProcess::tick() void TorProcess::tick()