mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
Merge branch 'main' into debugging-client
This commit is contained in:
commit
fbc9ceece4
8 changed files with 86 additions and 18 deletions
|
|
@ -70,6 +70,7 @@ local DatagramServerSocket = {__index={
|
|||
|
||||
local _tcp_server_callbacks = {}
|
||||
local _tcp_client_callbacks = {}
|
||||
local _tcp_client_error_callbacks = {}
|
||||
|
||||
local _udp_server_callbacks = {}
|
||||
local _udp_client_datagram_callbacks = {}
|
||||
|
|
@ -116,10 +117,13 @@ network.tcp_open = function (port, handler)
|
|||
return socket
|
||||
end
|
||||
|
||||
network.tcp_connect = function(address, port, callback)
|
||||
network.tcp_connect = function(address, port, callback, errorCallback)
|
||||
local socket = setmetatable({id=0}, Socket)
|
||||
socket.id = network.__connect_tcp(address, port)
|
||||
_tcp_client_callbacks[socket.id] = function() callback(socket) end
|
||||
if errorCallback then
|
||||
_tcp_client_error_callbacks[socket.id] = function(message) errorCallback(socket, message) end
|
||||
end
|
||||
return socket
|
||||
end
|
||||
|
||||
|
|
@ -239,6 +243,7 @@ network.__process_events = function()
|
|||
local CONNECTED_TO_SERVER = 2
|
||||
local DATAGRAM = 3
|
||||
local RESPONSE = 4
|
||||
local CONNECTION_ERROR = 5
|
||||
|
||||
local ON_SERVER = 1
|
||||
local ON_CLIENT = 2
|
||||
|
|
@ -258,6 +263,11 @@ network.__process_events = function()
|
|||
if callback then
|
||||
callback()
|
||||
end
|
||||
elseif etype == CONNECTION_ERROR then
|
||||
local callback = _tcp_client_error_callbacks[cid]
|
||||
if callback then
|
||||
callback(addr)
|
||||
end
|
||||
elseif etype == DATAGRAM then
|
||||
if side == ON_CLIENT then
|
||||
local callback = _udp_client_datagram_callbacks[cid]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue