author | alfadur |
Thu, 27 Jan 2022 03:51:13 +0300 | |
changeset 15828 | 44b49f255e31 |
parent 15804 | 747278149393 |
child 15831 | 7d0f747afcb8 |
permissions | -rw-r--r-- |
13119 | 1 |
extern crate slab; |
2 |
||
13414 | 3 |
use std::{ |
13415 | 4 |
collections::HashSet, |
14457 | 5 |
io, |
6 |
io::{Error, ErrorKind, Read, Write}, |
|
7 |
mem::{replace, swap}, |
|
8 |
net::{IpAddr, Ipv4Addr, SocketAddr}, |
|
15800 | 9 |
num::NonZeroU32, |
10 |
time::Duration, |
|
11 |
time::Instant, |
|
13414 | 12 |
}; |
13 |
||
14457 | 14 |
use log::*; |
13414 | 15 |
use mio::{ |
15800 | 16 |
event::Source, |
14457 | 17 |
net::{TcpListener, TcpStream}, |
15800 | 18 |
Interest, Poll, Token, Waker, |
13414 | 19 |
}; |
20 |
use netbuf; |
|
13119 | 21 |
use slab::Slab; |
22 |
||
13666 | 23 |
use crate::{ |
15800 | 24 |
core::{ |
25 |
events::{TimedEvents, Timeout}, |
|
26 |
types::ClientId, |
|
27 |
}, |
|
15074 | 28 |
handlers, |
15520 | 29 |
handlers::{IoResult, IoTask, ServerState}, |
15804 | 30 |
protocol::ProtocolDecoder, |
13666 | 31 |
utils, |
13414 | 32 |
}; |
15804 | 33 |
use hedgewars_network_protocol::{messages::HwServerMessage::Redirect, messages::*}; |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
34 |
|
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
35 |
#[cfg(feature = "official-server")] |
15098 | 36 |
use super::io::{IoThread, RequestId}; |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
37 |
|
13799 | 38 |
#[cfg(feature = "tls-connections")] |
39 |
use openssl::{ |
|
14457 | 40 |
error::ErrorStack, |
13799 | 41 |
ssl::{ |
14457 | 42 |
HandshakeError, MidHandshakeSslStream, Ssl, SslContext, SslContextBuilder, SslFiletype, |
43 |
SslMethod, SslOptions, SslStream, SslStreamBuilder, SslVerifyMode, |
|
13799 | 44 |
}, |
45 |
}; |
|
13414 | 46 |
|
47 |
const MAX_BYTES_PER_READ: usize = 2048; |
|
15800 | 48 |
const SEND_PING_TIMEOUT: Duration = Duration::from_secs(5); |
49 |
const DROP_CLIENT_TIMEOUT: Duration = Duration::from_secs(5); |
|
50 |
const MAX_TIMEOUT: usize = DROP_CLIENT_TIMEOUT.as_secs() as usize; |
|
14807 | 51 |
const PING_PROBES_COUNT: u8 = 2; |
13119 | 52 |
|
13415 | 53 |
#[derive(Hash, Eq, PartialEq, Copy, Clone)] |
13414 | 54 |
pub enum NetworkClientState { |
55 |
Idle, |
|
56 |
NeedsWrite, |
|
57 |
NeedsRead, |
|
58 |
Closed, |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
59 |
#[cfg(feature = "tls-connections")] |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
60 |
Connected, |
13414 | 61 |
} |
62 |
||
63 |
type NetworkResult<T> = io::Result<(T, NetworkClientState)>; |
|
13119 | 64 |
|
13799 | 65 |
pub enum ClientSocket { |
14457 | 66 |
Plain(TcpStream), |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
67 |
#[cfg(feature = "tls-connections")] |
13799 | 68 |
SslHandshake(Option<MidHandshakeSslStream<TcpStream>>), |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
69 |
#[cfg(feature = "tls-connections")] |
14457 | 70 |
SslStream(SslStream<TcpStream>), |
13799 | 71 |
} |
72 |
||
73 |
impl ClientSocket { |
|
15800 | 74 |
fn inner_mut(&mut self) -> &mut TcpStream { |
13799 | 75 |
match self { |
76 |
ClientSocket::Plain(stream) => stream, |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
77 |
#[cfg(feature = "tls-connections")] |
15800 | 78 |
ClientSocket::SslHandshake(Some(builder)) => builder.get_mut(), |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
79 |
#[cfg(feature = "tls-connections")] |
13799 | 80 |
ClientSocket::SslHandshake(None) => unreachable!(), |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
81 |
#[cfg(feature = "tls-connections")] |
15800 | 82 |
ClientSocket::SslStream(ssl_stream) => ssl_stream.get_mut(), |
13799 | 83 |
} |
84 |
} |
|
85 |
} |
|
86 |
||
13119 | 87 |
pub struct NetworkClient { |
88 |
id: ClientId, |
|
13799 | 89 |
socket: ClientSocket, |
13119 | 90 |
peer_addr: SocketAddr, |
91 |
decoder: ProtocolDecoder, |
|
14457 | 92 |
buf_out: netbuf::Buf, |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
93 |
pending_close: bool, |
15800 | 94 |
timeout: Timeout, |
95 |
last_rx_time: Instant, |
|
13119 | 96 |
} |
97 |
||
98 |
impl NetworkClient { |
|
14803 | 99 |
pub fn new( |
100 |
id: ClientId, |
|
101 |
socket: ClientSocket, |
|
102 |
peer_addr: SocketAddr, |
|
15800 | 103 |
timeout: Timeout, |
14803 | 104 |
) -> NetworkClient { |
13119 | 105 |
NetworkClient { |
14457 | 106 |
id, |
107 |
socket, |
|
108 |
peer_addr, |
|
13119 | 109 |
decoder: ProtocolDecoder::new(), |
14457 | 110 |
buf_out: netbuf::Buf::new(), |
15800 | 111 |
pending_close: false, |
14803 | 112 |
timeout, |
15800 | 113 |
last_rx_time: Instant::now(), |
13119 | 114 |
} |
115 |
} |
|
116 |
||
13802 | 117 |
#[cfg(feature = "tls-connections")] |
14457 | 118 |
fn handshake_impl( |
119 |
&mut self, |
|
120 |
handshake: MidHandshakeSslStream<TcpStream>, |
|
121 |
) -> io::Result<NetworkClientState> { |
|
13802 | 122 |
match handshake.handshake() { |
123 |
Ok(stream) => { |
|
124 |
self.socket = ClientSocket::SslStream(stream); |
|
14457 | 125 |
debug!( |
126 |
"TLS handshake with {} ({}) completed", |
|
127 |
self.id, self.peer_addr |
|
128 |
); |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
129 |
Ok(NetworkClientState::Connected) |
13802 | 130 |
} |
131 |
Err(HandshakeError::WouldBlock(new_handshake)) => { |
|
132 |
self.socket = ClientSocket::SslHandshake(Some(new_handshake)); |
|
133 |
Ok(NetworkClientState::Idle) |
|
134 |
} |
|
13803 | 135 |
Err(HandshakeError::Failure(new_handshake)) => { |
136 |
self.socket = ClientSocket::SslHandshake(Some(new_handshake)); |
|
13802 | 137 |
debug!("TLS handshake with {} ({}) failed", self.id, self.peer_addr); |
138 |
Err(Error::new(ErrorKind::Other, "Connection failure")) |
|
139 |
} |
|
14457 | 140 |
Err(HandshakeError::SetupFailure(_)) => unreachable!(), |
13802 | 141 |
} |
142 |
} |
|
143 |
||
14457 | 144 |
fn read_impl<R: Read>( |
145 |
decoder: &mut ProtocolDecoder, |
|
146 |
source: &mut R, |
|
147 |
id: ClientId, |
|
148 |
addr: &SocketAddr, |
|
15075 | 149 |
) -> NetworkResult<Vec<HwProtocolMessage>> { |
13414 | 150 |
let mut bytes_read = 0; |
151 |
let result = loop { |
|
13799 | 152 |
match decoder.read_from(source) { |
13414 | 153 |
Ok(bytes) => { |
13799 | 154 |
debug!("Client {}: read {} bytes", id, bytes); |
13414 | 155 |
bytes_read += bytes; |
156 |
if bytes == 0 { |
|
157 |
let result = if bytes_read == 0 { |
|
13799 | 158 |
info!("EOF for client {} ({})", id, addr); |
13414 | 159 |
(Vec::new(), NetworkClientState::Closed) |
160 |
} else { |
|
13799 | 161 |
(decoder.extract_messages(), NetworkClientState::NeedsRead) |
13414 | 162 |
}; |
163 |
break Ok(result); |
|
14457 | 164 |
} else if bytes_read >= MAX_BYTES_PER_READ { |
165 |
break Ok((decoder.extract_messages(), NetworkClientState::NeedsRead)); |
|
13414 | 166 |
} |
167 |
} |
|
168 |
Err(ref error) if error.kind() == ErrorKind::WouldBlock => { |
|
14457 | 169 |
let messages = if bytes_read == 0 { |
13414 | 170 |
Vec::new() |
171 |
} else { |
|
13799 | 172 |
decoder.extract_messages() |
13414 | 173 |
}; |
174 |
break Ok((messages, NetworkClientState::Idle)); |
|
175 |
} |
|
14457 | 176 |
Err(error) => break Err(error), |
13414 | 177 |
} |
178 |
}; |
|
179 |
result |
|
180 |
} |
|
181 |
||
15075 | 182 |
pub fn read(&mut self) -> NetworkResult<Vec<HwProtocolMessage>> { |
15800 | 183 |
let result = match self.socket { |
14457 | 184 |
ClientSocket::Plain(ref mut stream) => { |
185 |
NetworkClient::read_impl(&mut self.decoder, stream, self.id, &self.peer_addr) |
|
186 |
} |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
187 |
#[cfg(feature = "tls-connections")] |
13799 | 188 |
ClientSocket::SslHandshake(ref mut handshake_opt) => { |
13802 | 189 |
let handshake = std::mem::replace(handshake_opt, None).unwrap(); |
190 |
Ok((Vec::new(), self.handshake_impl(handshake)?)) |
|
14457 | 191 |
} |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
192 |
#[cfg(feature = "tls-connections")] |
14457 | 193 |
ClientSocket::SslStream(ref mut stream) => { |
13799 | 194 |
NetworkClient::read_impl(&mut self.decoder, stream, self.id, &self.peer_addr) |
14457 | 195 |
} |
15800 | 196 |
}; |
197 |
||
198 |
if let Ok(_) = result { |
|
199 |
self.last_rx_time = Instant::now(); |
|
13799 | 200 |
} |
15800 | 201 |
|
202 |
result |
|
13799 | 203 |
} |
204 |
||
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
205 |
fn write_impl<W: Write>( |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
206 |
buf_out: &mut netbuf::Buf, |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
207 |
destination: &mut W, |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
208 |
close_on_empty: bool, |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
209 |
) -> NetworkResult<()> { |
13414 | 210 |
let result = loop { |
13799 | 211 |
match buf_out.write_to(destination) { |
14457 | 212 |
Ok(bytes) if buf_out.is_empty() || bytes == 0 => { |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
213 |
let status = if buf_out.is_empty() && close_on_empty { |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
214 |
NetworkClientState::Closed |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
215 |
} else { |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
216 |
NetworkClientState::Idle |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
217 |
}; |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
218 |
break Ok(((), status)); |
14457 | 219 |
} |
13415 | 220 |
Ok(_) => (), |
14457 | 221 |
Err(ref error) |
222 |
if error.kind() == ErrorKind::Interrupted |
|
223 |
|| error.kind() == ErrorKind::WouldBlock => |
|
224 |
{ |
|
13414 | 225 |
break Ok(((), NetworkClientState::NeedsWrite)); |
14457 | 226 |
} |
227 |
Err(error) => break Err(error), |
|
13414 | 228 |
} |
229 |
}; |
|
13799 | 230 |
result |
231 |
} |
|
232 |
||
233 |
pub fn write(&mut self) -> NetworkResult<()> { |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
234 |
let result = match self.socket { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
235 |
ClientSocket::Plain(ref mut stream) => { |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
236 |
NetworkClient::write_impl(&mut self.buf_out, stream, self.pending_close) |
13799 | 237 |
} |
14457 | 238 |
#[cfg(feature = "tls-connections")] |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
239 |
ClientSocket::SslHandshake(ref mut handshake_opt) => { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
240 |
let handshake = std::mem::replace(handshake_opt, None).unwrap(); |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
241 |
Ok(((), self.handshake_impl(handshake)?)) |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
242 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
243 |
#[cfg(feature = "tls-connections")] |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
244 |
ClientSocket::SslStream(ref mut stream) => { |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
245 |
NetworkClient::write_impl(&mut self.buf_out, stream, self.pending_close) |
13799 | 246 |
} |
247 |
}; |
|
248 |
||
15800 | 249 |
self.socket.inner_mut().flush()?; |
13414 | 250 |
result |
251 |
} |
|
252 |
||
13119 | 253 |
pub fn send_raw_msg(&mut self, msg: &[u8]) { |
13524 | 254 |
self.buf_out.write_all(msg).unwrap(); |
13119 | 255 |
} |
256 |
||
13524 | 257 |
pub fn send_string(&mut self, msg: &str) { |
13119 | 258 |
self.send_raw_msg(&msg.as_bytes()); |
259 |
} |
|
14803 | 260 |
|
15800 | 261 |
pub fn replace_timeout(&mut self, timeout: Timeout) -> Timeout { |
14803 | 262 |
replace(&mut self.timeout, timeout) |
263 |
} |
|
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
264 |
|
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
265 |
pub fn has_pending_sends(&self) -> bool { |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
266 |
!self.buf_out.is_empty() |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
267 |
} |
13119 | 268 |
} |
269 |
||
13799 | 270 |
#[cfg(feature = "tls-connections")] |
271 |
struct ServerSsl { |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
272 |
listener: TcpListener, |
14457 | 273 |
context: SslContext, |
13799 | 274 |
} |
275 |
||
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
276 |
#[cfg(feature = "official-server")] |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
277 |
pub struct IoLayer { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
278 |
next_request_id: RequestId, |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
279 |
request_queue: Vec<(RequestId, ClientId)>, |
15098 | 280 |
io_thread: IoThread, |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
281 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
282 |
|
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
283 |
#[cfg(feature = "official-server")] |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
284 |
impl IoLayer { |
15800 | 285 |
fn new(waker: Waker) -> Self { |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
286 |
Self { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
287 |
next_request_id: 0, |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
288 |
request_queue: vec![], |
15800 | 289 |
io_thread: IoThread::new(waker), |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
290 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
291 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
292 |
|
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
293 |
fn send(&mut self, client_id: ClientId, task: IoTask) { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
294 |
let request_id = self.next_request_id; |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
295 |
self.next_request_id += 1; |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
296 |
self.request_queue.push((request_id, client_id)); |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
297 |
self.io_thread.send(request_id, task); |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
298 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
299 |
|
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
300 |
fn try_recv(&mut self) -> Option<(ClientId, IoResult)> { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
301 |
let (request_id, result) = self.io_thread.try_recv()?; |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
302 |
if let Some(index) = self |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
303 |
.request_queue |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
304 |
.iter() |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
305 |
.position(|(id, _)| *id == request_id) |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
306 |
{ |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
307 |
let (_, client_id) = self.request_queue.swap_remove(index); |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
308 |
Some((client_id, result)) |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
309 |
} else { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
310 |
None |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
311 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
312 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
313 |
|
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
314 |
fn cancel(&mut self, client_id: ClientId) { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
315 |
let mut index = 0; |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
316 |
while index < self.request_queue.len() { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
317 |
if self.request_queue[index].1 == client_id { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
318 |
self.request_queue.swap_remove(index); |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
319 |
} else { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
320 |
index += 1; |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
321 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
322 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
323 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
324 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
325 |
|
14803 | 326 |
enum TimeoutEvent { |
14807 | 327 |
SendPing { probes_count: u8 }, |
14803 | 328 |
DropClient, |
329 |
} |
|
330 |
||
331 |
struct TimerData(TimeoutEvent, ClientId); |
|
15800 | 332 |
type NetworkTimeoutEvents = TimedEvents<TimerData, MAX_TIMEOUT>; |
14803 | 333 |
|
13119 | 334 |
pub struct NetworkLayer { |
335 |
listener: TcpListener, |
|
15520 | 336 |
server_state: ServerState, |
13414 | 337 |
clients: Slab<NetworkClient>, |
13415 | 338 |
pending: HashSet<(ClientId, NetworkClientState)>, |
13799 | 339 |
pending_cache: Vec<(ClientId, NetworkClientState)>, |
340 |
#[cfg(feature = "tls-connections")] |
|
14457 | 341 |
ssl: ServerSsl, |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
342 |
#[cfg(feature = "official-server")] |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
343 |
io: IoLayer, |
15800 | 344 |
timeout_events: NetworkTimeoutEvents, |
14803 | 345 |
} |
346 |
||
15800 | 347 |
fn register_read<S: Source>(poll: &Poll, source: &mut S, token: mio::Token) -> io::Result<()> { |
348 |
poll.registry().register(source, token, Interest::READABLE) |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
349 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
350 |
|
14807 | 351 |
fn create_ping_timeout( |
15800 | 352 |
timeout_events: &mut NetworkTimeoutEvents, |
14807 | 353 |
probes_count: u8, |
354 |
client_id: ClientId, |
|
15800 | 355 |
) -> Timeout { |
356 |
timeout_events.set_timeout( |
|
357 |
NonZeroU32::new(SEND_PING_TIMEOUT.as_secs() as u32).unwrap(), |
|
14807 | 358 |
TimerData(TimeoutEvent::SendPing { probes_count }, client_id), |
14803 | 359 |
) |
360 |
} |
|
361 |
||
15800 | 362 |
fn create_drop_timeout(timeout_events: &mut NetworkTimeoutEvents, client_id: ClientId) -> Timeout { |
363 |
timeout_events.set_timeout( |
|
364 |
NonZeroU32::new(DROP_CLIENT_TIMEOUT.as_secs() as u32).unwrap(), |
|
14803 | 365 |
TimerData(TimeoutEvent::DropClient, client_id), |
366 |
) |
|
13119 | 367 |
} |
368 |
||
369 |
impl NetworkLayer { |
|
15800 | 370 |
pub fn register(&mut self, poll: &Poll) -> io::Result<()> { |
371 |
register_read(poll, &mut self.listener, utils::SERVER_TOKEN)?; |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
372 |
#[cfg(feature = "tls-connections")] |
15800 | 373 |
register_read(poll, &mut self.ssl.listener, utils::SECURE_SERVER_TOKEN)?; |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
374 |
|
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
375 |
Ok(()) |
13119 | 376 |
} |
377 |
||
15175 | 378 |
fn deregister_client(&mut self, poll: &Poll, id: ClientId, is_error: bool) { |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
379 |
if let Some(ref mut client) = self.clients.get_mut(id) { |
15800 | 380 |
poll.registry() |
381 |
.deregister(client.socket.inner_mut()) |
|
13524 | 382 |
.expect("could not deregister socket"); |
15175 | 383 |
if client.has_pending_sends() && !is_error { |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
384 |
info!( |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
385 |
"client {} ({}) pending removal", |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
386 |
client.id, client.peer_addr |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
387 |
); |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
388 |
client.pending_close = true; |
15800 | 389 |
poll.registry() |
390 |
.register(client.socket.inner_mut(), Token(id), Interest::WRITABLE) |
|
391 |
.unwrap_or_else(|_| { |
|
392 |
self.clients.remove(id); |
|
393 |
}); |
|
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
394 |
} else { |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
395 |
info!("client {} ({}) removed", client.id, client.peer_addr); |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
396 |
self.clients.remove(id); |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
397 |
} |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
398 |
#[cfg(feature = "official-server")] |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
399 |
self.io.cancel(id); |
13119 | 400 |
} |
401 |
} |
|
402 |
||
14457 | 403 |
fn register_client( |
404 |
&mut self, |
|
405 |
poll: &Poll, |
|
15800 | 406 |
mut client_socket: ClientSocket, |
14457 | 407 |
addr: SocketAddr, |
14916 | 408 |
) -> io::Result<ClientId> { |
14693 | 409 |
let entry = self.clients.vacant_entry(); |
410 |
let client_id = entry.key(); |
|
411 |
||
15800 | 412 |
poll.registry().register( |
413 |
client_socket.inner_mut(), |
|
14693 | 414 |
Token(client_id), |
15800 | 415 |
Interest::READABLE | Interest::WRITABLE, |
14916 | 416 |
)?; |
13119 | 417 |
|
14803 | 418 |
let client = NetworkClient::new( |
419 |
client_id, |
|
420 |
client_socket, |
|
421 |
addr, |
|
15800 | 422 |
create_ping_timeout(&mut self.timeout_events, PING_PROBES_COUNT - 1, client_id), |
14803 | 423 |
); |
13119 | 424 |
info!("client {} ({}) added", client.id, client.peer_addr); |
425 |
entry.insert(client); |
|
14693 | 426 |
|
14916 | 427 |
Ok(client_id) |
13119 | 428 |
} |
429 |
||
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
430 |
fn handle_response(&mut self, mut response: handlers::Response, poll: &Poll) { |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
431 |
if response.is_empty() { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
432 |
return; |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
433 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
434 |
|
14672
6e6632068a33
Server action refactoring part 3 of N
alfadur <mail@none>
parents:
14671
diff
changeset
|
435 |
debug!("{} pending server messages", response.len()); |
15520 | 436 |
let output = response.extract_messages(&mut self.server_state.server); |
14672
6e6632068a33
Server action refactoring part 3 of N
alfadur <mail@none>
parents:
14671
diff
changeset
|
437 |
for (clients, message) in output { |
13419 | 438 |
debug!("Message {:?} to {:?}", message, clients); |
439 |
let msg_string = message.to_raw_protocol(); |
|
440 |
for client_id in clients { |
|
441 |
if let Some(client) = self.clients.get_mut(client_id) { |
|
442 |
client.send_string(&msg_string); |
|
14457 | 443 |
self.pending |
444 |
.insert((client_id, NetworkClientState::NeedsWrite)); |
|
13414 | 445 |
} |
446 |
} |
|
447 |
} |
|
14696 | 448 |
|
449 |
for client_id in response.extract_removed_clients() { |
|
15175 | 450 |
self.deregister_client(poll, client_id, false); |
14696 | 451 |
} |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
452 |
|
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
453 |
#[cfg(feature = "official-server")] |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
454 |
{ |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
455 |
let client_id = response.client_id(); |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
456 |
for task in response.extract_io_tasks() { |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
457 |
self.io.send(client_id, task); |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
458 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
459 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
460 |
} |
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
461 |
|
15800 | 462 |
pub fn handle_timeout(&mut self, poll: &mut Poll) -> io::Result<()> { |
463 |
for TimerData(event, client_id) in self.timeout_events.poll(Instant::now()) { |
|
464 |
if let Some(client) = self.clients.get_mut(client_id) { |
|
465 |
if client.last_rx_time.elapsed() > SEND_PING_TIMEOUT { |
|
466 |
match event { |
|
467 |
TimeoutEvent::SendPing { probes_count } => { |
|
468 |
client.send_string(&HwServerMessage::Ping.to_raw_protocol()); |
|
469 |
client.write()?; |
|
470 |
let timeout = if probes_count != 0 { |
|
471 |
create_ping_timeout( |
|
472 |
&mut self.timeout_events, |
|
473 |
probes_count - 1, |
|
474 |
client_id, |
|
475 |
) |
|
476 |
} else { |
|
477 |
create_drop_timeout(&mut self.timeout_events, client_id) |
|
478 |
}; |
|
479 |
client.replace_timeout(timeout); |
|
480 |
} |
|
481 |
TimeoutEvent::DropClient => { |
|
482 |
client.send_string( |
|
483 |
&HwServerMessage::Bye("Ping timeout".to_string()).to_raw_protocol(), |
|
484 |
); |
|
485 |
let _res = client.write(); |
|
486 |
||
487 |
self.operation_failed( |
|
488 |
poll, |
|
489 |
client_id, |
|
490 |
&ErrorKind::TimedOut.into(), |
|
491 |
"No ping response", |
|
492 |
)?; |
|
493 |
} |
|
14803 | 494 |
} |
15800 | 495 |
} else { |
496 |
client.replace_timeout(create_ping_timeout( |
|
497 |
&mut self.timeout_events, |
|
498 |
PING_PROBES_COUNT - 1, |
|
14803 | 499 |
client_id, |
15800 | 500 |
)); |
14803 | 501 |
} |
502 |
} |
|
503 |
} |
|
504 |
Ok(()) |
|
505 |
} |
|
506 |
||
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
507 |
#[cfg(feature = "official-server")] |
15102 | 508 |
pub fn handle_io_result(&mut self, poll: &Poll) -> io::Result<()> { |
509 |
while let Some((client_id, result)) = self.io.try_recv() { |
|
510 |
debug!("Handling io result {:?} for client {}", result, client_id); |
|
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
511 |
let mut response = handlers::Response::new(client_id); |
15531 | 512 |
handlers::handle_io_result(&mut self.server_state, client_id, &mut response, result); |
15102 | 513 |
self.handle_response(response, poll); |
14779
f43ab2bd76ae
add a thread for internal server IO and implement account checking with it
alfadur
parents:
14697
diff
changeset
|
514 |
} |
14916 | 515 |
Ok(()) |
13414 | 516 |
} |
517 |
||
13799 | 518 |
fn create_client_socket(&self, socket: TcpStream) -> io::Result<ClientSocket> { |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
519 |
Ok(ClientSocket::Plain(socket)) |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
520 |
} |
13799 | 521 |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
522 |
#[cfg(feature = "tls-connections")] |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
523 |
fn create_client_secure_socket(&self, socket: TcpStream) -> io::Result<ClientSocket> { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
524 |
let ssl = Ssl::new(&self.ssl.context).unwrap(); |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
525 |
let mut builder = SslStreamBuilder::new(ssl, socket); |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
526 |
builder.set_accept_state(); |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
527 |
match builder.handshake() { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
528 |
Ok(stream) => Ok(ClientSocket::SslStream(stream)), |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
529 |
Err(HandshakeError::WouldBlock(stream)) => Ok(ClientSocket::SslHandshake(Some(stream))), |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
530 |
Err(e) => { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
531 |
debug!("OpenSSL handshake failed: {}", e); |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
532 |
Err(Error::new(ErrorKind::Other, "Connection failure")) |
13799 | 533 |
} |
534 |
} |
|
535 |
} |
|
536 |
||
14835 | 537 |
fn init_client(&mut self, poll: &Poll, client_id: ClientId) { |
538 |
let mut response = handlers::Response::new(client_id); |
|
14847 | 539 |
|
540 |
if let ClientSocket::Plain(_) = self.clients[client_id].socket { |
|
541 |
#[cfg(feature = "tls-connections")] |
|
542 |
response.add(Redirect(self.ssl.listener.local_addr().unwrap().port()).send_self()) |
|
543 |
} |
|
14835 | 544 |
|
15517 | 545 |
if let IpAddr::V4(addr) = self.clients[client_id].peer_addr.ip() { |
546 |
handlers::handle_client_accept( |
|
15520 | 547 |
&mut self.server_state, |
15517 | 548 |
client_id, |
549 |
&mut response, |
|
550 |
addr.octets(), |
|
551 |
addr.is_loopback(), |
|
552 |
); |
|
553 |
self.handle_response(response, poll); |
|
554 |
} else { |
|
555 |
todo!("implement something") |
|
556 |
} |
|
14835 | 557 |
} |
558 |
||
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
559 |
pub fn accept_client(&mut self, poll: &Poll, server_token: mio::Token) -> io::Result<()> { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
560 |
match server_token { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
561 |
utils::SERVER_TOKEN => { |
14870 | 562 |
let (client_socket, addr) = self.listener.accept()?; |
563 |
info!("Connected(plaintext): {}", addr); |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
564 |
let client_id = |
14916 | 565 |
self.register_client(poll, self.create_client_socket(client_socket)?, addr)?; |
14835 | 566 |
self.init_client(poll, client_id); |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
567 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
568 |
#[cfg(feature = "tls-connections")] |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
569 |
utils::SECURE_SERVER_TOKEN => { |
14870 | 570 |
let (client_socket, addr) = self.ssl.listener.accept()?; |
571 |
info!("Connected(TLS): {}", addr); |
|
14916 | 572 |
self.register_client(poll, self.create_client_secure_socket(client_socket)?, addr)?; |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
573 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
574 |
_ => unreachable!(), |
14693 | 575 |
} |
13119 | 576 |
|
577 |
Ok(()) |
|
578 |
} |
|
579 |
||
14457 | 580 |
fn operation_failed( |
581 |
&mut self, |
|
582 |
poll: &Poll, |
|
583 |
client_id: ClientId, |
|
584 |
error: &Error, |
|
585 |
msg: &str, |
|
586 |
) -> io::Result<()> { |
|
13414 | 587 |
let addr = if let Some(ref mut client) = self.clients.get_mut(client_id) { |
588 |
client.peer_addr |
|
589 |
} else { |
|
590 |
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 0) |
|
591 |
}; |
|
592 |
debug!("{}({}): {}", msg, addr, error); |
|
593 |
self.client_error(poll, client_id) |
|
13119 | 594 |
} |
595 |
||
14457 | 596 |
pub fn client_readable(&mut self, poll: &Poll, client_id: ClientId) -> io::Result<()> { |
597 |
let messages = if let Some(ref mut client) = self.clients.get_mut(client_id) { |
|
598 |
client.read() |
|
599 |
} else { |
|
600 |
warn!("invalid readable client: {}", client_id); |
|
601 |
Ok((Vec::new(), NetworkClientState::Idle)) |
|
602 |
}; |
|
13414 | 603 |
|
14671
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
604 |
let mut response = handlers::Response::new(client_id); |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
605 |
|
13414 | 606 |
match messages { |
607 |
Ok((messages, state)) => { |
|
608 |
for message in messages { |
|
14671
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
609 |
debug!("Handling message {:?} for client {}", message, client_id); |
15520 | 610 |
handlers::handle(&mut self.server_state, client_id, &mut response, message); |
13414 | 611 |
} |
612 |
match state { |
|
13415 | 613 |
NetworkClientState::NeedsRead => { |
614 |
self.pending.insert((client_id, state)); |
|
14457 | 615 |
} |
616 |
NetworkClientState::Closed => self.client_error(&poll, client_id)?, |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
617 |
#[cfg(feature = "tls-connections")] |
14835 | 618 |
NetworkClientState::Connected => self.init_client(poll, client_id), |
13414 | 619 |
_ => {} |
620 |
}; |
|
13119 | 621 |
} |
13414 | 622 |
Err(e) => self.operation_failed( |
14457 | 623 |
poll, |
624 |
client_id, |
|
625 |
&e, |
|
626 |
"Error while reading from client socket", |
|
627 |
)?, |
|
13119 | 628 |
} |
629 |
||
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
630 |
self.handle_response(response, poll); |
13119 | 631 |
|
632 |
Ok(()) |
|
633 |
} |
|
634 |
||
14457 | 635 |
pub fn client_writable(&mut self, poll: &Poll, client_id: ClientId) -> io::Result<()> { |
636 |
let result = if let Some(ref mut client) = self.clients.get_mut(client_id) { |
|
637 |
client.write() |
|
638 |
} else { |
|
639 |
warn!("invalid writable client: {}", client_id); |
|
640 |
Ok(((), NetworkClientState::Idle)) |
|
641 |
}; |
|
13414 | 642 |
|
643 |
match result { |
|
13415 | 644 |
Ok(((), state)) if state == NetworkClientState::NeedsWrite => { |
645 |
self.pending.insert((client_id, state)); |
|
14457 | 646 |
} |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
647 |
Ok(((), state)) if state == NetworkClientState::Closed => { |
15175 | 648 |
self.deregister_client(poll, client_id, false); |
15174
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
649 |
} |
e705ac360785
pin removed clients until the output buffer is flushed
alfadur
parents:
15173
diff
changeset
|
650 |
Ok(_) => (), |
14457 | 651 |
Err(e) => { |
652 |
self.operation_failed(poll, client_id, &e, "Error while writing to client socket")? |
|
653 |
} |
|
13119 | 654 |
} |
655 |
||
656 |
Ok(()) |
|
657 |
} |
|
658 |
||
14457 | 659 |
pub fn client_error(&mut self, poll: &Poll, client_id: ClientId) -> io::Result<()> { |
15175 | 660 |
let pending_close = self.clients[client_id].pending_close; |
661 |
self.deregister_client(poll, client_id, true); |
|
662 |
||
663 |
if !pending_close { |
|
664 |
let mut response = handlers::Response::new(client_id); |
|
15520 | 665 |
handlers::handle_client_loss(&mut self.server_state, client_id, &mut response); |
15175 | 666 |
self.handle_response(response, poll); |
667 |
} |
|
13119 | 668 |
|
669 |
Ok(()) |
|
670 |
} |
|
13414 | 671 |
|
672 |
pub fn has_pending_operations(&self) -> bool { |
|
15800 | 673 |
!self.pending.is_empty() || !self.timeout_events.is_empty() |
13414 | 674 |
} |
675 |
||
676 |
pub fn on_idle(&mut self, poll: &Poll) -> io::Result<()> { |
|
13415 | 677 |
if self.has_pending_operations() { |
13478 | 678 |
let mut cache = replace(&mut self.pending_cache, Vec::new()); |
13415 | 679 |
cache.extend(self.pending.drain()); |
680 |
for (id, state) in cache.drain(..) { |
|
681 |
match state { |
|
14457 | 682 |
NetworkClientState::NeedsRead => self.client_readable(poll, id)?, |
683 |
NetworkClientState::NeedsWrite => self.client_writable(poll, id)?, |
|
13415 | 684 |
_ => {} |
685 |
} |
|
13414 | 686 |
} |
13415 | 687 |
swap(&mut cache, &mut self.pending_cache); |
13414 | 688 |
} |
689 |
Ok(()) |
|
690 |
} |
|
13119 | 691 |
} |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
692 |
|
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
693 |
pub struct NetworkLayerBuilder { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
694 |
listener: Option<TcpListener>, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
695 |
secure_listener: Option<TcpListener>, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
696 |
clients_capacity: usize, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
697 |
rooms_capacity: usize, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
698 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
699 |
|
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
700 |
impl Default for NetworkLayerBuilder { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
701 |
fn default() -> Self { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
702 |
Self { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
703 |
clients_capacity: 1024, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
704 |
rooms_capacity: 512, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
705 |
listener: None, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
706 |
secure_listener: None, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
707 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
708 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
709 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
710 |
|
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
711 |
impl NetworkLayerBuilder { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
712 |
pub fn with_listener(self, listener: TcpListener) -> Self { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
713 |
Self { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
714 |
listener: Some(listener), |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
715 |
..self |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
716 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
717 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
718 |
|
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
719 |
pub fn with_secure_listener(self, listener: TcpListener) -> Self { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
720 |
Self { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
721 |
secure_listener: Some(listener), |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
722 |
..self |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
723 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
724 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
725 |
|
14835 | 726 |
#[cfg(feature = "tls-connections")] |
727 |
fn create_ssl_context(listener: TcpListener) -> ServerSsl { |
|
728 |
let mut builder = SslContextBuilder::new(SslMethod::tls()).unwrap(); |
|
729 |
builder.set_verify(SslVerifyMode::NONE); |
|
730 |
builder.set_read_ahead(true); |
|
731 |
builder |
|
732 |
.set_certificate_file("ssl/cert.pem", SslFiletype::PEM) |
|
733 |
.expect("Cannot find certificate file"); |
|
734 |
builder |
|
735 |
.set_private_key_file("ssl/key.pem", SslFiletype::PEM) |
|
736 |
.expect("Cannot find private key file"); |
|
737 |
builder.set_options(SslOptions::NO_COMPRESSION); |
|
15531 | 738 |
builder.set_options(SslOptions::NO_TLSV1); |
15530 | 739 |
builder.set_options(SslOptions::NO_TLSV1_1); |
740 |
builder.set_cipher_list("ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384").unwrap(); |
|
14835 | 741 |
ServerSsl { |
742 |
listener, |
|
743 |
context: builder.build(), |
|
744 |
} |
|
745 |
} |
|
746 |
||
15800 | 747 |
pub fn build(self, poll: &Poll) -> NetworkLayer { |
15520 | 748 |
let server_state = ServerState::new(self.clients_capacity, self.rooms_capacity); |
749 |
||
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
750 |
let clients = Slab::with_capacity(self.clients_capacity); |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
751 |
let pending = HashSet::with_capacity(2 * self.clients_capacity); |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
752 |
let pending_cache = Vec::with_capacity(2 * self.clients_capacity); |
15800 | 753 |
let timeout_events = NetworkTimeoutEvents::new(); |
754 |
||
755 |
#[cfg(feature = "official-server")] |
|
756 |
let waker = Waker::new(poll.registry(), utils::IO_TOKEN) |
|
757 |
.expect("Unable to create a waker for the IO thread"); |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
758 |
|
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
759 |
NetworkLayer { |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
760 |
listener: self.listener.expect("No listener provided"), |
15520 | 761 |
server_state, |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
762 |
clients, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
763 |
pending, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
764 |
pending_cache, |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
765 |
#[cfg(feature = "tls-connections")] |
14835 | 766 |
ssl: Self::create_ssl_context( |
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
767 |
self.secure_listener.expect("No secure listener provided"), |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
768 |
), |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
769 |
#[cfg(feature = "official-server")] |
15800 | 770 |
io: IoLayer::new(waker), |
771 |
timeout_events, |
|
14830
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
772 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
773 |
} |
8ddb5842fe0b
allow running plaintext and tls servers in parallel
alfadur
parents:
14807
diff
changeset
|
774 |
} |