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

Use CanonicalSocketAddr in ws and http; remove old option from common

Browse source
This commit is contained in:
Joakim Frostegård 2022-02-03 19:29:21 +01:00
parent 380ca222de
commit 8889ab586c
9 changed files with 36 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aquatic_ws/src/mio/socket/connection.rs
View file

@ -153,7 +153,7 @@ impl Connection<NotRegistered> {
}
pub fn close(self) {
::log::debug!("will close connection to {}", self.meta.naive_peer_addr);
::log::debug!("will close connection to {}", self.meta.peer_addr.get());
match self.state {
ConnectionState::TlsHandshaking(inner) => inner.close(),

17
aquatic_ws/src/mio/socket/mod.rs
View file

@ -4,13 +4,13 @@ use std::time::{Duration, Instant};
use anyhow::Context;
use aquatic_common::access_list::AccessListQuery;
use aquatic_common::CanonicalSocketAddr;
use hashbrown::HashMap;
use mio::net::TcpListener;
use mio::{Events, Interest, Poll, Token};
use socket2::{Domain, Protocol, Socket, Type};
use tungstenite::protocol::WebSocketConfig;
use aquatic_common::convert_ipv4_mapped_ipv6;
use aquatic_ws_protocol::*;
use crate::common::*;
@ -263,20 +263,17 @@ fn accept_new_streams(
loop {
match listener.accept() {
Ok((stream, _)) => {
let naive_peer_addr = if let Ok(peer_addr) = stream.peer_addr() {
peer_addr
let peer_addr = if let Ok(peer_addr) = stream.peer_addr() {
CanonicalSocketAddr::new(peer_addr)
} else {
continue;
};
connections.insert_and_register_new(poll, move |token| {
let converted_peer_ip = convert_ipv4_mapped_ipv6(naive_peer_addr.ip());
let meta = ConnectionMeta {
out_message_consumer_id: ConsumerId(socket_worker_index),
connection_id: ConnectionId(token.0),
naive_peer_addr,
converted_peer_ip,
peer_addr,
pending_scrape_id: None, // FIXME
};
@ -348,11 +345,11 @@ where
let mut remove_connection = false;
if let Some(connection) = connections.get_mut(&token) {
if connection.get_meta().naive_peer_addr != meta.naive_peer_addr {
if connection.get_meta().peer_addr != meta.peer_addr {
::log::warn!(
"socket worker error: connection socket addr {} didn't match channel {}. Token: {}.",
connection.get_meta().naive_peer_addr,
meta.naive_peer_addr,
connection.get_meta().peer_addr.get(),
meta.peer_addr.get(),
token.0
);