author | nemo |
Tue, 06 Nov 2018 12:44:38 -0500 | |
changeset 14168 | 89acfded7722 |
parent 13512 | 36f3f77e9b1b |
child 14401 | 8ad85859dd3f |
child 14408 | 1465f34973b5 |
permissions | -rw-r--r-- |
10460
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
1 |
{- |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
10460
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
4 |
* |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
6 |
* it under the terms of the GNU General Public License as published by |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
7 |
* the Free Software Foundation; version 2 of the License |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
8 |
* |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
12 |
* GNU General Public License for more details. |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
13 |
* |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
17 |
\-} |
8dcea9087d75
Added copyrights to gameServer directory
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents:
10392
diff
changeset
|
18 |
|
11320
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
19 |
{-# LANGUAGE CPP, OverloadedStrings, DeriveDataTypeable, GeneralizedNewtypeDeriving #-} |
1804 | 20 |
module CoreTypes where |
21 |
||
4579
4e61c2a42121
Explicitly kill listening thread in try to prevent messages recieving bugs
unc0rr
parents:
4337
diff
changeset
|
22 |
import Control.Concurrent |
1804 | 23 |
import Data.Word |
24 |
import qualified Data.Map as Map |
|
1926
cb46fbdcaa41
Add simple DoS protection mechanism (although better than previous server had)
unc0rr
parents:
1921
diff
changeset
|
25 |
import Data.Time |
1804 | 26 |
import Network |
2352 | 27 |
import Data.Function |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
28 |
import Data.ByteString.Char8 as B |
4918
c6d3aec73f93
Add Unique field to Client structure, and use it to check for matching recieved account status with client
unc0rr
parents:
4907
diff
changeset
|
29 |
import Data.Unique |
4959 | 30 |
import Control.Exception |
31 |
import Data.Typeable |
|
4989 | 32 |
import Data.TConfig |
8519
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
33 |
import Control.DeepSeq |
4959 | 34 |
----------------------- |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
35 |
import RoomsAndClients |
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
36 |
|
8519
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
37 |
#if __GLASGOW_HASKELL__ < 706 |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
38 |
instance NFData B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
39 |
#endif |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
40 |
|
10983 | 41 |
instance NFData (Chan a) where rnf a = a `seq` () |
8519
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
42 |
|
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
43 |
instance NFData Action where |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
44 |
rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` () |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
45 |
rnf a = a `seq` () |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
46 |
|
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
47 |
data Action = |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
48 |
AnswerClients ![ClientChan] ![B.ByteString] |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
49 |
| SendServerMessage |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
50 |
| SendServerVars |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
51 |
| MoveToRoom RoomIndex |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
52 |
| MoveToLobby B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
53 |
| RemoveTeam B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
54 |
| SendTeamRemovalMessage B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
55 |
| RemoveRoom |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
56 |
| FinishGame |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
57 |
| UnreadyRoomClients |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
58 |
| JoinLobby |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
59 |
| ProtocolError B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
60 |
| Warning B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
61 |
| NoticeMessage Notice |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
62 |
| ByeClient B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
63 |
| KickClient ClientIndex |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
64 |
| KickRoomClient ClientIndex |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
65 |
| BanClient NominalDiffTime B.ByteString ClientIndex |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
66 |
| BanIP B.ByteString NominalDiffTime B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
67 |
| BanNick B.ByteString NominalDiffTime B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
68 |
| BanList |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
69 |
| Unban B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
70 |
| ChangeMaster (Maybe ClientIndex) |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
71 |
| RemoveClientTeams |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
72 |
| ModifyClient (ClientInfo -> ClientInfo) |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
73 |
| ModifyClient2 ClientIndex (ClientInfo -> ClientInfo) |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
74 |
| ModifyRoomClients (ClientInfo -> ClientInfo) |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
75 |
| ModifyRoom (RoomInfo -> RoomInfo) |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
76 |
| ModifyServerInfo (ServerInfo -> ServerInfo) |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
77 |
| AddRoom B.ByteString B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
78 |
| SendUpdateOnThisRoom |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
79 |
| CheckRegistered |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
80 |
| ClearAccountsCache |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
81 |
| ProcessAccountInfo AccountInfo |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
82 |
| AddClient ClientInfo |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
83 |
| DeleteClient ClientIndex |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
84 |
| PingAll |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
85 |
| StatsAction |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
86 |
| RestartServer |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
87 |
| AddNick2Bans B.ByteString B.ByteString UTCTime |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
88 |
| AddIP2Bans B.ByteString B.ByteString UTCTime |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
89 |
| CheckBanned Bool |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
90 |
| SaveReplay |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
91 |
| Stats |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
92 |
| CheckRecord |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
93 |
| CheckFailed B.ByteString |
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
94 |
| CheckSuccess [B.ByteString] |
9035
e84d42a4311c
'/rnd' command. Pass it a (possibly empty) list of items.
unc0rr
parents:
8897
diff
changeset
|
95 |
| Random [ClientChan] [B.ByteString] |
11575 | 96 |
| LoadGhost B.ByteString |
9446 | 97 |
| QueryReplay B.ByteString |
98 |
| ShowReplay B.ByteString |
|
9973
7589978c9912
Stub for joins monitor which is a replacement to plain ban for 10 seconds system after join
unc0rr
parents:
9884
diff
changeset
|
99 |
| Cleanup |
10090 | 100 |
| RegisterEvent Event |
10195 | 101 |
| SaveRoom B.ByteString |
102 |
| LoadRoom B.ByteString |
|
10212 | 103 |
| ReactCmd [B.ByteString] |
10215 | 104 |
| CheckVotes |
10786
712283ed86e0
Implement /newseed and /hedgehogs commands. Only tested for building.
unc0rr
parents:
10732
diff
changeset
|
105 |
| SetRandomSeed |
10090 | 106 |
|
107 |
||
108 |
data Event = LobbyChatMessage |
|
109 |
| EngineMessage |
|
110 |
| RoomJoin |
|
10094 | 111 |
|
112 |
type EventsInfo = [(Int, UTCTime)] |
|
8519
98e2dbdda8c0
Workaround desync issue if I correctly understand its roots (barely tested)
unc0rr
parents:
8509
diff
changeset
|
113 |
|
10093 | 114 |
newEventsInfo :: EventsInfo |
10786
712283ed86e0
Implement /newseed and /hedgehogs commands. Only tested for building.
unc0rr
parents:
10732
diff
changeset
|
115 |
newEventsInfo = [] |
10212 | 116 |
|
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
117 |
type ClientChan = Chan [B.ByteString] |
3435 | 118 |
|
8507 | 119 |
data CheckInfo = |
120 |
CheckInfo |
|
121 |
{ |
|
8509 | 122 |
recordFileName :: String, |
11246
09a2d3988569
Also pass script information alongwith winner/achievements info, so that we could potentially have per mode ratings
unc0rr
parents:
11046
diff
changeset
|
123 |
recordTeams :: [TeamInfo], |
11320
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
124 |
details :: Maybe GameDetails |
8507 | 125 |
} |
126 |
||
1804 | 127 |
data ClientInfo = |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
128 |
ClientInfo |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
129 |
{ |
11464 | 130 |
clUID :: !Unique, |
131 |
sendChan :: !ClientChan, |
|
132 |
clientSocket :: !Socket, |
|
133 |
host :: !B.ByteString, |
|
134 |
connectTime :: !UTCTime, |
|
135 |
nick :: !B.ByteString, |
|
136 |
webPassword :: !B.ByteString, |
|
137 |
serverSalt :: !B.ByteString, |
|
138 |
logonPassed :: !Bool, |
|
139 |
isVisible :: !Bool, |
|
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
140 |
clientProto :: !Word16, |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
141 |
pingsQueue :: !Word, |
11464 | 142 |
isMaster :: !Bool, |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
143 |
isReady :: !Bool, |
11464 | 144 |
isInGame :: !Bool, |
145 |
isAdministrator :: !Bool, |
|
11467
f2c36df8c7b1
Allow server admins to join passworded/restricted rooms when it is really needed
unc0rr
parents:
11466
diff
changeset
|
146 |
hasSuperPower :: !Bool, |
11464 | 147 |
isChecker :: !Bool, |
148 |
isContributor :: !Bool, |
|
149 |
isKickedFromServer :: !Bool, |
|
150 |
isJoinedMidGame :: !Bool, |
|
151 |
hasAskedList :: !Bool, |
|
8433 | 152 |
clientClan :: !(Maybe B.ByteString), |
11464 | 153 |
checkInfo :: !(Maybe CheckInfo), |
10093 | 154 |
eiLobbyChat, |
155 |
eiEM, |
|
11464 | 156 |
eiJoin :: !EventsInfo, |
11466
4b5c7a5c49fd
Defer kicking to the time when everything is in consistent state
unc0rr
parents:
11465
diff
changeset
|
157 |
teamsInGame :: !Word, |
11556
af9aa8d5863c
Filter out hog speech messages with non-local team index (not tested)
unc0rr
parents:
11467
diff
changeset
|
158 |
teamIndexes :: ![Word8], |
11466
4b5c7a5c49fd
Defer kicking to the time when everything is in consistent state
unc0rr
parents:
11465
diff
changeset
|
159 |
pendingActions :: ![Action] |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
160 |
} |
1804 | 161 |
|
162 |
instance Eq ClientInfo where |
|
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
163 |
(==) = (==) `on` clientSocket |
1804 | 164 |
|
165 |
data HedgehogInfo = |
|
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
166 |
HedgehogInfo B.ByteString B.ByteString |
5143
649d87819682
Start implementation of archivements/ratings on server side: replay saving routine
unc0rr
parents:
5007
diff
changeset
|
167 |
deriving (Show, Read) |
1804 | 168 |
|
169 |
data TeamInfo = |
|
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
170 |
TeamInfo |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
171 |
{ |
11464 | 172 |
teamowner :: !B.ByteString, |
173 |
teamname :: !B.ByteString, |
|
174 |
teamcolor :: !B.ByteString, |
|
175 |
teamgrave :: !B.ByteString, |
|
176 |
teamfort :: !B.ByteString, |
|
177 |
teamvoicepack :: !B.ByteString, |
|
178 |
teamflag :: !B.ByteString, |
|
179 |
isOwnerRegistered :: !Bool, |
|
180 |
difficulty :: !Int, |
|
181 |
hhnum :: !Int, |
|
182 |
hedgehogs :: ![HedgehogInfo] |
|
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
183 |
} |
5143
649d87819682
Start implementation of archivements/ratings on server side: replay saving routine
unc0rr
parents:
5007
diff
changeset
|
184 |
deriving (Show, Read) |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
185 |
|
8431 | 186 |
instance Eq TeamInfo where |
187 |
(==) = (==) `on` teamname |
|
8479
8d71109b04d2
Some work on loading replay and interaction with checker
unc0rr
parents:
8433
diff
changeset
|
188 |
|
5996
2c72fe81dd37
Convert boolean variable + a bunch of fields which make sense only while game is going on into Maybe + structure
unc0rr
parents:
5210
diff
changeset
|
189 |
data GameInfo = |
2c72fe81dd37
Convert boolean variable + a bunch of fields which make sense only while game is going on into Maybe + structure
unc0rr
parents:
5210
diff
changeset
|
190 |
GameInfo |
2c72fe81dd37
Convert boolean variable + a bunch of fields which make sense only while game is going on into Maybe + structure
unc0rr
parents:
5210
diff
changeset
|
191 |
{ |
8369 | 192 |
roundMsgs :: [B.ByteString], |
9304
3f4c3fc146c2
Fix spectator desync in rare conditions (there was team which left during its turn, and last command with timestamp from it was '+')
unc0rr
parents:
9109
diff
changeset
|
193 |
lastFilteredTimedMsg :: Maybe B.ByteString, |
7126
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
194 |
leftTeams :: [B.ByteString], |
10814
810ac1d21fd0
This should help with second rejoin bug. (reverting previous workaround over frontend bug and making a new one)
unc0rr
parents:
10786
diff
changeset
|
195 |
rejoinedTeams :: [B.ByteString], -- for 0.9.21 frontend workaround |
5996
2c72fe81dd37
Convert boolean variable + a bunch of fields which make sense only while game is going on into Maybe + structure
unc0rr
parents:
5210
diff
changeset
|
196 |
teamsAtStart :: [TeamInfo], |
6756
344d32bb1328
Also consider game finished when the last player reports ROUNDFINISHED despite the correctness parameter.
unc0rr
parents:
6737
diff
changeset
|
197 |
teamsInGameNumber :: Int, |
8428 | 198 |
allPlayersHaveRegisteredAccounts :: !Bool, |
6069 | 199 |
giMapParams :: Map.Map B.ByteString B.ByteString, |
10392 | 200 |
giParams :: Map.Map B.ByteString [B.ByteString], |
201 |
isPaused :: Bool |
|
6069 | 202 |
} deriving (Show, Read) |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
203 |
|
7766 | 204 |
newGameInfo :: [TeamInfo] |
205 |
-> Int |
|
206 |
-> Bool |
|
207 |
-> Map.Map ByteString ByteString |
|
208 |
-> Map.Map ByteString [ByteString] |
|
10392 | 209 |
-> Bool |
7766 | 210 |
-> GameInfo |
7321
57bd4f201401
- Try sending remove message in 'finally' as a last resort
unc0rr
parents:
7126
diff
changeset
|
211 |
newGameInfo = |
5996
2c72fe81dd37
Convert boolean variable + a bunch of fields which make sense only while game is going on into Maybe + structure
unc0rr
parents:
5210
diff
changeset
|
212 |
GameInfo |
8369 | 213 |
[] |
9304
3f4c3fc146c2
Fix spectator desync in rare conditions (there was team which left during its turn, and last command with timestamp from it was '+')
unc0rr
parents:
9109
diff
changeset
|
214 |
Nothing |
7126
8daa5c8e84c0
Bring leftTeams back (with a fix) as it is apparently needed for spectators.
unc0rr
parents:
7124
diff
changeset
|
215 |
[] |
10814
810ac1d21fd0
This should help with second rejoin bug. (reverting previous workaround over frontend bug and making a new one)
unc0rr
parents:
10786
diff
changeset
|
216 |
[] |
1804 | 217 |
|
10194 | 218 |
|
1804 | 219 |
data RoomInfo = |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
220 |
RoomInfo |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
221 |
{ |
11464 | 222 |
masterID :: !(Maybe ClientIndex), |
223 |
name :: !B.ByteString, |
|
224 |
password :: !B.ByteString, |
|
225 |
roomProto :: !Word16, |
|
226 |
teams :: ![TeamInfo], |
|
227 |
gameInfo :: !(Maybe GameInfo), |
|
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
228 |
playersIn :: !Int, |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
229 |
readyPlayers :: !Int, |
11464 | 230 |
isRestrictedJoins :: !Bool, |
231 |
isRestrictedTeams :: !Bool, |
|
232 |
isRegisteredOnly :: !Bool, |
|
233 |
isSpecial :: !Bool, |
|
234 |
defaultHedgehogsNumber :: !Int, |
|
235 |
teamsNumberLimit :: !Int, |
|
236 |
greeting :: !B.ByteString, |
|
237 |
voting :: !(Maybe Voting), |
|
8002 | 238 |
roomBansList :: ![B.ByteString], |
11464 | 239 |
mapParams :: !(Map.Map B.ByteString B.ByteString), |
240 |
params :: !(Map.Map B.ByteString [B.ByteString]), |
|
11575 | 241 |
roomSaves :: !(Map.Map B.ByteString (B.ByteString, Map.Map B.ByteString B.ByteString, Map.Map B.ByteString [B.ByteString])) |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
242 |
} |
1804 | 243 |
|
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
244 |
newRoom :: RoomInfo |
4932 | 245 |
newRoom = |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
246 |
RoomInfo |
9753
9579596cf471
- Special rooms which stay even when last player quits. Not useful for now, and can't be removed at all.
unc0rr
parents:
9528
diff
changeset
|
247 |
Nothing |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
248 |
"" |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
249 |
"" |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
250 |
0 |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
251 |
[] |
5996
2c72fe81dd37
Convert boolean variable + a bunch of fields which make sense only while game is going on into Maybe + structure
unc0rr
parents:
5210
diff
changeset
|
252 |
Nothing |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
253 |
0 |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
254 |
0 |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
255 |
False |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
256 |
False |
8232 | 257 |
False |
9753
9579596cf471
- Special rooms which stay even when last player quits. Not useful for now, and can't be removed at all.
unc0rr
parents:
9528
diff
changeset
|
258 |
False |
10786
712283ed86e0
Implement /newseed and /hedgehogs commands. Only tested for building.
unc0rr
parents:
10732
diff
changeset
|
259 |
4 |
10882
ed7717f659ae
- Fix ping timeouts after incorrect "/vote" commands (protocol violation)
unc0rr
parents:
10814
diff
changeset
|
260 |
8 |
9787 | 261 |
"" |
10041 | 262 |
Nothing |
7537
833a0c34fafc
Room bans. They're more simple, than the global ones: if you ban someone, he is banned by ip in this room for the rest of the room lifetime. Not tested.
unc0rr
parents:
7321
diff
changeset
|
263 |
[] |
4941 | 264 |
( |
9753
9579596cf471
- Special rooms which stay even when last player quits. Not useful for now, and can't be removed at all.
unc0rr
parents:
9528
diff
changeset
|
265 |
Map.fromList $ Prelude.zip |
10482 | 266 |
["FEATURE_SIZE", "MAP", "MAPGEN", "MAZE_SIZE", "SEED", "TEMPLATE"] |
267 |
["12", "+rnd+", "0", "0", "seed", "0"] |
|
4941 | 268 |
) |
9753
9579596cf471
- Special rooms which stay even when last player quits. Not useful for now, and can't be removed at all.
unc0rr
parents:
9528
diff
changeset
|
269 |
( |
9579596cf471
- Special rooms which stay even when last player quits. Not useful for now, and can't be removed at all.
unc0rr
parents:
9528
diff
changeset
|
270 |
Map.fromList $ Prelude.zip |
10066 | 271 |
["AMMO", "SCHEME", "SCRIPT", "THEME"] |
272 |
[["Default"], ["Default"], ["Normal"], ["avematan"]] |
|
9753
9579596cf471
- Special rooms which stay even when last player quits. Not useful for now, and can't be removed at all.
unc0rr
parents:
9528
diff
changeset
|
273 |
) |
10194 | 274 |
Map.empty |
9753
9579596cf471
- Special rooms which stay even when last player quits. Not useful for now, and can't be removed at all.
unc0rr
parents:
9528
diff
changeset
|
275 |
|
1804 | 276 |
|
277 |
data StatisticsInfo = |
|
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
278 |
StatisticsInfo |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
279 |
{ |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
280 |
playersNumber :: Int, |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
281 |
roomsNumber :: Int |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
282 |
} |
1804 | 283 |
|
4989 | 284 |
data ServerInfo = |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
285 |
ServerInfo |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
286 |
{ |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
287 |
isDedicated :: Bool, |
11465
0ae2e4c13bd1
Allow toggling registration requirement on live server
unc0rr
parents:
11464
diff
changeset
|
288 |
isRegisteredUsersOnly :: Bool, |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
289 |
serverMessage :: B.ByteString, |
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
290 |
serverMessageForOldVersions :: B.ByteString, |
3260
b44b88908758
Allow to set motd for old client versions (not used yet, as server needs some refactoring)
unc0rr
parents:
2868
diff
changeset
|
291 |
latestReleaseVersion :: Word16, |
4988 | 292 |
earliestCompatibleVersion :: Word16, |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
293 |
listenPort :: PortNumber, |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
294 |
dbHost :: B.ByteString, |
4982
3572eaf14340
Add dbName parameter to .ini file, fix some warnings
unc0rr
parents:
4975
diff
changeset
|
295 |
dbName :: B.ByteString, |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
296 |
dbLogin :: B.ByteString, |
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
297 |
dbPassword :: B.ByteString, |
5007 | 298 |
bans :: [BanInfo], |
5209
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5143
diff
changeset
|
299 |
shutdownPending :: Bool, |
5210 | 300 |
runArgs :: [String], |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
301 |
coreChan :: Chan CoreMessage, |
4975
31da8979e5b1
Use Data.TConfig to read and store server config in hedgewars.ini (a little bit of hate to the author for not exporting Conf type)
unc0rr
parents:
4960
diff
changeset
|
302 |
dbQueries :: Chan DBQuery, |
5209
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5143
diff
changeset
|
303 |
serverSocket :: Maybe Socket, |
4989 | 304 |
serverConfig :: Maybe Conf |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
305 |
} |
1804 | 306 |
|
307 |
||
5209
f7a610e2ef5f
On restart command close server socket and spawn new server, keep running until last client quits
unc0rr
parents:
5143
diff
changeset
|
308 |
newServerInfo :: Chan CoreMessage -> Chan DBQuery -> Maybe Socket -> Maybe Conf -> ServerInfo |
4932 | 309 |
newServerInfo = |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
310 |
ServerInfo |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
311 |
True |
11465
0ae2e4c13bd1
Allow toggling registration requirement on live server
unc0rr
parents:
11464
diff
changeset
|
312 |
False |
13512
36f3f77e9b1b
Switch from http:// to https:// URLs where possible
Wuzzy <Wuzzy2@mail.ru>
parents:
13303
diff
changeset
|
313 |
"<h2><p align=center><a href=\"https://www.hedgewars.org/\">https://www.hedgewars.org/</a></p></h2>" |
36f3f77e9b1b
Switch from http:// to https:// URLs where possible
Wuzzy <Wuzzy2@mail.ru>
parents:
13303
diff
changeset
|
314 |
"<font color=yellow><h3 align=center>Hedgewars 0.9.24 is out! Please update.</h3><p align=center><a href=https://hedgewars.org/download.html>Download page here</a></font>" |
13303
e3613c0d3600
Bump protocol version, update sources in preparation for .24 release
unc0rr
parents:
12834
diff
changeset
|
315 |
55 -- latestReleaseVersion |
7862
bd76ca40db68
Choose first unused color for added team (addresses issue 431) + other small changes
unc0rr
parents:
7766
diff
changeset
|
316 |
41 -- earliestCompatibleVersion |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
317 |
46631 |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
318 |
"" |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
319 |
"" |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
320 |
"" |
4982
3572eaf14340
Add dbName parameter to .ini file, fix some warnings
unc0rr
parents:
4975
diff
changeset
|
321 |
"" |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
322 |
[] |
4955 | 323 |
False |
5210 | 324 |
[] |
1804 | 325 |
|
10041 | 326 |
data Voting = Voting { |
327 |
voteTTL :: Int, |
|
328 |
entitledToVote :: [Unique], |
|
329 |
votes :: [(Unique, Bool)], |
|
330 |
voteType :: VoteType |
|
331 |
} |
|
332 |
||
333 |
||
334 |
data VoteType = VoteKick B.ByteString |
|
10195 | 335 |
| VoteMap B.ByteString |
10392 | 336 |
| VotePause |
10786
712283ed86e0
Implement /newseed and /hedgehogs commands. Only tested for building.
unc0rr
parents:
10732
diff
changeset
|
337 |
| VoteNewSeed |
712283ed86e0
Implement /newseed and /hedgehogs commands. Only tested for building.
unc0rr
parents:
10732
diff
changeset
|
338 |
| VoteHedgehogsPerTeam Int |
10041 | 339 |
|
340 |
||
10058 | 341 |
newVoting :: VoteType -> Voting |
342 |
newVoting = Voting 2 [] [] |
|
10041 | 343 |
|
344 |
||
1839
5dd4cb7fd7e5
Server now send ASKPASSWORD command to frontend when user has web account
unc0rr
parents:
1833
diff
changeset
|
345 |
data AccountInfo = |
9435 | 346 |
HasAccount B.ByteString Bool Bool |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
347 |
| Guest |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
348 |
| Admin |
9446 | 349 |
| ReplayName B.ByteString |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
350 |
deriving (Show, Read) |
2116
dec7ead2d178
Bring back authentication to official server, now using separate process to perform database interaction
unc0rr
parents:
2104
diff
changeset
|
351 |
|
dec7ead2d178
Bring back authentication to official server, now using separate process to perform database interaction
unc0rr
parents:
2104
diff
changeset
|
352 |
data DBQuery = |
4918
c6d3aec73f93
Add Unique field to Client structure, and use it to check for matching recieved account status with client
unc0rr
parents:
4907
diff
changeset
|
353 |
CheckAccount ClientIndex Int B.ByteString B.ByteString |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
354 |
| ClearCache |
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
355 |
| SendStats Int Int |
11320
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
356 |
| StoreAchievements Word16 B.ByteString [(B.ByteString, B.ByteString)] GameDetails [B.ByteString] |
9446 | 357 |
| GetReplayName ClientIndex Int B.ByteString |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
358 |
deriving (Show, Read) |
1839
5dd4cb7fd7e5
Server now send ASKPASSWORD command to frontend when user has web account
unc0rr
parents:
1833
diff
changeset
|
359 |
|
11320
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
360 |
data GameDetails = |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
361 |
GameDetails { |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
362 |
gameScript :: B.ByteString |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
363 |
, infRope |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
364 |
, isVamp |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
365 |
, infAttacks :: Bool |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
366 |
} deriving (Show, Read) |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
367 |
|
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
368 |
instance NFData GameDetails where |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
369 |
rnf (GameDetails a b c d) = a `deepseq` b `deepseq` c `deepseq` d `deepseq` () |
556eafd1443a
Store some more details on game config in the database
unc0rr
parents:
11265
diff
changeset
|
370 |
|
1804 | 371 |
data CoreMessage = |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
372 |
Accept ClientInfo |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
373 |
| ClientMessage (ClientIndex, [B.ByteString]) |
4918
c6d3aec73f93
Add Unique field to Client structure, and use it to check for matching recieved account status with client
unc0rr
parents:
4907
diff
changeset
|
374 |
| ClientAccountInfo ClientIndex Int AccountInfo |
2867
9be6693c78cb
- Unbreak support for client versions prior to 0.9.13-dev
unc0rr
parents:
2747
diff
changeset
|
375 |
| TimerAction Int |
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
376 |
| Remove ClientIndex |
1804 | 377 |
|
4295
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
378 |
type MRnC = MRoomsAndClients RoomInfo ClientInfo |
1f5604cd99be
This revision should, in theory, correctly merge 0.9.14 and tip, so that future merges of 0.9.14 should work properly
nemo
parents:
4242
diff
changeset
|
379 |
type IRnC = IRoomsAndClients RoomInfo ClientInfo |
1804 | 380 |
|
4622 | 381 |
data Notice = |
382 |
NickAlreadyInUse |
|
383 |
| AdminLeft |
|
6912
831416764d2d
Allow LIST command while in room to not annoy old frontends (0.9.17 or less) with warnings
unc0rr
parents:
6756
diff
changeset
|
384 |
| WrongPassword |
4959 | 385 |
deriving Enum |
386 |
||
4960 | 387 |
data ShutdownException = |
388 |
ShutdownException |
|
4959 | 389 |
deriving (Show, Typeable) |
390 |
||
391 |
instance Exception ShutdownException |
|
4996
76ef3d8bd78e
Fix crash (accessing already deleted client record) by reverting to old client removing handling + throwTo
unc0rr
parents:
4989
diff
changeset
|
392 |
|
5000
72d8fb26223d
- Don't pretend client sent some message from sending thread (fixes crash when client is already deleted by recieveng thread)
unc0rr
parents:
4996
diff
changeset
|
393 |
data ShutdownThreadException = ShutdownThreadException String |
72d8fb26223d
- Don't pretend client sent some message from sending thread (fixes crash when client is already deleted by recieveng thread)
unc0rr
parents:
4996
diff
changeset
|
394 |
deriving Typeable |
4996
76ef3d8bd78e
Fix crash (accessing already deleted client record) by reverting to old client removing handling + throwTo
unc0rr
parents:
4989
diff
changeset
|
395 |
|
5000
72d8fb26223d
- Don't pretend client sent some message from sending thread (fixes crash when client is already deleted by recieveng thread)
unc0rr
parents:
4996
diff
changeset
|
396 |
instance Show ShutdownThreadException where |
5001 | 397 |
show (ShutdownThreadException s) = s |
4996
76ef3d8bd78e
Fix crash (accessing already deleted client record) by reverting to old client removing handling + throwTo
unc0rr
parents:
4989
diff
changeset
|
398 |
instance Exception ShutdownThreadException |
5006 | 399 |
|
400 |
data BanInfo = |
|
5007 | 401 |
BanByIP B.ByteString B.ByteString UTCTime |
402 |
| BanByNick B.ByteString B.ByteString UTCTime |
|
5006 | 403 |
deriving (Show, Read) |