From 757d965bf2d7a1b1f59600e7f74a2fd6b5f82038 Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Mon, 8 Jan 2018 11:20:04 +0800
Subject: [PATCH] Update libevent

Fix GetNextEvent. Now GetNextEvent will wait infinitely by default.
Update transport system due to libnetbox api update.
---
 libevent.lua         | 8 +++++---
 transport_center.lua | 4 ++--
 transport_client.lua | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libevent.lua b/libevent.lua
index 4a1ad60..b5ecd1f 100644
--- a/libevent.lua
+++ b/libevent.lua
@@ -290,13 +290,17 @@ function GetNextEvent(t,wait_second)
     checktable(t)
     if(wait_second~=nil) then
         checknumber(wait_second)
+    else
+        -- This has caused thousands of error! Now, without wait_second, by default, it means wait infinitely.
+        -- If you want a non-blocking check, call GetNextEvent(bus,0) instead!
+        wait_second=-1
     end
 
     if(t.events[1]~=nil) then
         local e=t.events[1]
         table.remove(t.events,1)
         return e
-    elseif(wait_second~=nil) then
+    else
         if(wait_second<0) then
             while t.events[1]==nil do
                 os.sleep(1)
@@ -316,8 +320,6 @@ function GetNextEvent(t,wait_second)
         else
             return nil
         end
-    else
-        return nil
     end
 end
 
diff --git a/transport_center.lua b/transport_center.lua
index cca255e..beecec0 100644
--- a/transport_center.lua
+++ b/transport_center.lua
@@ -33,7 +33,7 @@ end
 
 local function main()
     checkDevice()
-    clientServiceStart()
+    NetBoxInit()
 
     OpenPort(10010)
 
@@ -57,7 +57,7 @@ local function main()
     end
 
     ClosePort(10010)
-    clientServiceStop()
+    NetBoxCleanUp()
 end
 
 print("Transport System Center Started.")
diff --git a/transport_client.lua b/transport_client.lua
index f4e6451..1e6fb14 100644
--- a/transport_client.lua
+++ b/transport_client.lua
@@ -342,7 +342,7 @@ local function main()
     checkDevice()
     resetDevice()
 
-    clientServiceStart()
+    NetBoxInit()
 
     while true do
         print(
@@ -367,7 +367,7 @@ local function main()
     resetDevice()
     unlockUnloadChest()
 
-    clientServiceStop()
+    NetBoxCleanUp()
 end
 
 print("Transport System Client Started.")