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