# HG changeset patch # User unc0rr # Date 1431721711 -10800 # Node ID 384765cd0caf973387f2bc9123c2a858707defa8 # Parent 8ebf01f75d9f17d4ecd8a701f85fef6a6d8eb232 Parse net commands, answer to pings diff -r 8ebf01f75d9f -r 384765cd0caf hedgewars/uFLNet.pas --- a/hedgewars/uFLNet.pas Wed May 13 23:21:40 2015 +0300 +++ b/hedgewars/uFLNet.pas Fri May 15 23:28:31 2015 +0300 @@ -8,23 +8,32 @@ implementation uses SDLh; + +const endCmd: array[0..1] of char = (#10, #10); + +function getNextChar: char; forward; +function getCurrChar: char; forward; +procedure sendNet(s: shortstring); forward; + type TCmdType = (cmd_ASKPASSWORD, cmd_BANLIST, cmd_BYE, cmd_CHAT, cmd_CLIENT_FLAGS, cmd_CONNECTED, cmd_EM, cmd_HH_NUM, cmd_INFO, cmd_JOINED, cmd_JOINING, cmd_KICKED, cmd_LEFT, cmd_LOBBY_JOINED, cmd_LOBBY_LEFT, cmd_NICK, cmd_NOTICE, cmd_PING, cmd_PROTO, cmd_ROOMS, cmd_ROUND_FINISHED, cmd_RUN_GAME, cmd_SERVER_AUTH, cmd_SERVER_MESSAGE, cmd_SERVER_VARS, cmd_TEAM_ACCEPTED, cmd_TEAM_COLOR, cmd_WARNING, cmd___UNKNOWN__); type - TNetState = (netDisconnected, netLoggedIn); + TNetState = (netDisconnected, netConnecting, netLoggedIn); TParserState = record cmd: TCmdType; l: LongInt; netState: TNetState; + buf: shortstring; + bufpos: byte; end; PHandler = procedure; var state: TParserState; // generated stuff here -const letters: array[0..235] of char = ('A', 'S', 'K', 'P', 'A', 'S', 'S', 'W', 'O', 'R', 'D', #10, #0, 'B', 'A', 'N', 'L', 'I', 'S', 'T', #10, #0, 'Y', 'E', #10, #0, 'C', 'H', 'A', 'T', #10, #0, 'L', 'I', 'E', 'N', 'T', '_', 'F', 'L', 'A', 'G', 'S', #10, #0, 'O', 'N', 'N', 'E', 'C', 'T', 'E', 'D', #10, #0, 'E', 'M', #10, #0, 'H', 'H', '_', 'N', 'U', 'M', #10, #0, 'I', 'N', 'F', 'O', #10, #0, 'J', 'O', 'I', 'N', 'E', 'D', #10, #0, 'I', 'N', 'G', #10, #0, 'K', 'I', 'C', 'K', 'E', 'D', #10, #0, 'L', 'E', 'F', 'T', #10, #0, 'O', 'B', 'B', 'Y', ':', 'J', 'O', 'I', 'N', 'E', 'D', #10, #0, 'L', 'E', 'F', 'T', #10, #0, 'N', 'I', 'C', 'K', #10, #0, 'O', 'T', 'I', 'C', 'E', #10, #0, 'P', 'I', 'N', 'G', #10, #0, 'R', 'O', 'T', 'O', #10, #0, 'R', 'O', 'O', 'M', 'S', #10, #0, 'U', 'N', 'D', '_', 'F', 'I', 'N', 'I', 'S', 'H', 'E', 'D', #10, #0, 'U', 'N', '_', 'G', 'A', 'M', 'E', #10, #0, 'S', 'E', 'R', 'V', 'E', 'R', '_', 'A', 'U', 'T', 'H', #10, #0, 'M', 'E', 'S', 'S', 'A', 'G', 'E', #10, #0, 'V', 'A', 'R', 'S', #10, #0, 'T', 'E', 'A', 'M', '_', 'A', 'C', 'C', 'E', 'P', 'T', 'E', 'D', #10, #0, 'C', 'O', 'L', 'O', 'R', #10, #0, 'W', 'A', 'R', 'N', 'I', 'N', 'G', #10, #0, '$', #10, #0); +const letters: array[0..206] of char = ('A', 'S', 'K', 'P', 'A', 'S', 'S', 'W', 'O', 'R', 'D', #10, 'B', 'A', 'N', 'L', 'I', 'S', 'T', #10, 'Y', 'E', #10, 'C', 'H', 'A', 'T', #10, 'L', 'I', 'E', 'N', 'T', '_', 'F', 'L', 'A', 'G', 'S', #10, 'O', 'N', 'N', 'E', 'C', 'T', 'E', 'D', #10, 'E', 'M', #10, 'H', 'H', '_', 'N', 'U', 'M', #10, 'I', 'N', 'F', 'O', #10, 'J', 'O', 'I', 'N', 'E', 'D', #10, 'I', 'N', 'G', #10, 'K', 'I', 'C', 'K', 'E', 'D', #10, 'L', 'E', 'F', 'T', #10, 'O', 'B', 'B', 'Y', ':', 'J', 'O', 'I', 'N', 'E', 'D', #10, 'L', 'E', 'F', 'T', #10, 'N', 'I', 'C', 'K', #10, 'O', 'T', 'I', 'C', 'E', #10, 'P', 'I', 'N', 'G', #10, 'R', 'O', 'T', 'O', #10, 'R', 'O', 'O', 'M', 'S', #10, 'U', 'N', 'D', '_', 'F', 'I', 'N', 'I', 'S', 'H', 'E', 'D', #10, 'U', 'N', '_', 'G', 'A', 'M', 'E', #10, 'S', 'E', 'R', 'V', 'E', 'R', '_', 'A', 'U', 'T', 'H', #10, 'M', 'E', 'S', 'S', 'A', 'G', 'E', #10, 'V', 'A', 'R', 'S', #10, 'T', 'E', 'A', 'M', '_', 'A', 'C', 'C', 'E', 'P', 'T', 'E', 'D', #10, 'C', 'O', 'L', 'O', 'R', #10, 'W', 'A', 'R', 'N', 'I', 'N', 'G', #10, #0, #10); -const commands: array[0..235] of integer = (13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -38, 13, 8, 0, 0, 0, 0, 0, 0, -37, 0, 0, 0, -36, 29, 5, 0, 0, 0, -35, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -34, 0, 0, 0, 0, 0, 0, 0, 0, 0, -33, 4, 0, 0, -32, 8, 0, 0, 0, 0, 0, 0, -31, 6, 0, 0, 0, 0, -30, 13, 0, 0, 0, 4, 0, 0, -29, 0, 0, 0, 0, -28, 8, 0, 0, 0, 0, 0, 0, -27, 25, 5, 0, 0, 0, -26, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, -25, 0, 0, 0, 0, 0, -24, 13, 5, 0, 0, 0, -23, 0, 0, 0, 0, 0, 0, -22, 12, 5, 0, 0, 0, -21, 0, 0, 0, 0, 0, -20, 30, 20, 5, 0, 0, 0, -19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -18, 0, 0, 0, 0, 0, 0, 0, 0, -17, 28, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, -16, 9, 0, 0, 0, 0, 0, 0, 0, -15, 0, 0, 0, 0, 0, -14, 22, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, -13, 0, 0, 0, 0, 0, 0, -12, 9, 0, 0, 0, 0, 0, 0, 0, -11, 0, 0, -10); +const commands: array[0..206] of integer = (12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -38, 11, 7, 0, 0, 0, 0, 0, -37, 0, 0, -36, 26, 4, 0, 0, -35, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -34, 0, 0, 0, 0, 0, 0, 0, 0, -33, 3, 0, -32, 7, 0, 0, 0, 0, 0, -31, 5, 0, 0, 0, -30, 11, 0, 0, 0, 3, 0, -29, 0, 0, 0, -28, 7, 0, 0, 0, 0, 0, -27, 22, 4, 0, 0, -26, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, -25, 0, 0, 0, 0, -24, 11, 4, 0, 0, -23, 0, 0, 0, 0, 0, -22, 10, 4, 0, 0, -21, 0, 0, 0, 0, -20, 27, 18, 4, 0, 0, -19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -18, 0, 0, 0, 0, 0, 0, 0, -17, 25, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, -16, 8, 0, 0, 0, 0, 0, 0, -15, 0, 0, 0, 0, -14, 20, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, -13, 0, 0, 0, 0, 0, -12, 8, 0, 0, 0, 0, 0, 0, -11, 0, -10); procedure handler_ASKPASSWORD; begin @@ -114,6 +123,8 @@ procedure handler_PING; begin state.cmd:= cmd_PING; + + sendNet('PONG'); end; procedure handler_PROTO; @@ -169,40 +180,60 @@ procedure handler___UNKNOWN__; begin state.cmd:= cmd___UNKNOWN__; + + writeln('[NET] Unknown cmd'); end; const handlers: array[0..28] of PHandler = (@handler___UNKNOWN__, @handler_WARNING, @handler_TEAM_COLOR, @handler_TEAM_ACCEPTED, @handler_SERVER_VARS, @handler_SERVER_MESSAGE, @handler_SERVER_AUTH, @handler_RUN_GAME, @handler_ROUND_FINISHED, @handler_ROOMS, @handler_PROTO, @handler_PING, @handler_NOTICE, @handler_NICK, @handler_LOBBY_LEFT, @handler_LOBBY_JOINED, @handler_LEFT, @handler_KICKED, @handler_JOINING, @handler_JOINED, @handler_INFO, @handler_HH_NUM, @handler_EM, @handler_CONNECTED, @handler_CLIENT_FLAGS, @handler_CHAT, @handler_BYE, @handler_BANLIST, @handler_ASKPASSWORD); // end of generated stuff +procedure handleTail; +var cnt: Longint; + c: char; +begin + state.l:= 0; + + c:= getCurrChar; + repeat + if c = #10 then cnt:= 0 else cnt:= 1; + repeat + c:= getNextChar; + inc(cnt) + until (c = #0) or (c = #10); + until (c = #0) or (cnt = 1) +end; + var sock: PTCPSocket; fds: PSDLNet_SocketSet; netReaderThread: PSDL_Thread; - sockbuf: shortstring; - sockbufpos: byte; + +function getCurrChar: char; +begin + getCurrChar:= state.buf[state.bufpos] +end; function getNextChar: char; var r: byte; begin - if sockbufpos < byte(sockbuf[0]) then + if state.bufpos < byte(state.buf[0]) then begin - inc(sockbufpos); - getNextChar:= sockbuf[sockbufpos]; + inc(state.bufpos); end else begin - r:= SDLNet_TCP_Recv(sock, @sockbuf[1], 255); + r:= SDLNet_TCP_Recv(sock, @state.buf[1], 255); if r > 0 then begin - sockbufpos:= 1; - sockbuf[0]:= char(r); - getNextChar:= sockbuf[1]; + state.bufpos:= 1; + state.buf[0]:= char(r); end else begin - sockbufpos:= 0; - sockbuf[0]:= #0; - getNextChar:= #0 + state.bufpos:= 0; + state.buf[0]:= #0; end - end + end; + + getNextChar:= state.buf[state.bufpos]; end; function netReader(data: pointer): LongInt; cdecl; export; @@ -210,21 +241,38 @@ begin repeat c:= getNextChar; + writeln('>>>>> ', c, ' [', letters[state.l], '] ', commands[state.l]); if c = #0 then - state.netState:= netDisconnected; - if c = letters[state.l] then - if commands[state.l] < 0 then - handlers[-10 - commands[state.l]]() - else - inc(state.l) + state.netState:= netDisconnected else - if commands[state.l] = 0 then - // unknown cmd + begin + while (letters[state.l] <> c) and (commands[state.l] > 0) do + inc(state.l, commands[state.l]); + + if c = letters[state.l] then + if commands[state.l] < 0 then + begin + handlers[-10 - commands[state.l]](); + handleTail() + end + else + inc(state.l) else - repeat - inc(state.l, commands[state.l]) - until (letters[state.l] = c) or (commands[state.l] = 0) -until state.netState = netDisconnected + begin + handler___UNKNOWN__(); + handleTail() + end + end +until state.netState = netDisconnected; + +writeln('[NET] netReader: disconnected'); +end; + +procedure sendNet(s: shortstring); +begin + writeln('[NET] Send: ', s); + SDLNet_TCP_Send(sock, @s[1], byte(s[0])); + SDLNet_TCP_Send(sock, @endCmd, 2); end; procedure connectOfficialServer; @@ -236,8 +284,12 @@ if SDLNet_ResolveHost(ipaddr, PChar('netserver.hedgewars.org'), 46631) = 0 then sock:= SDLNet_TCP_Open(ipaddr); - sockbufpos:= 0; - sockbuf:= ''; + state.bufpos:= 0; + state.buf:= ''; + + state.l:= 0; + state.netState:= netConnecting; + netReaderThread:= SDL_CreateThread(@netReader{$IFDEF SDL2}, 'netReader'{$ENDIF}, nil); end; diff -r 8ebf01f75d9f -r 384765cd0caf tools/protocolParser.hs --- a/tools/protocolParser.hs Wed May 13 23:21:40 2015 +0300 +++ b/tools/protocolParser.hs Fri May 15 23:28:31 2015 +0300 @@ -119,7 +119,7 @@ where buildTables cmds = let (_, _, _, t1, t2, t3) = foldr walk (0, [0], -10, [], [], [[]]) cmds in (tail t1, tail t2, concat t3) walk (PTCommand _ (Command n params)) (lc, s:sh, pc, tbl1, tbl2, (t3:tbl3)) = - (lc, 2:sh, pc - 1, "#10":"#0":tbl1, "0":show pc:tbl2, (n:t3):tbl3) + (lc, 1:sh, pc - 1, "#10":tbl1, show pc:tbl2, (n:t3):tbl3) walk (PTPrefix prefix cmds) l = lvldown $ foldr fpf (foldr walk (lvlup l) cmds) prefix lvlup (lc, sh, pc, tbl1, tbl2, tbl3) = (lc, 0:sh, pc, tbl1, tbl2, []:tbl3) lvldown (lc, s1:s2:sh, pc, tbl1, t:tbl2, t31:t32:tbl3) = (lc, s1+s2:sh, pc, tbl1, (if null t32 then "0" else show s1):tbl2, (t31 ++ t32):tbl3)