From df97547270f725cd31352c8c7c483549001f676d Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 4 Aug 2020 23:00:31 +0800
Subject: fix socket bug

---
 core/src/tbox/tbox                            |  2 +-
 tests/modules/socket/unix_tcp/echo_client.lua | 24 +++++++++++++-----------
 tests/modules/socket/unix_tcp/echo_server.lua |  1 +
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
index 3c88337d6..8c455bc5b 160000
--- a/core/src/tbox/tbox
+++ b/core/src/tbox/tbox
@@ -1 +1 @@
-Subproject commit 3c88337d6c4a80a3890a9a92f8d84cba4d2878fb
+Subproject commit 8c455bc5b39129ec50d85b32649e1e2e0d023ece
diff --git a/tests/modules/socket/unix_tcp/echo_client.lua b/tests/modules/socket/unix_tcp/echo_client.lua
index 53788d428..27c88cb9f 100644
--- a/tests/modules/socket/unix_tcp/echo_client.lua
+++ b/tests/modules/socket/unix_tcp/echo_client.lua
@@ -4,17 +4,19 @@ function main(addr)
     addr = addr or path.join(os.tmpdir(), "echo.socket")
     print("connect %s ..", addr)
     local sock = socket.connect_unix(addr)
-    print("%s: connected!", sock)
-    local count = 0
-    while count < 10000 do
-        local send = sock:send("hello world..", {block = true})
-        if send > 0 then
-            sock:recv(13, {block = true})
-        else
-            break
+    if sock then
+        print("%s: connected!", sock)
+        local count = 0
+        while count < 10000 do
+            local send = sock:send("hello world..", {block = true})
+            if send > 0 then
+                sock:recv(13, {block = true})
+            else
+                break
+            end
+            count = count + 1
         end
-        count = count + 1
+        print("%s: send ok, count: %d!", sock, count)
+        sock:close()
     end
-    print("%s: send ok, count: %d!", sock, count)
-    sock:close()
 end
diff --git a/tests/modules/socket/unix_tcp/echo_server.lua b/tests/modules/socket/unix_tcp/echo_server.lua
index 7a2334095..8b69d495f 100644
--- a/tests/modules/socket/unix_tcp/echo_server.lua
+++ b/tests/modules/socket/unix_tcp/echo_server.lua
@@ -3,6 +3,7 @@ import("core.base.socket")
 function main(addr)
 
     addr = addr or path.join(os.tmpdir(), "echo.socket")
+    os.tryrm(addr)
     local sock = socket.bind_unix(addr)
     sock:listen(20)
     print("%s: listening %s ..", sock, addr) 
-- 
cgit v1.3.1