izaya/OC-Minitel
1
0
Fork 0
mirror of https://github.com/ShadowKatStudios/OC-Minitel.git synced 2024-11-23 10:38:05 +11:00
Code Issues Releases Wiki Activity

make minitel.rsend return the packet ID if not blocking

Browse Source
This commit is contained in:
Izaya 2019-04-18 13:26:30 +10:00
parent 40c6f47f4d
commit 67c5790bd4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenOS/usr/lib/minitel.lua
View File

@ -19,10 +19,10 @@ function net.usend(to,port,data,npID)
computer.pushSignal("net_send",0,to,port,data,npID) computer.pushSignal("net_send",0,to,port,data,npID)
end end
function net.rsend(to,port,data,block,npID) function net.rsend(to,port,data,block)
local pid, stime = npID or net.genPacketID(), computer.uptime() + net.streamdelay local pid, stime = net.genPacketID(), computer.uptime() + net.streamdelay
computer.pushSignal("net_send",1,to,port,data,pid) computer.pushSignal("net_send",1,to,port,data,pid)
if block then return false end if block then return pid end
repeat repeat
_,rpid = event.pull(0.5,"net_ack") _,rpid = event.pull(0.5,"net_ack")
until rpid == pid or computer.uptime() > stime until rpid == pid or computer.uptime() > stime

2
OpenOS/usr/man/minitel
View File

@ -71,7 +71,7 @@ The minitel library provides an easy way of interacting with the minitel daemon,
*minitel.usend(host, port, data, pid)* - Sends an unreliable packet to *host* on *port* containing *data*, optionally with the packet ID *pid*. *minitel.usend(host, port, data, pid)* - Sends an unreliable packet to *host* on *port* containing *data*, optionally with the packet ID *pid*.
*minitel.rsend(host, port, data, block)* - Sends a reliable packet to *host* on *port* containing *data*. If *block* is true, don't wait for a reply. *minitel.rsend(host, port, data, block)* - Sends a reliable packet to *host* on *port* containing *data*. If *block* is true, don't wait for a reply, instead return the packet ID.
#### Layer 4 #### Layer 4