Fix return value of doio_n() when count is larger than the rest

data in socket. Signed-off-by: Yifan Yuan <[email protected]> .
alibaba · Sep 1, 2023 · 4fe2f3b · 4fe2f3b
1 parent 779751a
commit 4fe2f3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/net/basic_socket.h b/net/basic_socket.h
@@ -108,22 +108,25 @@ __FORCE_INLINE__ int doio(IOCB iocb, WAIT waitcb) {
 
 template <typename IOCB>
 __FORCE_INLINE__ ssize_t doio_n(void *&buf, size_t &count, IOCB iocb) {
-    auto count0 = count;
+    ssize_t n = 0;
     while (count > 0) {
         ssize_t ret = iocb();
-        if (ret <= 0) return ret;
+        if (ret < 0) return ret; // error
+        if (ret == 0) break; // EOF
         (char *&)buf += ret;
         count -= ret;
+        n += ret;
     }
-    return count0;
+    return n;
 }
 
 template <typename IOCB>
 __FORCE_INLINE__ ssize_t doiov_n(iovector_view &v, IOCB iocb) {
     ssize_t count = 0;
     while (v.iovcnt > 0) {
         ssize_t ret = iocb();
-        if (ret <= 0) return ret;
+        if (ret < 0) return ret;
+        if (ret == 0) break;
         count += ret;
 
         uint64_t bytes = ret;

diff --git a/net/security-context/test/test.cpp b/net/security-context/test/test.cpp
@@ -97,7 +97,7 @@ int close_test_handler_during_read(void* arg, net::ISocketStream* stream) {
     auto ret = ss->read(buf, 6);
     LOG_INFO("AFTER READ");
     // since client will shutdown, return value should be 0
-    EXPECT_EQ(0, ret);
+    EXPECT_EQ(3, ret);
     LOG_INFO(VALUE(buf));
     LOG_INFO("BEFORE WRITE");
     ss->write(buffer, 1048576);