diff -r 450ca0afcd58 -r 9be6693c78cb gameServer/NetRoutines.hs --- a/gameServer/NetRoutines.hs Thu Feb 25 15:58:44 2010 +0000 +++ b/gameServer/NetRoutines.hs Thu Feb 25 18:28:33 2010 +0000 @@ -16,45 +16,45 @@ acceptLoop :: Socket -> Chan CoreMessage -> Int -> IO () acceptLoop servSock coreChan clientCounter = do - Exception.handle - (\(_ :: Exception.IOException) -> putStrLn "exception on connect") $ - do - (socket, sockAddr) <- Network.Socket.accept servSock + Exception.handle + (\(_ :: Exception.IOException) -> putStrLn "exception on connect") $ + do + (socket, sockAddr) <- Network.Socket.accept servSock - cHandle <- socketToHandle socket ReadWriteMode - hSetBuffering cHandle LineBuffering - clientHost <- sockAddr2String sockAddr + cHandle <- socketToHandle socket ReadWriteMode + hSetBuffering cHandle LineBuffering + clientHost <- sockAddr2String sockAddr - currentTime <- getCurrentTime - - sendChan <- newChan + currentTime <- getCurrentTime + + sendChan <- newChan - let newClient = - (ClientInfo - nextID - sendChan - cHandle - clientHost - currentTime - "" - "" - False - 0 - 0 - 0 - False - False - False - undefined - undefined - ) + let newClient = + (ClientInfo + nextID + sendChan + cHandle + clientHost + currentTime + "" + "" + False + 0 + 0 + 0 + False + False + False + undefined + undefined + ) - writeChan coreChan $ Accept newClient + writeChan coreChan $ Accept newClient - forkIO $ clientRecvLoop cHandle coreChan nextID - forkIO $ clientSendLoop cHandle coreChan sendChan nextID - return () + forkIO $ clientRecvLoop cHandle coreChan nextID + forkIO $ clientSendLoop cHandle coreChan sendChan nextID + return () - acceptLoop servSock coreChan nextID - where - nextID = clientCounter + 1 + acceptLoop servSock coreChan nextID + where + nextID = clientCounter + 1