SuperMarioOdysseyOnline/smo-multi-rs
1
0
Fork 0
mirror of https://github.com/speyejack/smo-multi-rs.git synced 2025-10-05 23:52:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix udp packets not transmitting to correct ports

Browse Source
This commit is contained in:
Jack Garrard
2022-08-14 21:11:51 -07:00
parent 186d12a6a4
commit 127760ab6b
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
examples/proxy/src/main.rs
View File

@@ -124,34 +124,33 @@ async fn proxy_client(
) -> Result<()> {
let server_conn = tokio::net::TcpSocket::new_v4()?;
let addr = to_addrs.0;
let udp_addr = to_addrs.1;
let serv_udp_addr = to_addrs.1;
let plex = to_addrs.2;
let serv_sock = server_conn.connect(addr).await?;
// udp_sock.connect(udp_addr).await.unwrap();
let serv_tcp_addr = serv_sock.peer_addr().expect("Couldn't get tcp peer addr");
let serv_udp_addr = SocketAddr::new(serv_tcp_addr.ip(), serv_udp_addr.port());
tracing::info!("Binding: {}", udp_addr_loc);
let udp = UdpSocket::bind(udp_addr_loc).await.unwrap();
let udp_port = udp
.local_addr()
.expect("Couldn't get udp local port")
.port();
let loc_udp_addr = udp.local_addr().expect("Couldn't get udp local port");
let loc_udp_port = loc_udp_addr.port();
tracing::info!("Binding udp to: {}", loc_udp_addr);
let mut cli = Connection::new(cli_sock);
let mut serv = Connection::new(serv_sock);
let mut udp = UdpConnection::new(udp, udp_addr);
let mut udp = UdpConnection::new(udp, serv_udp_addr);
let mut use_udp = true;
let mut last_tag_packet = Instant::now();
serv.write_packet(&Packet::new(
Guid::default(),
PacketData::UdpInit { port: udp_port },
PacketData::UdpInit { port: loc_udp_port },
))
.await?;
tracing::info!("Client setup and ready");
loop {
let (origin, packet_result) = tokio::select! {
packet_r = udp.read_packet() => {tracing::debug!("Got udp!");(plex, packet_r)}
packet_r = udp.read_packet() => {tracing::info!("Got udp!");(plex, packet_r)}
packet_r = cli.read_packet() => {(Origin::Client, packet_r)},
packet_r = serv.read_packet() => {(Origin::Server, packet_r)},
};
@@ -175,10 +174,9 @@ async fn proxy_client(
last_tag_packet = Instant::now();
}
PacketData::UdpInit { port } => {
udp = UdpConnection::new(udp.socket, SocketAddr::new(udp_addr.ip(), *port));
}
PacketData::Connect { .. } => {
tracing::info!("Got connect packet: {:?}", packet);
let addr = SocketAddr::new(serv_udp_addr.ip(), *port);
tracing::info!("New udp peer: {:?}", addr);
udp = UdpConnection::new(udp.socket, addr);
}
_ => {}
}

17
src/client.rs
View File

@@ -251,15 +251,19 @@ impl Client {
.await?;
let udp = UdpSocket::bind("0.0.0.0:0").await?;
let udp_port = udp.local_addr().expect("Failed to unwrap udp port").port();
let udp_addr = udp.local_addr().expect("Failed to unwrap udp port");
tracing::debug!("Binding udp to: {:?}", udp_addr);
conn.write_packet(&Packet::new(
Guid::default(),
PacketData::UdpInit { port: udp_port },
PacketData::UdpInit {
port: udp_addr.port(),
},
))
.await?;
tracing::debug!("setting new udp connection");
let mut udp_conn = UdpConnection::new(udp, SocketAddr::new(tcp_sock_addr.ip(), 55446));
let udp_addr = SocketAddr::new(tcp_sock_addr.ip(), 55446);
let mut udp_conn = UdpConnection::new(udp, udp_addr);
tracing::debug!("Waiting for reply");
let new_player = loop {
@@ -267,10 +271,9 @@ impl Client {
let new_player = match connect.data {
PacketData::UdpInit { port } => {
udp_conn = UdpConnection::new(
udp_conn.socket,
SocketAddr::new(tcp_sock_addr.ip(), port),
);
let udp_addr = SocketAddr::new(tcp_sock_addr.ip(), port);
tracing::debug!("Connecting to new udp: {:?}", udp_addr);
udp_conn = UdpConnection::new(udp_conn.socket, udp_addr);
}
PacketData::Connect {
client_name: ref name,