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

Fix send() return value handling.

Browse source 
A value of 0 doesn't indicate a closed connection as for recv().
This commit is contained in:
Sönke Ludwig 2017-07-19 10:42:33 +02:00
parent 9518ec4dce
commit 1c666a0191
No known key found for this signature in database
GPG key ID: D95E8DB493EE314C
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/eventcore/drivers/posix/sockets.d
View file

@ -350,21 +350,16 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
on_write_finish(socket, IOStatus.error, 0); on_write_finish(socket, IOStatus.error, 0);
return; return;
} }
if (mode == IOMode.immediate) {
on_write_finish(socket, IOStatus.wouldBlock, 0);
return;
}
} }
size_t bytes_written = 0; size_t bytes_written = 0;
if (ret == 0) { if (ret >= 0) {
on_write_finish(socket, IOStatus.disconnected, 0);
return;
}
if (ret < 0 && mode == IOMode.immediate) {
on_write_finish(socket, IOStatus.wouldBlock, 0);
return;
}
if (ret > 0) {
bytes_written += ret; bytes_written += ret;
buffer = buffer[ret .. $]; buffer = buffer[ret .. $];
if (mode != IOMode.all || buffer.length == 0) { if (mode != IOMode.all || buffer.length == 0) {
@ -380,7 +375,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
with (m_loop.m_fds[socket].streamSocket) { with (m_loop.m_fds[socket].streamSocket) {
writeCallback = on_write_finish; writeCallback = on_write_finish;
writeMode = mode; writeMode = mode;
bytesWritten = ret > 0 ? ret : 0; bytesWritten = ret >= 0 ? ret : 0;
writeBuffer = buffer; writeBuffer = buffer;
} }
@ -411,13 +406,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
} }
} }
if (ret == 0) { if (ret >= 0) {
m_loop.setNotifyCallback!(EventType.write)(socket, null);
slot.writeCallback(cast(StreamSocketFD)socket, IOStatus.disconnected, slot.bytesWritten);
return;
}
if (ret > 0) {
slot.bytesWritten += ret; slot.bytesWritten += ret;
slot.writeBuffer = slot.writeBuffer[ret .. $]; slot.writeBuffer = slot.writeBuffer[ret .. $];
if (slot.writeMode != IOMode.all || slot.writeBuffer.length == 0) { if (slot.writeMode != IOMode.all || slot.writeBuffer.length == 0) {
@ -524,7 +513,7 @@ final class PosixEventDriverSockets(Loop : PosixEventLoop) : EventDriverSockets
ret = () @trusted { return connect(sockfd, cast(sockaddr*)&sa, addr_len); } (); ret = () @trusted { return connect(sockfd, cast(sockaddr*)&sa, addr_len); } ();
} else ret = () @trusted { return connect(sockfd, target_address.name, target_address.nameLen); } (); } else ret = () @trusted { return connect(sockfd, target_address.name, target_address.nameLen); } ();
if (ret != 0) { if (ret != 0) {
closeSocket(sockfd); closeSocket(sockfd);
return DatagramSocketFD.init; return DatagramSocketFD.init;