diff options
Diffstat (limited to 'server.lua')
| -rw-r--r-- | server.lua | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -1,5 +1,6 @@ local enet = require("enet") local socket = require("socket") +local util = require("util") local common = require("common") local server = {} @@ -8,7 +9,7 @@ function server.create(match_addr) local srv = {} srv.host = enet.host_create() - srv.secret = common.rand_string(common.secret_len) + srv.secret = util.rand_string(common.secret_len) srv.clients = {} srv.match = srv.host:connect(match_addr or common.default_match_addr) @@ -19,7 +20,7 @@ end local function handle_match(srv, pkt) if pkt.type == "server_match" then - local game_id = type(pkt.game_id) == "string" and common.base64_dec(pkt.game_id) + local game_id = type(pkt.game_id) == "string" and util.base64_dec(pkt.game_id) if not game_id then print("[server] server_match: invalid game_id") return @@ -31,7 +32,7 @@ local function handle_match(srv, pkt) end srv.game_id = game_id - srv.invite = common.base64_enc(srv.game_id .. srv.secret) + srv.invite = util.base64_enc(srv.game_id .. srv.secret) elseif pkt.type == "server_join" then if type(pkt.peer_addr) ~= "string" then print("[server] server_join: invalid peer_addr") @@ -43,7 +44,7 @@ end local function handle_client(srv, peer, pkt) if pkt.type == "server_hi" then - local secret = type(pkt.secret) == "string" and common.base64_dec(pkt.secret) + local secret = type(pkt.secret) == "string" and util.base64_dec(pkt.secret) if not secret then print("[server] server_hi: invalid secret") return @@ -57,10 +58,10 @@ local function handle_client(srv, peer, pkt) if secret == srv.secret then print("[server] auth success " .. tostring(peer)) srv.clients[peer] = { peer = peer } - peer:send(common.json_enc({ type = "client_hi" })) + peer:send(util.json_enc({ type = "client_hi" })) else print("[server] auth failure " .. tostring(peer)) - peer:send(common.json_enc({ type = "client_reject" })) + peer:send(util.json_enc({ type = "client_reject" })) peer:disconnect_later() end end @@ -70,7 +71,7 @@ function server.update(srv) local event = srv.host:service(20) while event do if event.type == "receive" then - local pkt = common.json_dec(event.data) + local pkt = util.json_dec(event.data) if pkt then if event.peer == srv.match then handle_match(srv, pkt) @@ -80,7 +81,7 @@ function server.update(srv) end elseif event.type == "connect" then if event.peer == srv.match then - srv.match:send(common.json_enc({ type = "match_register" })) + srv.match:send(util.json_enc({ type = "match_register" })) end print("[server] connect " .. tostring(event.peer)) elseif event.type == "disconnect" then |