jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fixed so that receiving socket has no buffer limit when reading in Windows. Closes #145.

Browse source
This commit is contained in:
Stefan Persson 2011-12-28 10:56:44 +01:00
parent 24586433d9
commit 81671d1607
1 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

23
telldus-core/common/Socket_win.cpp
View file

@ -93,10 +93,14 @@ std::wstring Socket::read(int timeout){
d->readEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
oOverlap.hEvent = d->readEvent;
BOOL fSuccess = false;
std::wstring returnString;
bool moreData = true;
memset(&buf, 0, BUFSIZE);
while(moreData){
moreData = false;
memset(&buf, 0, sizeof(buf));
ReadFile( d->hPipe, &buf, sizeof(wchar_t)*BUFSIZE, &cbBytesRead, &oOverlap);
ReadFile( d->hPipe, &buf, sizeof(buf)-sizeof(wchar_t), &cbBytesRead, &oOverlap);
result = WaitForSingleObject(oOverlap.hEvent, timeout);
@ -114,21 +118,28 @@ std::wstring Socket::read(int timeout){
return L"";
}
fSuccess = GetOverlappedResult(d->hPipe, &oOverlap, &cbBytesRead, false);
if (!fSuccess) {
DWORD err = GetLastError();
//debuglog(result, "This then?");
//debuglog(1, "Unsuccessful");
if(err == ERROR_MORE_DATA){
moreData = true;
}
else{
buf[0] = 0;
}
if (err == ERROR_BROKEN_PIPE) {
//debuglog(1, "Broken pipe");
d->connected = false;
}
buf[0] = 0;
}
returnString.append(buf);
}
CancelIo(d->hPipe);
CloseHandle(d->readEvent);
return buf;
return returnString;
}
void Socket::write(const std::wstring &msg){