author | alfadur |
Tue, 28 May 2019 21:28:32 +0300 | |
changeset 15096 | e935b1ad23f3 |
parent 15095 | c5a6e8566425 |
child 15197 | f6115638aa92 |
permissions | -rw-r--r-- |
13416 | 1 |
use super::{ |
15096 | 2 |
client::HwClient, |
14714 | 3 |
indexslab::IndexSlab, |
15096 | 4 |
room::HwRoom, |
5 |
types::{ClientId, RoomId}, |
|
13416 | 6 |
}; |
15096 | 7 |
use crate::{protocol::messages::HwProtocolMessage::Greeting, utils}; |
14714 | 8 |
|
14807
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
9 |
use bitflags::*; |
13810 | 10 |
use log::*; |
14478 | 11 |
use slab; |
14714 | 12 |
use std::{borrow::BorrowMut, iter, num::NonZeroU16}; |
12126 | 13 |
|
12852 | 14 |
type Slab<T> = slab::Slab<T>; |
12127 | 15 |
|
15096 | 16 |
pub struct HwAnteClient { |
14714 | 17 |
pub nick: Option<String>, |
18 |
pub protocol_number: Option<NonZeroU16>, |
|
19 |
pub server_salt: String, |
|
14802 | 20 |
pub is_checker: bool, |
14714 | 21 |
} |
22 |
||
15096 | 23 |
pub struct HwAnteroom { |
24 |
pub clients: IndexSlab<HwAnteClient>, |
|
14714 | 25 |
} |
26 |
||
15096 | 27 |
impl HwAnteroom { |
14714 | 28 |
pub fn new(clients_limit: usize) -> Self { |
29 |
let clients = IndexSlab::with_capacity(clients_limit); |
|
15096 | 30 |
HwAnteroom { clients } |
14714 | 31 |
} |
32 |
||
33 |
pub fn add_client(&mut self, client_id: ClientId, salt: String) { |
|
15096 | 34 |
let client = HwAnteClient { |
14714 | 35 |
nick: None, |
36 |
protocol_number: None, |
|
37 |
server_salt: salt, |
|
14802 | 38 |
is_checker: false, |
14714 | 39 |
}; |
40 |
self.clients.insert(client_id, client); |
|
41 |
} |
|
42 |
||
15096 | 43 |
pub fn remove_client(&mut self, client_id: ClientId) -> Option<HwAnteClient> { |
14714 | 44 |
let mut client = self.clients.remove(client_id); |
45 |
client |
|
46 |
} |
|
47 |
} |
|
48 |
||
14804 | 49 |
pub struct ServerGreetings { |
50 |
pub for_latest_protocol: String, |
|
51 |
pub for_old_protocols: String, |
|
52 |
} |
|
53 |
||
54 |
impl ServerGreetings { |
|
55 |
fn new() -> Self { |
|
56 |
Self { |
|
57 |
for_latest_protocol: "\u{1f994} is watching".to_string(), |
|
58 |
for_old_protocols: "\u{1f994} is watching".to_string(), |
|
59 |
} |
|
60 |
} |
|
61 |
} |
|
62 |
||
14807
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
63 |
bitflags! { |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
64 |
pub struct ServerFlags: u8 { |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
65 |
const REGISTERED_ONLY = 0b0000_1000; |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
66 |
} |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
67 |
} |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
68 |
|
15096 | 69 |
pub struct HwServer { |
70 |
pub clients: IndexSlab<HwClient>, |
|
71 |
pub rooms: Slab<HwRoom>, |
|
72 |
pub anteroom: HwAnteroom, |
|
14804 | 73 |
pub latest_protocol: u16, |
14807
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
74 |
pub flags: ServerFlags, |
14804 | 75 |
pub greetings: ServerGreetings, |
12126 | 76 |
} |
77 |
||
15096 | 78 |
impl HwServer { |
14801 | 79 |
pub fn new(clients_limit: usize, rooms_limit: usize) -> Self { |
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
80 |
let rooms = Slab::with_capacity(rooms_limit); |
14714 | 81 |
let clients = IndexSlab::with_capacity(clients_limit); |
14715 | 82 |
Self { |
14478 | 83 |
clients, |
84 |
rooms, |
|
15096 | 85 |
anteroom: HwAnteroom::new(clients_limit), |
14804 | 86 |
greetings: ServerGreetings::new(), |
87 |
latest_protocol: 58, |
|
14807
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
88 |
flags: ServerFlags::empty(), |
14715 | 89 |
} |
12126 | 90 |
} |
91 |
||
15096 | 92 |
pub fn add_client(&mut self, client_id: ClientId, data: HwAnteClient) { |
14714 | 93 |
if let (Some(protocol), Some(nick)) = (data.protocol_number, data.nick) { |
15096 | 94 |
let mut client = HwClient::new(client_id, protocol.get(), nick); |
14802 | 95 |
client.set_is_checker(data.is_checker); |
14714 | 96 |
self.clients.insert(client_id, client); |
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
97 |
} |
12126 | 98 |
} |
12127 | 99 |
|
14694
08a8605bafaf
Server action refactoring part 4 of N
alfadur <mail@none>
parents:
14693
diff
changeset
|
100 |
pub fn remove_client(&mut self, client_id: ClientId) { |
14717 | 101 |
self.clients.remove(client_id); |
12127 | 102 |
} |
103 |
||
14804 | 104 |
pub fn get_greetings(&self, client_id: ClientId) -> &str { |
105 |
if self.clients[client_id].protocol_number < self.latest_protocol { |
|
106 |
&self.greetings.for_old_protocols |
|
107 |
} else { |
|
108 |
&self.greetings.for_latest_protocol |
|
109 |
} |
|
110 |
} |
|
111 |
||
14525
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
112 |
#[inline] |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
113 |
pub fn create_room( |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
114 |
&mut self, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
115 |
creator_id: ClientId, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
116 |
name: String, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
117 |
password: Option<String>, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
118 |
) -> RoomId { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
119 |
create_room( |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
120 |
&mut self.clients[creator_id], |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
121 |
&mut self.rooms, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
122 |
name, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
123 |
password, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
124 |
) |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
125 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
126 |
|
14692
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14525
diff
changeset
|
127 |
#[inline] |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14525
diff
changeset
|
128 |
pub fn move_to_room(&mut self, client_id: ClientId, room_id: RoomId) { |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14525
diff
changeset
|
129 |
move_to_room(&mut self.clients[client_id], &mut self.rooms[room_id]) |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14525
diff
changeset
|
130 |
} |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14525
diff
changeset
|
131 |
|
13416 | 132 |
pub fn has_room(&self, name: &str) -> bool { |
14718 | 133 |
self.find_room(name).is_some() |
13416 | 134 |
} |
135 |
||
15096 | 136 |
pub fn find_room(&self, name: &str) -> Option<&HwRoom> { |
14478 | 137 |
self.rooms |
138 |
.iter() |
|
139 |
.find_map(|(_, r)| Some(r).filter(|r| r.name == name)) |
|
13416 | 140 |
} |
141 |
||
15096 | 142 |
pub fn find_room_mut(&mut self, name: &str) -> Option<&mut HwRoom> { |
14478 | 143 |
self.rooms |
144 |
.iter_mut() |
|
145 |
.find_map(|(_, r)| Some(r).filter(|r| r.name == name)) |
|
13416 | 146 |
} |
147 |
||
15096 | 148 |
pub fn find_client(&self, nick: &str) -> Option<&HwClient> { |
14478 | 149 |
self.clients |
150 |
.iter() |
|
151 |
.find_map(|(_, c)| Some(c).filter(|c| c.nick == nick)) |
|
13450 | 152 |
} |
153 |
||
15096 | 154 |
pub fn find_client_mut(&mut self, nick: &str) -> Option<&mut HwClient> { |
14478 | 155 |
self.clients |
156 |
.iter_mut() |
|
157 |
.find_map(|(_, c)| Some(c).filter(|c| c.nick == nick)) |
|
13450 | 158 |
} |
159 |
||
14810 | 160 |
pub fn all_clients(&self) -> impl Iterator<Item = ClientId> + '_ { |
161 |
self.clients.iter().map(|(id, _)| id) |
|
162 |
} |
|
163 |
||
164 |
pub fn filter_clients<'a, F>(&'a self, f: F) -> impl Iterator<Item = ClientId> + 'a |
|
165 |
where |
|
15096 | 166 |
F: Fn(&(usize, &HwClient)) -> bool + 'a, |
14810 | 167 |
{ |
168 |
self.clients.iter().filter(f).map(|(_, c)| c.id) |
|
169 |
} |
|
170 |
||
171 |
pub fn filter_rooms<'a, F>(&'a self, f: F) -> impl Iterator<Item = RoomId> + 'a |
|
172 |
where |
|
15096 | 173 |
F: Fn(&(usize, &HwRoom)) -> bool + 'a, |
14810 | 174 |
{ |
175 |
self.rooms.iter().filter(f).map(|(_, c)| c.id) |
|
176 |
} |
|
177 |
||
14802 | 178 |
pub fn collect_clients<F>(&self, f: F) -> Vec<ClientId> |
14478 | 179 |
where |
15096 | 180 |
F: Fn(&(usize, &HwClient)) -> bool, |
14478 | 181 |
{ |
14810 | 182 |
self.filter_clients(f).collect() |
13416 | 183 |
} |
184 |
||
14802 | 185 |
pub fn collect_nicks<F>(&self, f: F) -> Vec<String> |
186 |
where |
|
15096 | 187 |
F: Fn(&(usize, &HwClient)) -> bool, |
14802 | 188 |
{ |
189 |
self.clients |
|
190 |
.iter() |
|
191 |
.filter(f) |
|
192 |
.map(|(_, c)| c.nick.clone()) |
|
193 |
.collect() |
|
14715 | 194 |
} |
195 |
||
14810 | 196 |
pub fn lobby_clients(&self) -> impl Iterator<Item = ClientId> + '_ { |
197 |
self.filter_clients(|(_, c)| c.room_id == None) |
|
14802 | 198 |
} |
199 |
||
14810 | 200 |
pub fn room_clients(&self, room_id: RoomId) -> impl Iterator<Item = ClientId> + '_ { |
201 |
self.filter_clients(move |(_, c)| c.room_id == Some(room_id)) |
|
13416 | 202 |
} |
203 |
||
14810 | 204 |
pub fn protocol_clients(&self, protocol: u16) -> impl Iterator<Item = ClientId> + '_ { |
205 |
self.filter_clients(move |(_, c)| c.protocol_number == protocol) |
|
206 |
} |
|
207 |
||
208 |
pub fn protocol_rooms(&self, protocol: u16) -> impl Iterator<Item = RoomId> + '_ { |
|
209 |
self.filter_rooms(move |(_, r)| r.protocol_number == protocol) |
|
13416 | 210 |
} |
211 |
||
212 |
pub fn other_clients_in_room(&self, self_id: ClientId) -> Vec<ClientId> { |
|
213 |
let room_id = self.clients[self_id].room_id; |
|
14802 | 214 |
self.collect_clients(|(id, c)| *id != self_id && c.room_id == room_id) |
13416 | 215 |
} |
14807
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
216 |
|
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
217 |
pub fn is_registered_only(&self) -> bool { |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
218 |
self.flags.contains(ServerFlags::REGISTERED_ONLY) |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
219 |
} |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
220 |
|
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
221 |
pub fn set_is_registered_only(&mut self, value: bool) { |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
222 |
self.flags.set(ServerFlags::REGISTERED_ONLY, value) |
8ecdb5c6bb2a
implement info, registered only & super power messages
alfadur
parents:
14804
diff
changeset
|
223 |
} |
13445
d3c86ade3d4d
Send the rnd reply to the room only.
Marcin Mielniczuk <marmistrz.dev@zoho.eu>
parents:
13442
diff
changeset
|
224 |
} |
14525
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
225 |
|
15096 | 226 |
fn allocate_room(rooms: &mut Slab<HwRoom>) -> &mut HwRoom { |
14525
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
227 |
let entry = rooms.vacant_entry(); |
15096 | 228 |
let room = HwRoom::new(entry.key()); |
14525
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
229 |
entry.insert(room) |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
230 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
231 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
232 |
fn create_room( |
15096 | 233 |
client: &mut HwClient, |
234 |
rooms: &mut Slab<HwRoom>, |
|
14525
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
235 |
name: String, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
236 |
password: Option<String>, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
237 |
) -> RoomId { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
238 |
let room = allocate_room(rooms); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
239 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
240 |
room.master_id = Some(client.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
241 |
room.name = name; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
242 |
room.password = password; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
243 |
room.protocol_number = client.protocol_number; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
244 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
245 |
room.players_number = 1; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
246 |
room.ready_players_number = 1; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
247 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
248 |
client.room_id = Some(room.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
249 |
client.set_is_master(true); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
250 |
client.set_is_ready(true); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
251 |
client.set_is_joined_mid_game(false); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
252 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
253 |
room.id |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
254 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
255 |
|
15096 | 256 |
fn move_to_room(client: &mut HwClient, room: &mut HwRoom) { |
14525
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
257 |
debug_assert!(client.room_id != Some(room.id)); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
258 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
259 |
room.players_number += 1; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
260 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
261 |
client.room_id = Some(room.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
262 |
client.set_is_joined_mid_game(room.game_info.is_some()); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
263 |
client.set_is_in_game(room.game_info.is_some()); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
264 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
265 |
if let Some(ref mut info) = room.game_info { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
266 |
let teams = info.client_teams(client.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
267 |
client.teams_in_game = teams.clone().count() as u8; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
268 |
client.clan = teams.clone().next().map(|t| t.color); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
269 |
let team_names: Vec<_> = teams.map(|t| t.name.clone()).collect(); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
270 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
271 |
if !team_names.is_empty() { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
272 |
info.left_teams.retain(|name| !team_names.contains(&name)); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
273 |
info.teams_in_game += team_names.len() as u8; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
274 |
room.teams = info |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
275 |
.teams_at_start |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
276 |
.iter() |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
277 |
.filter(|(_, t)| !team_names.contains(&t.name)) |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
278 |
.cloned() |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
279 |
.collect(); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
280 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
281 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14478
diff
changeset
|
282 |
} |