debian-packages/eventcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix transferred byte counter for windows stream socket reads/writes.

Browse source 
Fixes read/write sizes that are sometimes reported too small.
This commit is contained in:
Sönke Ludwig 2020-03-15 19:50:21 +01:00
parent f301e479a4
commit e8ed523c08
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/eventcore/drivers/winapi/sockets.d
View file

@ -249,6 +249,7 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
{ {
auto slot = () @trusted { return &m_sockets[socket].streamSocket(); } (); auto slot = () @trusted { return &m_sockets[socket].streamSocket(); } ();
slot.read.buffer = buffer; slot.read.buffer = buffer;
slot.read.bytesTransferred = 0;
slot.read.mode = mode; slot.read.mode = mode;
slot.read.wsabuf[0].len = buffer.length; slot.read.wsabuf[0].len = buffer.length;
slot.read.wsabuf[0].buf = () @trusted { return buffer.ptr; } (); slot.read.wsabuf[0].buf = () @trusted { return buffer.ptr; } ();
@ -306,7 +307,7 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
} }
if (slot.streamSocket.read.mode == IOMode.once || !slot.streamSocket.read.buffer.length) { if (slot.streamSocket.read.mode == IOMode.once || !slot.streamSocket.read.buffer.length) {
invokeCallback(IOStatus.ok, cbTransferred); invokeCallback(IOStatus.ok, slot.streamSocket.read.bytesTransferred);
return; return;
} }
@ -332,6 +333,7 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
{ {
auto slot = () @trusted { return &m_sockets[socket].streamSocket(); } (); auto slot = () @trusted { return &m_sockets[socket].streamSocket(); } ();
slot.write.buffer = buffer; slot.write.buffer = buffer;
slot.write.bytesTransferred = 0;
slot.write.mode = mode; slot.write.mode = mode;
slot.write.wsabuf[0].len = buffer.length; slot.write.wsabuf[0].len = buffer.length;
slot.write.wsabuf[0].buf = () @trusted { return cast(ubyte*)buffer.ptr; } (); slot.write.wsabuf[0].buf = () @trusted { return cast(ubyte*)buffer.ptr; } ();
@ -381,7 +383,7 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
} }
if (slot.streamSocket.write.mode == IOMode.once || !slot.streamSocket.write.buffer.length) { if (slot.streamSocket.write.mode == IOMode.once || !slot.streamSocket.write.buffer.length) {
invokeCallback(IOStatus.ok, cbTransferred); invokeCallback(IOStatus.ok, slot.streamSocket.write.bytesTransferred);
return; return;
} }
@ -854,7 +856,6 @@ final class WinAPIEventDriverSockets : EventDriverSockets {
cb(cast(StreamSocketFD)sock, ConnectStatus.refused); cb(cast(StreamSocketFD)sock, ConnectStatus.refused);
} else { } else {
slot.streamSocket.state = ConnectionState.connected; slot.streamSocket.state = ConnectionState.connected;
if (slot.common.driver.releaseRef(cast(StreamSocketFD)sock))
cb(cast(StreamSocketFD)sock, ConnectStatus.connected); cb(cast(StreamSocketFD)sock, ConnectStatus.connected);
} }
break; break;