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

aquatic_ws: convert ipv4-mapped ipv6 addresses to ipv4 (for state split)

Browse source
This commit is contained in:
Joakim Frostegård 2020-08-01 00:08:18 +02:00
parent 4067e420c3
commit 809d16919d
4 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
aquatic_ws/src/lib/network/mod.rs
View file

@ -9,6 +9,8 @@ use mio::{Events, Poll, Interest, Token};
use mio::net::TcpListener;
use tungstenite::protocol::WebSocketConfig;
use aquatic_common::convert_ipv4_mapped_ipv6;
use crate::common::*;
use crate::config::Config;
use crate::protocol::*;
@ -187,10 +189,16 @@ pub fn run_handshakes_and_read_messages(
match established_ws.ws.read_message(){
Ok(ws_message) => {
if let Some(in_message) = InMessage::from_ws_message(ws_message){
let naive_peer_addr = established_ws.peer_addr;
let converted_peer_ip = convert_ipv4_mapped_ipv6(
naive_peer_addr.ip()
);
let meta = ConnectionMeta {
worker_index: socket_worker_index,
poll_token,
peer_addr: established_ws.peer_addr
naive_peer_addr,
converted_peer_ip,
};
debug!("read message");
@ -249,7 +257,7 @@ pub fn send_out_messages(
.and_then(Connection::get_established_ws);
if let Some(established_ws) = opt_established_ws {
if established_ws.peer_addr != meta.peer_addr {
if established_ws.peer_addr != meta.naive_peer_addr {
info!("socket worker error: peer socket addrs didn't match");
continue;