network: rework network status callbacks

Exchange the code with the ustream example code: https://git.openwrt.org/?p=project/ustream-ssl.git;a=blob;f=ustream-example-client.c;h=4fc99f0356bddef3a22b31bf64015579e8eea447;hb=HEAD#l72 Signed-off-by: Nick Hainke <[email protected]>
berlin-open-wireless-lab · Jul 24, 2022 · 9e8060e · 9e8060e
1 parent 10fb043
commit 9e8060e
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/network/tcpsocket.c b/src/network/tcpsocket.c
@@ -70,14 +70,11 @@ static void client_notify_state(struct ustream *s) {
     dawnlog_debug_func("Entering...");
 
     struct client *cl = container_of(s, struct client, s.stream);
-    if (!s->eof)
+    if (!s->write_error && !s->eof)
         return;
 
-    dawnlog_error("eof!, pending: %d, total: %d\n", s->w.data_bytes, cl->ctr);
-
-    if (!s->w.data_bytes)
-        return client_close(s);
-
+    dawnlog_error("Closing client-connection, pending: %d, total: %d\n", s->w.data_bytes, cl->ctr);
+    client_close(s);
 }
 
 static void client_to_server_close(struct ustream *s) {
@@ -100,14 +97,11 @@ static void client_to_server_state(struct ustream *s) {
 
     dawnlog_debug_func("Entering...");
 
-    if (!s->eof)
+    if (!s->write_error && !s->eof)
         return;
 
-    dawnlog_error("eof!, pending: %d, total: %d\n", s->w.data_bytes, cl->ctr);
-
-    if (!s->w.data_bytes)
-        return client_to_server_close(s);
-
+    dawnlog_error("Closing connection, pending: %d, total: %d\n", s->w.data_bytes, cl->ctr);
+    client_to_server_close(s);
 }
 
 static void client_read_cb(struct ustream *s, int bytes) {