Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the checker after some testing
authorunc0rr
Sun, 10 Feb 2013 01:45:25 +0400
changeset 8485 7cae79214537
parent 8484 99c14f14f788
child 8486 9a65baafd7d7
Fix the checker after some testing
gameServer/EngineInteraction.hs file | annotate | diff | comparison | revisions 
--- a/gameServer/EngineInteraction.hs	Sun Feb 10 01:27:32 2013 +0400
+++ b/gameServer/EngineInteraction.hs	Sun Feb 10 01:45:25 2013 +0400
@@ -35,11 +35,11 @@
 checkNetCmd :: B.ByteString -> (B.ByteString, B.ByteString)
 checkNetCmd msg = check decoded
     where
-        decoded = liftM splitMessages $ fromEngineMsg msg
+        decoded = liftM (splitMessages . BW.pack) $ Base64.decode $ B.unpack msg
         check Nothing = (B.empty, B.empty)
         check (Just msgs) = let (a, b) = (filter isLegal msgs, filter isNonEmpty a) in (encode a, encode b)
         encode = B.pack . Base64.encode . BW.unpack . B.concat
-        isLegal = flip Set.member legalMessages . B.head
+        isLegal m = (B.length m > 1) && (flip Set.member legalMessages . B.head . B.tail $ m)
         isNonEmpty = (/=) '+' . B.head
         legalMessages = Set.fromList $ "M#+LlRrUuDdZzAaSjJ,sNpPwtghbc12345" ++ slotMessages
         slotMessages = "\128\129\130\131\132\133\134\135\136\137\138"
hedgewars