From 0698f1c8fd3ca17e920e94125138a8f82dd82722 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Mon, 1 Feb 2021 13:34:46 +0100
Subject: [PATCH] [EchoServer] don't die when a connection is dropped
---
apps/EchoServer.cpp | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/apps/EchoServer.cpp b/apps/EchoServer.cpp
index 4d21dac6..8c1e8e72 100644
--- a/apps/EchoServer.cpp
+++ b/apps/EchoServer.cpp
@@ -2,8 +2,7 @@
// Copyright © 2020-2021 Florian Fischer
#include <sys/types.h>
-#include <cassert>
-#include <climits>
+#include <cerrno>
#include <cstdlib>
#include <cstring>
#include <iostream>
@@ -44,9 +43,10 @@ auto main(int argc, char* argv[]) -> int {
if (unlikely(bytes_recv <= 0)) {
// socket was shutdown
if (bytes_recv < 0) {
- DIE_MSG_ERRNO("server read failed");
+ LOGE("server read failed:" << strerror(errno));
}
+ finish:
emper::io::closeAndForget(socket);
return;
}
@@ -55,8 +55,11 @@ auto main(int argc, char* argv[]) -> int {
exit(EXIT_SUCCESS);
}
- ATTR_UNUSED ssize_t bytes_send = emper::io::sendAndWait(socket, buf, bytes_recv, 0);
- assert(bytes_recv == bytes_send);
+ ssize_t bytes_send = emper::io::sendAndWait(socket, buf, bytes_recv, MSG_NOSIGNAL, true);
+ if (unlikely(bytes_recv != bytes_send)) {
+ LOGE("server send failed: " << strerror(errno));
+ goto finish;
+ }
}
});
--
GitLab