YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_ws: don't call unwrap on stream.get_peer_addr

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-16 00:27:52 +02:00
parent 2e68155bf4
commit d1ee18394d
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
aquatic_ws/src/lib/network/connection.rs
View file

@ -21,10 +21,10 @@ pub enum Stream {
impl Stream { impl Stream {
#[inline] #[inline]
pub fn get_peer_addr(&self) -> SocketAddr { pub fn get_peer_addr(&self) -> ::std::io::Result<SocketAddr> {
match self { match self {
Self::TcpStream(stream) => stream.peer_addr().unwrap(), Self::TcpStream(stream) => stream.peer_addr(),
Self::TlsStream(stream) => stream.get_ref().peer_addr().unwrap(), Self::TlsStream(stream) => stream.get_ref().peer_addr(),
} }
} }
@ -162,18 +162,26 @@ impl HandshakeMachine {
result: Result<WebSocket<Stream>, HandshakeError<ServerHandshake<Stream, NoCallback>>>, result: Result<WebSocket<Stream>, HandshakeError<ServerHandshake<Stream, NoCallback>>>,
) -> (Option<Either<EstablishedWs, Self>>, bool) { ) -> (Option<Either<EstablishedWs, Self>>, bool) {
match result { match result {
Ok(mut ws) => { Ok(mut ws) => match ws.get_mut().get_peer_addr() {
let peer_addr = ws.get_mut().get_peer_addr(); Ok(peer_addr) => {
::log::trace!(
"established ws handshake with peer with addr: {:?}",
peer_addr
);
::log::trace!( let established_ws = EstablishedWs { ws, peer_addr };
"established ws handshake with peer with addr: {:?}",
peer_addr
);
let established_ws = EstablishedWs { ws, peer_addr }; (Some(Either::Left(established_ws)), false)
}
Err(err) => {
::log::info!(
"get_peer_addr failed during handshake, removing connection: {:?}",
err
);
(Some(Either::Left(established_ws)), false) (None, false)
} }
},
Err(HandshakeError::Interrupted(handshake)) => ( Err(HandshakeError::Interrupted(handshake)) => (
Some(Either::Right(HandshakeMachine::WsMidHandshake(handshake))), Some(Either::Right(HandshakeMachine::WsMidHandshake(handshake))),
true, true,