From 224d2160ac271a9430fa8311e72a5bf922c60698 Mon Sep 17 00:00:00 2001 From: XeonSquared Date: Thu, 3 Aug 2017 12:24:54 +1000 Subject: [PATCH] added a timeout to net.recvstring --- modules/net/net-ext.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/net/net-ext.lua b/modules/net/net-ext.lua index 5e901c5..615b59a 100644 --- a/modules/net/net-ext.lua +++ b/modules/net/net-ext.lua @@ -8,13 +8,17 @@ function net.sendstring(addr,port,msg) -- for sending lots of data end end function net.recvstring(addr,port) - local fr,po,msg = "" + local t,fr,po,msg = {},"","","" repeat - _,fr,po,msg = event.pull("net_msg") + t,fr,po,msg = event.pull("net_msg",10) + if not t then + return + end until fr == addr and po == port local ml,s = tonumber(msg), "" for i = 1, ml do - _,fr,po,msg = event.pull("net_msg") + t,fr,po,msg = event.pull("net_msg",10) + if t == nil then break end if fr == addr and po == port then s=s..tostring(msg) end