author | Mailaender |
Fri, 15 Nov 2013 14:41:36 -0500 | |
changeset 9700 | 3034605a4604 |
parent 9662 | 47dbd9601342 |
child 9702 | 27006953d901 |
permissions | -rw-r--r-- |
8403
fbc6e7602e05
- Allow server admins to use DELEGATE even when not room owner
unc0rr
parents:
8401
diff
changeset
|
1 |
{-# LANGUAGE CPP, OverloadedStrings, ScopedTypeVariables #-} |
7766 | 2 |
{-# OPTIONS_GHC -fno-warn-orphans #-} |
5184 | 3 |
module Actions where |
4 |
||
5 |
import Control.Concurrent |
|
6 |
import qualified Data.Set as Set |
|
8403
fbc6e7602e05
- Allow server admins to use DELEGATE even when not room owner
unc0rr
parents:
8401
diff
changeset
|
7 |
import qualified Data.Map as Map |
5184 | 8 |
import qualified Data.List as L |
9 |
import qualified Control.Exception as Exception |
|
10 |
import System.Log.Logger |
|
11 |
import Control.Monad |
|
12 |
import Data.Time |
|
13 |
import Data.Maybe |
|
14 |
import Control.Monad.Reader |
|
15 |
import Control.Monad.State.Strict |
|
16 |
import qualified Data.ByteString.Char8 as B |
|
17 |
import Control.DeepSeq |
|
18 |
import Data.Unique |
|
19 |
import Control.Arrow |
|
9448 | 20 |
import Control.Exception as E |
5209
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5184
diff
changeset
|
21 |
import System.Process |
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5184
diff
changeset
|
22 |
import Network.Socket |
9035
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
9032
diff
changeset
|
23 |
import System.Random |
5184 | 24 |
----------------------------- |
7766 | 25 |
#if defined(OFFICIAL_SERVER) |
5996
2c72fe81dd37
Convert boolean variable + a bunch of fields which make sense only while game is going on into Maybe + structure
unc0rr
parents:
5426
diff
changeset
|
26 |
import OfficialServer.GameReplayStore |
7766 | 27 |
#endif |
5184 | 28 |
import CoreTypes |
29 |
import Utils |
|
30 |
import ClientIO |
|
31 |
import ServerState |
|
32 |
import Consts |
|
33 |
import ConfigFile |
|
6068 | 34 |
import EngineInteraction |
5184 | 35 |
|
36 |
||
37 |
type CmdHandler = [B.ByteString] -> Reader (ClientIndex, IRnC) [Action] |
|
38 |
||
39 |
||
40 |
othersChans :: StateT ServerState IO [ClientChan] |
|
41 |
othersChans = do |
|
42 |
cl <- client's id |
|
43 |
ri <- clientRoomA |
|
44 |
liftM (map sendChan . filter (/= cl)) $ roomClientsS ri |
|
45 |
||
46 |
processAction :: Action -> StateT ServerState IO () |
|
47 |
||
48 |
||
49 |
processAction (AnswerClients chans msg) = |
|
50 |
io $ mapM_ (`writeChan` (msg `deepseq` msg)) (chans `deepseq` chans) |
|
51 |
||
52 |
||
53 |
processAction SendServerMessage = do |
|
54 |
chan <- client's sendChan |
|
55 |
protonum <- client's clientProto |
|
56 |
si <- liftM serverInfo get |
|
57 |
let message = if protonum < latestReleaseVersion si then |
|
58 |
serverMessageForOldVersions si |
|
59 |
else |
|
60 |
serverMessage si |
|
61 |
processAction $ AnswerClients [chan] ["SERVER_MESSAGE", message] |
|
62 |
||
63 |
||
64 |
processAction SendServerVars = do |
|
65 |
chan <- client's sendChan |
|
66 |
si <- gets serverInfo |
|
67 |
io $ writeChan chan ("SERVER_VARS" : vars si) |
|
68 |
where |
|
69 |
vars si = [ |
|
70 |
"MOTD_NEW", serverMessage si, |
|
71 |
"MOTD_OLD", serverMessageForOldVersions si, |
|
72 |
"LATEST_PROTO", showB $ latestReleaseVersion si |
|
73 |
] |
|
74 |
||
75 |
||
76 |
processAction (ProtocolError msg) = do |
|
77 |
chan <- client's sendChan |
|
78 |
processAction $ AnswerClients [chan] ["ERROR", msg] |
|
79 |
||
80 |
||
81 |
processAction (Warning msg) = do |
|
82 |
chan <- client's sendChan |
|
83 |
processAction $ AnswerClients [chan] ["WARNING", msg] |
|
84 |
||
85 |
processAction (NoticeMessage n) = do |
|
86 |
chan <- client's sendChan |
|
87 |
processAction $ AnswerClients [chan] ["NOTICE", showB . fromEnum $ n] |
|
88 |
||
89 |
processAction (ByeClient msg) = do |
|
90 |
(Just ci) <- gets clientIndex |
|
91 |
ri <- clientRoomA |
|
92 |
||
93 |
chan <- client's sendChan |
|
94 |
clNick <- client's nick |
|
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
95 |
loggedIn <- client's isVisible |
5184 | 96 |
|
97 |
when (ri /= lobbyId) $ do |
|
98 |
processAction $ MoveToLobby ("quit: " `B.append` msg) |
|
99 |
return () |
|
100 |
||
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
101 |
clientsChans <- liftM (Prelude.map sendChan . Prelude.filter isVisible) $! allClientsS |
5184 | 102 |
io $ |
103 |
infoM "Clients" (show ci ++ " quits: " ++ B.unpack msg) |
|
104 |
||
105 |
when loggedIn $ processAction $ AnswerClients clientsChans ["LOBBY:LEFT", clNick, msg] |
|
106 |
||
8158 | 107 |
mapM_ processAction |
7465
c2dcf97ca664
Okay, this is workaround over ping timeouts problem on the server. Could make server crash if recieve thread wakes up after second ping timeout event.
unc0rr
parents:
7351
diff
changeset
|
108 |
[ |
c2dcf97ca664
Okay, this is workaround over ping timeouts problem on the server. Could make server crash if recieve thread wakes up after second ping timeout event.
unc0rr
parents:
7351
diff
changeset
|
109 |
AnswerClients [chan] ["BYE", msg] |
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
110 |
, ModifyClient (\c -> c{nick = "", isVisible = False}) -- this will effectively hide client from others while he isn't deleted from list |
7465
c2dcf97ca664
Okay, this is workaround over ping timeouts problem on the server. Could make server crash if recieve thread wakes up after second ping timeout event.
unc0rr
parents:
7351
diff
changeset
|
111 |
] |
c2dcf97ca664
Okay, this is workaround over ping timeouts problem on the server. Could make server crash if recieve thread wakes up after second ping timeout event.
unc0rr
parents:
7351
diff
changeset
|
112 |
|
5184 | 113 |
s <- get |
114 |
put $! s{removedClients = ci `Set.insert` removedClients s} |
|
115 |
||
116 |
processAction (DeleteClient ci) = do |
|
117 |
io $ debugM "Clients" $ "DeleteClient: " ++ show ci |
|
118 |
||
119 |
rnc <- gets roomsClients |
|
120 |
io $ removeClient rnc ci |
|
121 |
||
122 |
s <- get |
|
123 |
put $! s{removedClients = ci `Set.delete` removedClients s} |
|
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
124 |
|
5209
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5184
diff
changeset
|
125 |
sp <- gets (shutdownPending . serverInfo) |
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5184
diff
changeset
|
126 |
cls <- allClientsS |
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5184
diff
changeset
|
127 |
io $ when (sp && null cls) $ throwIO ShutdownException |
5184 | 128 |
|
129 |
processAction (ModifyClient f) = do |
|
130 |
(Just ci) <- gets clientIndex |
|
131 |
rnc <- gets roomsClients |
|
132 |
io $ modifyClient rnc f ci |
|
133 |
return () |
|
134 |
||
135 |
processAction (ModifyClient2 ci f) = do |
|
136 |
rnc <- gets roomsClients |
|
137 |
io $ modifyClient rnc f ci |
|
138 |
return () |
|
139 |
||
7757
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
140 |
processAction (ModifyRoomClients f) = do |
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
141 |
rnc <- gets roomsClients |
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
142 |
ri <- clientRoomA |
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
143 |
roomClIDs <- io $ roomClientsIndicesM rnc ri |
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
144 |
io $ mapM_ (modifyClient rnc f) roomClIDs |
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
145 |
|
5184 | 146 |
|
147 |
processAction (ModifyRoom f) = do |
|
148 |
rnc <- gets roomsClients |
|
149 |
ri <- clientRoomA |
|
150 |
io $ modifyRoom rnc f ri |
|
151 |
return () |
|
152 |
||
153 |
||
154 |
processAction (ModifyServerInfo f) = do |
|
155 |
modify (\s -> s{serverInfo = f $ serverInfo s}) |
|
156 |
si <- gets serverInfo |
|
157 |
io $ writeServerConfig si |
|
158 |
||
159 |
||
160 |
processAction (MoveToRoom ri) = do |
|
161 |
(Just ci) <- gets clientIndex |
|
162 |
rnc <- gets roomsClients |
|
163 |
||
164 |
io $ do |
|
9109
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
165 |
modifyClient rnc ( |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
166 |
\cl -> cl{teamsInGame = 0 |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
167 |
, isReady = False |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
168 |
, isMaster = False |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
169 |
, isInGame = False |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
170 |
, isJoinedMidGame = False |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
171 |
, clientClan = Nothing}) ci |
5184 | 172 |
modifyRoom rnc (\r -> r{playersIn = playersIn r + 1}) ri |
173 |
moveClientToRoom rnc ri ci |
|
174 |
||
175 |
chans <- liftM (map sendChan) $ roomClientsS ri |
|
176 |
clNick <- client's nick |
|
9193 | 177 |
allClientsChans <- liftM (Prelude.map sendChan . Prelude.filter isVisible) $! allClientsS |
5184 | 178 |
|
9193 | 179 |
mapM_ processAction [ |
180 |
AnswerClients chans ["JOINED", clNick] |
|
181 |
, AnswerClients allClientsChans ["CLIENT_FLAGS", "+i", clNick] |
|
182 |
] |
|
5184 | 183 |
|
184 |
||
185 |
processAction (MoveToLobby msg) = do |
|
186 |
(Just ci) <- gets clientIndex |
|
187 |
ri <- clientRoomA |
|
188 |
rnc <- gets roomsClients |
|
7766 | 189 |
playersNum <- io $ room'sM rnc playersIn ri |
5184 | 190 |
master <- client's isMaster |
191 |
-- client <- client's id |
|
192 |
clNick <- client's nick |
|
193 |
chans <- othersChans |
|
194 |
||
195 |
if master then |
|
7521 | 196 |
if playersNum > 1 then |
8438
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
197 |
mapM_ processAction [ChangeMaster Nothing, NoticeMessage AdminLeft, RemoveClientTeams, AnswerClients chans ["LEFT", clNick, msg]] |
5184 | 198 |
else |
199 |
processAction RemoveRoom |
|
200 |
else |
|
8438
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
201 |
mapM_ processAction [RemoveClientTeams, AnswerClients chans ["LEFT", clNick, msg]] |
5184 | 202 |
|
9193 | 203 |
allClientsChans <- liftM (Prelude.map sendChan . Prelude.filter isVisible) $! allClientsS |
204 |
processAction $ AnswerClients allClientsChans ["CLIENT_FLAGS", "-i", clNick] |
|
205 |
||
5184 | 206 |
-- when not removing room |
7351
34efdd1f230f
- Check ready status only after deleting player's teams (should fix the bug when you're unable to start game)
unc0rr
parents:
7321
diff
changeset
|
207 |
ready <- client's isReady |
7521 | 208 |
when (not master || playersNum > 1) . io $ do |
5184 | 209 |
modifyRoom rnc (\r -> r{ |
210 |
playersIn = playersIn r - 1, |
|
211 |
readyPlayers = if ready then readyPlayers r - 1 else readyPlayers r |
|
212 |
}) ri |
|
213 |
moveClientToLobby rnc ci |
|
214 |
||
7710
fd5bcbd698a5
- Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents:
7682
diff
changeset
|
215 |
|
8247 | 216 |
processAction (ChangeMaster delegateId)= do |
5184 | 217 |
(Just ci) <- gets clientIndex |
7710
fd5bcbd698a5
- Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents:
7682
diff
changeset
|
218 |
proto <- client's clientProto |
5184 | 219 |
ri <- clientRoomA |
220 |
rnc <- gets roomsClients |
|
8247 | 221 |
newMasterId <- liftM (\ids -> fromMaybe (last . filter (/= ci) $ ids) delegateId) . io $ roomClientsIndicesM rnc ri |
5184 | 222 |
newMaster <- io $ client'sM rnc id newMasterId |
9062
a65492ca1587
Fix room admin rights delegation by server admin when he isn't room admin
unc0rr
parents:
9060
diff
changeset
|
223 |
oldMasterId <- io $ room'sM rnc masterID ri |
a65492ca1587
Fix room admin rights delegation by server admin when he isn't room admin
unc0rr
parents:
9060
diff
changeset
|
224 |
oldMaster <- io $ client'sM rnc id oldMasterId |
6733 | 225 |
oldRoomName <- io $ room'sM rnc name ri |
8245 | 226 |
kicked <- client's isKickedFromServer |
7668
4cb423f42105
Show who is the room admin on join (no tested, also I don't like how it is done via server warnings, but it seems there's no other solution compatible with .17)
unc0rr
parents:
7664
diff
changeset
|
227 |
thisRoomChans <- liftM (map sendChan) $ roomClientsS ri |
8245 | 228 |
let newRoomName = if (proto < 42) || kicked then nick newMaster else oldRoomName |
5184 | 229 |
mapM_ processAction [ |
7775 | 230 |
ModifyRoom (\r -> r{masterID = newMasterId |
231 |
, name = newRoomName |
|
232 |
, isRestrictedJoins = False |
|
233 |
, isRestrictedTeams = False |
|
8983 | 234 |
, isRegisteredOnly = False} |
235 |
) |
|
236 |
, ModifyClient2 newMasterId (\c -> c{isMaster = True}) |
|
9062
a65492ca1587
Fix room admin rights delegation by server admin when he isn't room admin
unc0rr
parents:
9060
diff
changeset
|
237 |
, ModifyClient2 oldMasterId (\c -> c{isMaster = False}) |
7682 | 238 |
, AnswerClients [sendChan newMaster] ["ROOM_CONTROL_ACCESS", "1"] |
9062
a65492ca1587
Fix room admin rights delegation by server admin when he isn't room admin
unc0rr
parents:
9060
diff
changeset
|
239 |
, AnswerClients thisRoomChans ["CLIENT_FLAGS", "-h", nick oldMaster] |
8983 | 240 |
, AnswerClients thisRoomChans ["CLIENT_FLAGS", "+h", nick newMaster] |
5184 | 241 |
] |
242 |
||
7766 | 243 |
newRoom' <- io $ room'sM rnc id ri |
6541
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
244 |
chans <- liftM (map sendChan) $! sameProtoClientsS proto |
7972 | 245 |
processAction $ AnswerClients chans ("ROOM" : "UPD" : oldRoomName : roomInfo (nick newMaster) newRoom') |
6541
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
246 |
|
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
247 |
|
5184 | 248 |
processAction (AddRoom roomName roomPassword) = do |
249 |
Just clId <- gets clientIndex |
|
250 |
rnc <- gets roomsClients |
|
6541
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
251 |
proto <- client's clientProto |
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
252 |
n <- client's nick |
5184 | 253 |
|
254 |
let rm = newRoom{ |
|
255 |
masterID = clId, |
|
256 |
name = roomName, |
|
257 |
password = roomPassword, |
|
258 |
roomProto = proto |
|
259 |
} |
|
260 |
||
261 |
rId <- io $ addRoom rnc rm |
|
262 |
||
263 |
processAction $ MoveToRoom rId |
|
264 |
||
6541
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
265 |
chans <- liftM (map sendChan) $! sameProtoClientsS proto |
5184 | 266 |
|
267 |
mapM_ processAction [ |
|
7945
4006d77e1a28
Send notification about 1 player in room on room creation
unc0rr
parents:
7926
diff
changeset
|
268 |
AnswerClients chans ("ROOM" : "ADD" : roomInfo n rm{playersIn = 1}) |
5184 | 269 |
] |
270 |
||
271 |
||
272 |
processAction RemoveRoom = do |
|
273 |
Just clId <- gets clientIndex |
|
274 |
rnc <- gets roomsClients |
|
275 |
ri <- io $ clientRoomM rnc clId |
|
276 |
roomName <- io $ room'sM rnc name ri |
|
277 |
others <- othersChans |
|
6541
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
278 |
proto <- client's clientProto |
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
279 |
chans <- liftM (map sendChan) $! sameProtoClientsS proto |
5184 | 280 |
|
281 |
mapM_ processAction [ |
|
6541
08ed346ed341
Send full room info on room add and update events. Less(?) traffic, but current frontend doesn't behave good with this change to server.
unc0rr
parents:
6191
diff
changeset
|
282 |
AnswerClients chans ["ROOM", "DEL", roomName], |
5184 | 283 |
AnswerClients others ["ROOMABANDONED", roomName] |
284 |
] |
|
285 |
||
286 |
io $ removeRoom rnc ri |
|
287 |
||
288 |
||
7921
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
289 |
processAction SendUpdateOnThisRoom = do |
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
290 |
Just clId <- gets clientIndex |
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
291 |
proto <- client's clientProto |
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
292 |
rnc <- gets roomsClients |
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
293 |
ri <- io $ clientRoomM rnc clId |
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
294 |
rm <- io $ room'sM rnc id ri |
7926
550083f61a0e
oops, fix incorrect room owner name in ROOM UPD command again
unc0rr
parents:
7924
diff
changeset
|
295 |
n <- io $ client'sM rnc nick (masterID rm) |
7921
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
296 |
chans <- liftM (map sendChan) $! sameProtoClientsS proto |
7924
351f970c60e1
oops, fix incorrect room owner name in ROOM UPD command
unc0rr
parents:
7921
diff
changeset
|
297 |
processAction $ AnswerClients chans ("ROOM" : "UPD" : name rm : roomInfo n rm) |
7921
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
298 |
|
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
299 |
|
6758
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
300 |
processAction UnreadyRoomClients = do |
5184 | 301 |
ri <- clientRoomA |
302 |
roomPlayers <- roomClientsS ri |
|
303 |
pr <- client's clientProto |
|
7757
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
304 |
mapM_ processAction [ |
7775 | 305 |
AnswerClients (map sendChan roomPlayers) $ notReadyMessage pr . map nick . filter (not . isMaster) $ roomPlayers |
9109
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
306 |
, ModifyRoomClients (\cl -> cl{isReady = isMaster cl, isJoinedMidGame = False}) |
7775 | 307 |
, ModifyRoom (\r -> r{readyPlayers = 1}) |
7757
c20e6c80e249
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
unc0rr
parents:
7748
diff
changeset
|
308 |
] |
5184 | 309 |
where |
310 |
notReadyMessage p nicks = if p < 38 then "NOT_READY" : nicks else "CLIENT_FLAGS" : "-r" : nicks |
|
311 |
||
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
312 |
|
6758
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
313 |
processAction FinishGame = do |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
314 |
rnc <- gets roomsClients |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
315 |
ri <- clientRoomA |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
316 |
thisRoomChans <- liftM (map sendChan) $ roomClientsS ri |
9109
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
317 |
joinedMidGame <- liftM (filter isJoinedMidGame) $ roomClientsS ri |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
318 |
answerRemovedTeams <- io $ |
9109
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
319 |
room'sM rnc (\r -> let gi = fromJust $ gameInfo r in |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
320 |
concatMap (\c -> |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
321 |
(answerFullConfigParams c (mapParams r) (params r)) |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
322 |
++ |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
323 |
(map (\t -> AnswerClients [sendChan c] ["REMOVE_TEAM", t]) $ leftTeams gi) |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
324 |
) joinedMidGame |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
325 |
) ri |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
326 |
|
9109
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
327 |
mapM_ processAction $ ( |
7124 | 328 |
SaveReplay |
7126
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
329 |
: ModifyRoom |
6758
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
330 |
(\r -> r{ |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
331 |
gameInfo = Nothing, |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
332 |
readyPlayers = 0 |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
333 |
} |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
334 |
) |
7921
6b074de32bea
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
unc0rr
parents:
7898
diff
changeset
|
335 |
: SendUpdateOnThisRoom |
8241
b15f165c080c
Send "ROUND_FINISHED" to room clients when server thinks so
unc0rr
parents:
8239
diff
changeset
|
336 |
: AnswerClients thisRoomChans ["ROUND_FINISHED"] |
7126
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
337 |
: answerRemovedTeams |
9109
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
338 |
) |
878f06e9c484
- Fix issue 521 by resending FULLMAPCONFIG on game finish to those who joined mid-game. Semitested.
unc0rr
parents:
9062
diff
changeset
|
339 |
++ [UnreadyRoomClients] |
5184 | 340 |
|
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
341 |
|
6753
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
342 |
processAction (SendTeamRemovalMessage teamName) = do |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
343 |
chans <- othersChans |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
344 |
mapM_ processAction [ |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
345 |
AnswerClients chans ["EM", rmTeamMsg], |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
346 |
ModifyRoom (\r -> r{ |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
347 |
gameInfo = liftM (\g -> g{ |
7124 | 348 |
teamsInGameNumber = teamsInGameNumber g - 1 |
9381 | 349 |
, roundMsgs = (if isJust $ lastFilteredTimedMsg g then (:) (fromJust $ lastFilteredTimedMsg g) else id) |
350 |
$ rmTeamMsg : roundMsgs g |
|
6753
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
351 |
}) $ gameInfo r |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
352 |
}) |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
353 |
] |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
354 |
|
6758
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
355 |
rnc <- gets roomsClients |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
356 |
ri <- clientRoomA |
26bf919aeb57
Oh, should also check for game finish when player quits without ROUNDFINISHED message: small refactoring, not tested at all
unc0rr
parents:
6756
diff
changeset
|
357 |
gi <- io $ room'sM rnc gameInfo ri |
8422 | 358 |
when (0 == teamsInGameNumber (fromJust gi)) $ |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
359 |
processAction FinishGame |
6753
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
360 |
where |
e95b1f62d0de
Don't remove client's teams from teams list on "ROUNDFINISHED 0", just send team removal message to others.
unc0rr
parents:
6733
diff
changeset
|
361 |
rmTeamMsg = toEngineMsg $ 'F' `B.cons` teamName |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
362 |
|
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
363 |
|
5184 | 364 |
processAction (RemoveTeam teamName) = do |
8438
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
365 |
(Just ci) <- gets clientIndex |
5184 | 366 |
rnc <- gets roomsClients |
367 |
ri <- clientRoomA |
|
8438
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
368 |
inGame <- io $ do |
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
369 |
r <- room'sM rnc (isJust . gameInfo) ri |
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
370 |
c <- client'sM rnc isInGame ci |
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
371 |
return $ r && c |
5184 | 372 |
chans <- othersChans |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
373 |
mapM_ processAction $ |
7126
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
374 |
ModifyRoom (\r -> r{ |
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
375 |
teams = Prelude.filter (\t -> teamName /= teamname t) $ teams r |
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
376 |
, gameInfo = liftM (\g -> g{leftTeams = teamName : leftTeams g}) $ gameInfo r |
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
377 |
}) |
7947 | 378 |
: SendUpdateOnThisRoom |
7124 | 379 |
: AnswerClients chans ["REMOVE_TEAM", teamName] |
380 |
: [SendTeamRemovalMessage teamName | inGame] |
|
5184 | 381 |
|
382 |
||
8438
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
383 |
processAction RemoveClientTeams = do |
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
384 |
(Just ci) <- gets clientIndex |
5184 | 385 |
rnc <- gets roomsClients |
386 |
||
387 |
removeTeamActions <- io $ do |
|
8438
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
388 |
rId <- clientRoomM rnc ci |
5184 | 389 |
roomTeams <- room'sM rnc teams rId |
8438
64ac58abd02a
Don't resend "team quit" message when client closes engine, then quits room:
unc0rr
parents:
8422
diff
changeset
|
390 |
return . Prelude.map (RemoveTeam . teamname) . Prelude.filter (\t -> teamownerId t == ci) $ roomTeams |
5184 | 391 |
|
392 |
mapM_ processAction removeTeamActions |
|
393 |
||
394 |
||
395 |
||
396 |
processAction CheckRegistered = do |
|
397 |
(Just ci) <- gets clientIndex |
|
398 |
n <- client's nick |
|
399 |
h <- client's host |
|
400 |
p <- client's clientProto |
|
8371 | 401 |
checker <- client's isChecker |
5184 | 402 |
uid <- client's clUID |
8371 | 403 |
-- allow multiple checker logins |
404 |
haveSameNick <- liftM (not . null . tail . filter (\c -> (not $ isChecker c) && caseInsensitiveCompare (nick c) n)) allClientsS |
|
8476 | 405 |
if (not checker) && haveSameNick then |
5184 | 406 |
if p < 38 then |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
407 |
processAction $ ByeClient $ loc "Nickname is already in use" |
5184 | 408 |
else |
9032
2345f5f96a29
Clear nickname in case of collision so client could try again. Should help with issue 550 if not fix it.
unc0rr
parents:
8983
diff
changeset
|
409 |
mapM_ processAction [NoticeMessage NickAlreadyInUse, ModifyClient $ \c -> c{nick = B.empty}] |
5184 | 410 |
else |
411 |
do |
|
412 |
db <- gets (dbQueries . serverInfo) |
|
413 |
io $ writeChan db $ CheckAccount ci (hashUnique uid) n h |
|
414 |
return () |
|
415 |
||
416 |
processAction ClearAccountsCache = do |
|
417 |
dbq <- gets (dbQueries . serverInfo) |
|
418 |
io $ writeChan dbq ClearCache |
|
419 |
return () |
|
420 |
||
421 |
||
8189 | 422 |
processAction (ProcessAccountInfo info) = do |
5184 | 423 |
case info of |
9435 | 424 |
HasAccount passwd isAdmin isContr -> do |
8189 | 425 |
b <- isBanned |
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
426 |
c <- client's isChecker |
9435 | 427 |
when (not b) $ (if c then checkerLogin else playerLogin) passwd isAdmin isContr |
8189 | 428 |
Guest -> do |
429 |
b <- isBanned |
|
8523 | 430 |
c <- client's isChecker |
8189 | 431 |
when (not b) $ |
8523 | 432 |
if c then |
9435 | 433 |
checkerLogin "" False False |
8523 | 434 |
else |
435 |
processAction JoinLobby |
|
5184 | 436 |
Admin -> do |
437 |
mapM_ processAction [ModifyClient (\cl -> cl{isAdministrator = True}), JoinLobby] |
|
438 |
chan <- client's sendChan |
|
439 |
processAction $ AnswerClients [chan] ["ADMIN_ACCESS"] |
|
9446 | 440 |
ReplayName fn -> processAction $ ShowReplay fn |
8189 | 441 |
where |
442 |
isBanned = do |
|
8239 | 443 |
processAction $ CheckBanned False |
8189 | 444 |
liftM B.null $ client's nick |
9435 | 445 |
checkerLogin _ False _ = processAction $ ByeClient $ loc "No checker rights" |
446 |
checkerLogin p True _ = do |
|
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
447 |
wp <- client's webPassword |
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
448 |
processAction $ |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
449 |
if wp == p then ModifyClient $ \c -> c{logonPassed = True} else ByeClient $ loc "Authentication failed" |
9435 | 450 |
playerLogin p a contr = do |
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
451 |
chan <- client's sendChan |
9435 | 452 |
mapM_ processAction [ |
453 |
AnswerClients [chan] ["ASKPASSWORD"] |
|
454 |
, ModifyClient (\c -> c{webPassword = p, isAdministrator = a, isContributor = contr}) |
|
455 |
] |
|
5184 | 456 |
|
457 |
processAction JoinLobby = do |
|
458 |
chan <- client's sendChan |
|
9528 | 459 |
rnc <- gets roomsClients |
5184 | 460 |
clientNick <- client's nick |
7498
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
461 |
isAuthenticated <- liftM (not . B.null) $ client's webPassword |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
462 |
isAdmin <- client's isAdministrator |
9435 | 463 |
isContr <- client's isContributor |
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
464 |
loggedInClients <- liftM (Prelude.filter isVisible) $! allClientsS |
7498
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
465 |
let (lobbyNicks, clientsChans) = unzip . L.map (nick &&& sendChan) $ loggedInClients |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
466 |
let authenticatedNicks = L.map nick . L.filter (not . B.null . webPassword) $ loggedInClients |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
467 |
let adminsNicks = L.map nick . L.filter isAdministrator $ loggedInClients |
9435 | 468 |
let contrNicks = L.map nick . L.filter isContributor $ loggedInClients |
9528 | 469 |
inRoomNicks <- io $ |
470 |
allClientsM rnc |
|
471 |
>>= filterM (liftM ((/=) lobbyId) . clientRoomM rnc) |
|
472 |
>>= mapM (client'sM rnc nick) |
|
9435 | 473 |
let clFlags = B.concat . L.concat $ [["u" | isAuthenticated], ["a" | isAdmin], ["c" | isContr]] |
7498
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
474 |
mapM_ processAction . concat $ [ |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
475 |
[AnswerClients clientsChans ["LOBBY:JOINED", clientNick]] |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
476 |
, [AnswerClients [chan] ("LOBBY:JOINED" : clientNick : lobbyNicks)] |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
477 |
, [AnswerClients [chan] ("CLIENT_FLAGS" : "+u" : authenticatedNicks) | not $ null authenticatedNicks] |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
478 |
, [AnswerClients [chan] ("CLIENT_FLAGS" : "+a" : adminsNicks) | not $ null adminsNicks] |
9435 | 479 |
, [AnswerClients [chan] ("CLIENT_FLAGS" : "+c" : contrNicks) | not $ null contrNicks] |
9528 | 480 |
, [AnswerClients [chan] ("CLIENT_FLAGS" : "+i" : inRoomNicks) | not $ null inRoomNicks] |
7498
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
481 |
, [AnswerClients (chan : clientsChans) ["CLIENT_FLAGS", B.concat["+" , clFlags], clientNick] | not $ B.null clFlags] |
8372
3c193ec03e09
Logon procedure for checkers, introduce invisible clients
unc0rr
parents:
8371
diff
changeset
|
482 |
, [ModifyClient (\cl -> cl{logonPassed = True, isVisible = True})] |
7498
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
483 |
, [SendServerMessage] |
86984f6fa1b9
Introduce 'a' and 'u' client flags to mark admins and authenticated users
unc0rr
parents:
7465
diff
changeset
|
484 |
] |
5184 | 485 |
|
486 |
||
487 |
processAction (KickClient kickId) = do |
|
488 |
modify (\s -> s{clientIndex = Just kickId}) |
|
5214 | 489 |
clHost <- client's host |
490 |
currentTime <- io getCurrentTime |
|
491 |
mapM_ processAction [ |
|
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
492 |
AddIP2Bans clHost (loc "60 seconds cooldown after kick") (addUTCTime 60 currentTime) |
8245 | 493 |
, ModifyClient (\c -> c{isKickedFromServer = True}) |
494 |
, ByeClient "Kicked" |
|
5214 | 495 |
] |
5184 | 496 |
|
497 |
||
498 |
processAction (BanClient seconds reason banId) = do |
|
499 |
modify (\s -> s{clientIndex = Just banId}) |
|
500 |
clHost <- client's host |
|
501 |
currentTime <- io getCurrentTime |
|
5426
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
502 |
let msg = B.concat ["Ban for ", B.pack . show $ seconds, " (", reason, ")"] |
5184 | 503 |
mapM_ processAction [ |
504 |
AddIP2Bans clHost msg (addUTCTime seconds currentTime) |
|
505 |
, KickClient banId |
|
506 |
] |
|
507 |
||
8245 | 508 |
|
5426
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
509 |
processAction (BanIP ip seconds reason) = do |
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
510 |
currentTime <- io getCurrentTime |
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
511 |
let msg = B.concat ["Ban for ", B.pack . show $ seconds, " (", reason, ")"] |
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
512 |
processAction $ |
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
513 |
AddIP2Bans ip msg (addUTCTime seconds currentTime) |
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
514 |
|
8245 | 515 |
|
8154 | 516 |
processAction (BanNick n seconds reason) = do |
517 |
currentTime <- io getCurrentTime |
|
518 |
let msg = |
|
519 |
if seconds > 60 * 60 * 24 * 365 then |
|
520 |
B.concat ["Permanent ban (", reason, ")"] |
|
521 |
else |
|
522 |
B.concat ["Ban for ", B.pack . show $ seconds, " (", reason, ")"] |
|
523 |
processAction $ |
|
524 |
AddNick2Bans n msg (addUTCTime seconds currentTime) |
|
525 |
||
8245 | 526 |
|
5426
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
527 |
processAction BanList = do |
8156 | 528 |
time <- io $ getCurrentTime |
5426
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
529 |
ch <- client's sendChan |
8156 | 530 |
b <- gets (B.intercalate "\n" . concatMap (ban2Str time) . bans . serverInfo) |
5426
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
531 |
processAction $ |
7766 | 532 |
AnswerClients [ch] ["BANLIST", b] |
8156 | 533 |
where |
534 |
ban2Str time (BanByIP b r t) = ["I", b, r, B.pack . show $ t `diffUTCTime` time] |
|
535 |
ban2Str time (BanByNick b r t) = ["N", b, r, B.pack . show $ t `diffUTCTime` time] |
|
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
536 |
|
8245 | 537 |
|
7748 | 538 |
processAction (Unban entry) = do |
8156 | 539 |
processAction $ ModifyServerInfo (\s -> s{bans = filter (not . f) $ bans s}) |
7748 | 540 |
where |
541 |
f (BanByIP bip _ _) = bip == entry |
|
542 |
f (BanByNick bn _ _) = bn == entry |
|
5184 | 543 |
|
8245 | 544 |
|
5184 | 545 |
processAction (KickRoomClient kickId) = do |
546 |
modify (\s -> s{clientIndex = Just kickId}) |
|
547 |
ch <- client's sendChan |
|
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
548 |
mapM_ processAction [AnswerClients [ch] ["KICKED"], MoveToLobby $ loc "kicked"] |
5184 | 549 |
|
550 |
||
551 |
processAction (AddClient cl) = do |
|
552 |
rnc <- gets roomsClients |
|
553 |
si <- gets serverInfo |
|
554 |
newClId <- io $ do |
|
555 |
ci <- addClient rnc cl |
|
556 |
_ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci) |
|
557 |
||
558 |
infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl)) |
|
559 |
||
560 |
return ci |
|
561 |
||
562 |
modify (\s -> s{clientIndex = Just newClId}) |
|
563 |
mapM_ processAction |
|
564 |
[ |
|
565 |
AnswerClients [sendChan cl] ["CONNECTED", "Hedgewars server http://www.hedgewars.org/", serverVersion] |
|
8239 | 566 |
, CheckBanned True |
6809 | 567 |
, AddIP2Bans (host cl) "Reconnected too fast" (addUTCTime 10 $ connectTime cl) |
5184 | 568 |
] |
569 |
||
570 |
||
571 |
processAction (AddNick2Bans n reason expiring) = do |
|
572 |
processAction $ ModifyServerInfo (\s -> s{bans = BanByNick n reason expiring : bans s}) |
|
573 |
||
574 |
processAction (AddIP2Bans ip reason expiring) = do |
|
575 |
(Just ci) <- gets clientIndex |
|
576 |
rc <- gets removedClients |
|
577 |
when (not $ ci `Set.member` rc) |
|
578 |
$ processAction $ ModifyServerInfo (\s -> s{bans = BanByIP ip reason expiring : bans s}) |
|
579 |
||
8519
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8514
diff
changeset
|
580 |
|
8239 | 581 |
processAction (CheckBanned byIP) = do |
5184 | 582 |
clTime <- client's connectTime |
583 |
clNick <- client's nick |
|
584 |
clHost <- client's host |
|
585 |
si <- gets serverInfo |
|
586 |
let validBans = filter (checkNotExpired clTime) $ bans si |
|
8239 | 587 |
let ban = L.find (checkBan byIP clHost clNick) $ validBans |
5426
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
588 |
mapM_ processAction $ |
5184 | 589 |
ModifyServerInfo (\s -> s{bans = validBans}) |
5426
109e9b5761c2
Implement command for banning by ip and a command for bans list
unc0rr
parents:
5214
diff
changeset
|
590 |
: [ByeClient (getBanReason $ fromJust ban) | isJust ban] |
5184 | 591 |
where |
592 |
checkNotExpired testTime (BanByIP _ _ time) = testTime `diffUTCTime` time <= 0 |
|
593 |
checkNotExpired testTime (BanByNick _ _ time) = testTime `diffUTCTime` time <= 0 |
|
8239 | 594 |
checkBan True ip _ (BanByIP bip _ _) = bip `B.isPrefixOf` ip |
595 |
checkBan False _ n (BanByNick bn _ _) = caseInsensitiveCompare bn n |
|
596 |
checkBan _ _ _ _ = False |
|
5184 | 597 |
getBanReason (BanByIP _ msg _) = msg |
598 |
getBanReason (BanByNick _ msg _) = msg |
|
599 |
||
8519
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8514
diff
changeset
|
600 |
|
5184 | 601 |
processAction PingAll = do |
602 |
rnc <- gets roomsClients |
|
603 |
io (allClientsM rnc) >>= mapM_ (kickTimeouted rnc) |
|
604 |
cis <- io $ allClientsM rnc |
|
605 |
chans <- io $ mapM (client'sM rnc sendChan) cis |
|
606 |
io $ mapM_ (modifyClient rnc (\cl -> cl{pingsQueue = pingsQueue cl + 1})) cis |
|
607 |
processAction $ AnswerClients chans ["PING"] |
|
608 |
where |
|
609 |
kickTimeouted rnc ci = do |
|
610 |
pq <- io $ client'sM rnc pingsQueue ci |
|
7465
c2dcf97ca664
Okay, this is workaround over ping timeouts problem on the server. Could make server crash if recieve thread wakes up after second ping timeout event.
unc0rr
parents:
7351
diff
changeset
|
611 |
when (pq > 0) $ do |
5184 | 612 |
withStateT (\as -> as{clientIndex = Just ci}) $ |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8396
diff
changeset
|
613 |
processAction (ByeClient $ loc "Ping timeout") |
7600
31a177d2856c
Disable workaround, as it still makes server crash and hung clients are hidden from players anyway
unc0rr
parents:
7537
diff
changeset
|
614 |
-- when (pq > 1) $ |
31a177d2856c
Disable workaround, as it still makes server crash and hung clients are hidden from players anyway
unc0rr
parents:
7537
diff
changeset
|
615 |
-- processAction $ DeleteClient ci -- smth went wrong with client io threads, issue DeleteClient here |
5184 | 616 |
|
617 |
||
618 |
processAction StatsAction = do |
|
5211 | 619 |
si <- gets serverInfo |
620 |
when (not $ shutdownPending si) $ do |
|
5212
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
621 |
rnc <- gets roomsClients |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
622 |
(roomsNum, clientsNum) <- io $ withRoomsAndClients rnc st |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
623 |
io $ writeChan (dbQueries si) $ SendStats clientsNum (roomsNum - 1) |
5184 | 624 |
where |
625 |
st irnc = (length $ allRooms irnc, length $ allClients irnc) |
|
626 |
||
9435 | 627 |
|
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
628 |
processAction RestartServer = do |
5212
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
629 |
sp <- gets (shutdownPending . serverInfo) |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
630 |
when (not sp) $ do |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
631 |
sock <- gets (fromJust . serverSocket . serverInfo) |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
632 |
args <- gets (runArgs . serverInfo) |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
633 |
io $ do |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
634 |
noticeM "Core" "Closing listening socket" |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
635 |
sClose sock |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
636 |
noticeM "Core" "Spawning new server" |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
637 |
_ <- createProcess (proc "./hedgewars-server" args) |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
638 |
return () |
eaffb02f0053
Don't perform RestartServer action when already did it once
unc0rr
parents:
5211
diff
changeset
|
639 |
processAction $ ModifyServerInfo (\s -> s{shutdownPending = True}) |
5184 | 640 |
|
9435 | 641 |
|
8403
fbc6e7602e05
- Allow server admins to use DELEGATE even when not room owner
unc0rr
parents:
8401
diff
changeset
|
642 |
processAction Stats = do |
fbc6e7602e05
- Allow server admins to use DELEGATE even when not room owner
unc0rr
parents:
8401
diff
changeset
|
643 |
cls <- allClientsS |
8452 | 644 |
rms <- allRoomsS |
645 |
let clientsMap = Map.fromListWith (+) . map (\c -> (clientProto c, 1 :: Int)) $ cls |
|
646 |
let roomsMap = Map.fromListWith (+) . map (\c -> (roomProto c, 1 :: Int)) . filter ((/=) 0 . roomProto) $ rms |
|
647 |
let keys = Map.keysSet clientsMap `Set.union` Map.keysSet roomsMap |
|
648 |
let versionsStats = B.concat . ((:) "<table border=1>") . (flip (++) ["</table>"]) |
|
649 |
. concatMap (\p -> [ |
|
650 |
"<tr><td>", protoNumber2ver p |
|
651 |
, "</td><td>", showB $ Map.findWithDefault 0 p clientsMap |
|
652 |
, "</td><td>", showB $ Map.findWithDefault 0 p roomsMap |
|
653 |
, "</td></tr>"]) |
|
654 |
. Set.toList $ keys |
|
655 |
processAction $ Warning versionsStats |
|
656 |
||
8403
fbc6e7602e05
- Allow server admins to use DELEGATE even when not room owner
unc0rr
parents:
8401
diff
changeset
|
657 |
|
9035
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
9032
diff
changeset
|
658 |
processAction (Random chans items) = do |
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
9032
diff
changeset
|
659 |
let i = if null items then ["heads", "tails"] else items |
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
9032
diff
changeset
|
660 |
n <- io $ randomRIO (0, length i - 1) |
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
9032
diff
changeset
|
661 |
processAction $ AnswerClients chans ["CHAT", "[random]", i !! n] |
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
9032
diff
changeset
|
662 |
|
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
9032
diff
changeset
|
663 |
|
6012 | 664 |
#if defined(OFFICIAL_SERVER) |
5184 | 665 |
processAction SaveReplay = do |
666 |
ri <- clientRoomA |
|
667 |
rnc <- gets roomsClients |
|
8371 | 668 |
|
9437 | 669 |
readyCheckersIds <- io $ do |
5184 | 670 |
r <- room'sM rnc id ri |
671 |
saveReplay r |
|
9437 | 672 |
allci <- allClientsM rnc |
673 |
filterM (client'sM rnc isReadyChecker) allci |
|
9433 | 674 |
|
675 |
when (not $ null readyCheckersIds) $ do |
|
9439 | 676 |
oldci <- gets clientIndex |
677 |
withStateT (\s -> s{clientIndex = Just $ head readyCheckersIds}) |
|
678 |
$ processAction CheckRecord |
|
679 |
modify (\s -> s{clientIndex = oldci}) |
|
9433 | 680 |
where |
681 |
isReadyChecker cl = isChecker cl && isReady cl |
|
8479
8d71109b04d2
Some work on loading replay and interaction with checker
unc0rr
parents:
8476
diff
changeset
|
682 |
|
8d71109b04d2
Some work on loading replay and interaction with checker
unc0rr
parents:
8476
diff
changeset
|
683 |
|
8d71109b04d2
Some work on loading replay and interaction with checker
unc0rr
parents:
8476
diff
changeset
|
684 |
processAction CheckRecord = do |
8d71109b04d2
Some work on loading replay and interaction with checker
unc0rr
parents:
8476
diff
changeset
|
685 |
p <- client's clientProto |
8482 | 686 |
c <- client's sendChan |
9662
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
687 |
ri <- clientRoomA |
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
688 |
rnc <- gets roomsClients |
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
689 |
|
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
690 |
blackList <- liftM (map (recordFileName . fromJust . checkInfo) . filter (isJust . checkInfo)) allClientsS |
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
691 |
|
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
692 |
readyCheckersIds <- io $ do |
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
693 |
allci <- allClientsM rnc |
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
694 |
filterM (client'sM rnc (isJust . checkInfo)) allci |
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
695 |
|
47dbd9601342
Ensure checkers don't check same replay simultaneously
unc0rr
parents:
9528
diff
changeset
|
696 |
(cinfo, l) <- io $ loadReplay (fromIntegral p) blackList |
8509 | 697 |
when (not . null $ l) $ |
698 |
mapM_ processAction [ |
|
699 |
AnswerClients [c] ("REPLAY" : l) |
|
9444 | 700 |
, ModifyClient $ \c -> c{checkInfo = cinfo, isReady = False} |
8509 | 701 |
] |
8479
8d71109b04d2
Some work on loading replay and interaction with checker
unc0rr
parents:
8476
diff
changeset
|
702 |
|
9433 | 703 |
|
8509 | 704 |
processAction (CheckFailed msg) = do |
705 |
Just (CheckInfo fileName _) <- client's checkInfo |
|
706 |
io $ moveFailedRecord fileName |
|
8507 | 707 |
|
9433 | 708 |
|
8509 | 709 |
processAction (CheckSuccess info) = do |
9399 | 710 |
Just (CheckInfo fileName teams) <- client's checkInfo |
9401 | 711 |
si <- gets serverInfo |
712 |
io $ writeChan (dbQueries si) $ StoreAchievements (B.pack fileName) (map toPair teams) info |
|
8509 | 713 |
io $ moveCheckedRecord fileName |
9399 | 714 |
where |
715 |
toPair t = (teamname t, teamowner t) |
|
8507 | 716 |
|
9446 | 717 |
processAction (QueryReplay name) = do |
718 |
(Just ci) <- gets clientIndex |
|
719 |
si <- gets serverInfo |
|
720 |
uid <- client's clUID |
|
721 |
io $ writeChan (dbQueries si) $ GetReplayName ci (hashUnique uid) name |
|
722 |
||
6012 | 723 |
#else |
724 |
processAction SaveReplay = return () |
|
8479
8d71109b04d2
Some work on loading replay and interaction with checker
unc0rr
parents:
8476
diff
changeset
|
725 |
processAction CheckRecord = return () |
8507 | 726 |
processAction (CheckFailed _) = return () |
727 |
processAction (CheckSuccess _) = return () |
|
9446 | 728 |
processAction (QueryReplay _) = return () |
6012 | 729 |
#endif |
9446 | 730 |
|
731 |
processAction (ShowReplay name) = do |
|
9448 | 732 |
c <- client's sendChan |
733 |
cl <- client's id |
|
734 |
||
735 |
let fileName = B.concat ["checked/", if B.isPrefixOf "replays/" name then B.drop 8 name else name] |
|
736 |
||
737 |
checkInfo <- liftIO $ E.handle (\(e :: SomeException) -> |
|
738 |
warningM "REPLAYS" (B.unpack $ B.concat ["Problems reading ", fileName, ": ", B.pack $ show e]) >> return Nothing) $ do |
|
739 |
(t, p1, p2, msgs) <- liftM read $ readFile (B.unpack fileName) |
|
740 |
return $ Just (t, Map.fromList p1, Map.fromList p2, reverse msgs) |
|
9446 | 741 |
|
9448 | 742 |
let (teams, params1, params2, roundMsgs) = fromJust checkInfo |
743 |
||
744 |
when (isJust checkInfo) $ do |
|
745 |
mapM_ processAction $ concat [ |
|
746 |
[AnswerClients [c] ["JOINED", nick cl]] |
|
747 |
, answerFullConfigParams cl params1 params2 |
|
748 |
, answerAllTeams cl teams |
|
749 |
, [AnswerClients [c] ["RUN_GAME"]] |
|
750 |
, [AnswerClients [c] $ "EM" : roundMsgs] |
|
751 |
, [AnswerClients [c] ["KICKED"]] |
|
752 |
] |