Lab_NHMFL
/
upsilon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sock_read_buf: properly detect closed connection

This commit is contained in:
Peter McGoron 2023-04-07 15:26:25 -04:00
parent 576aca9ac6
commit bdec49c3b6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
software/prj.conf
View File

@ -2,7 +2,7 @@ CONFIG_LOG=y
CONFIG_NET_LOG=y CONFIG_NET_LOG=y
CONFIG_LOG_BUFFER_SIZE=1024 CONFIG_LOG_BUFFER_SIZE=1024
CONFIG_LOG_PRINTK=y CONFIG_LOG_PRINTK=y
CONFIG_LOG_DEFAULT_LEVEL=4 CONFIG_LOG_DEFAULT_LEVEL=3
CONFIG_NETWORKING=y CONFIG_NETWORKING=y
CONFIG_NET_IPV4=y CONFIG_NET_IPV4=y

4
software/src/sock.c
View File

@ -70,6 +70,8 @@ sock_read_buf(int sock, struct bufptr *bp, bool entire)
{ {
do { do {
ssize_t l = zsock_recv(sock, bp->p, bp->left, 0); ssize_t l = zsock_recv(sock, bp->p, bp->left, 0);
if (l == 0)
return -ECONNRESET;
if (l < 0) if (l < 0)
return -errno; return -errno;
@ -88,6 +90,8 @@ sock_write_buf(int sock, struct bufptr *bp)
*/ */
while (bp->left) { while (bp->left) {
ssize_t l = zsock_send(sock, bp->p, bp->left, 0); ssize_t l = zsock_send(sock, bp->p, bp->left, 0);
if (l == 0)
return -ECONNRESET;
if (l < 0) if (l < 0)
return -errno; return -errno;
bp->p += l; bp->p += l;