♻️ refactor
_
parent
b75b7c5a74
commit
67fc89e640
|
|
@ -106,18 +106,15 @@ impl PtthNewConnection {
|
||||||
async fn handle_quic_connection (
|
async fn handle_quic_connection (
|
||||||
relay_state: Arc <Mutex <RelayState>>,
|
relay_state: Arc <Mutex <RelayState>>,
|
||||||
conn: quinn::Connecting,
|
conn: quinn::Connecting,
|
||||||
) -> anyhow::Result <()> {
|
) -> anyhow::Result <()>
|
||||||
let quinn::NewConnection {
|
{
|
||||||
connection,
|
let mut conn = conn.await?;
|
||||||
mut bi_streams,
|
|
||||||
..
|
|
||||||
} = conn.await?;
|
|
||||||
|
|
||||||
// Everyone who connects must identify themselves with the first
|
// Everyone who connects must identify themselves with the first
|
||||||
// bi stream
|
// bi stream
|
||||||
// TODO: Timeout
|
// TODO: Timeout
|
||||||
|
|
||||||
let (mut send, mut recv) = bi_streams.next ().await.ok_or_else (|| anyhow::anyhow! ("QUIC client didn't identify itself"))??;
|
let (mut send, mut recv) = conn.bi_streams.next ().await.ok_or_else (|| anyhow::anyhow! ("QUIC client didn't identify itself"))??;
|
||||||
|
|
||||||
let mut req_buf = [0u8; 4];
|
let mut req_buf = [0u8; 4];
|
||||||
recv.read_exact (&mut req_buf).await?;
|
recv.read_exact (&mut req_buf).await?;
|
||||||
|
|
@ -136,107 +133,10 @@ async fn handle_quic_connection (
|
||||||
|
|
||||||
match peer_type {
|
match peer_type {
|
||||||
2 => {
|
2 => {
|
||||||
let client_id = peer_id;
|
handle_p2_connection (relay_state, peer_id, conn).await?;
|
||||||
while let Some (bi_stream) = bi_streams.next ().await {
|
|
||||||
let (mut client_send, mut client_recv) = bi_stream?;
|
|
||||||
let relay_state = Arc::clone (&relay_state);
|
|
||||||
|
|
||||||
tokio::spawn (async move {
|
|
||||||
let mut req_buf = [0u8; 4];
|
|
||||||
client_recv.read_exact (&mut req_buf).await?;
|
|
||||||
|
|
||||||
let cmd_type = req_buf [0];
|
|
||||||
match cmd_type {
|
|
||||||
1 => {
|
|
||||||
let server_id = req_buf [1];
|
|
||||||
|
|
||||||
debug! ("P2 {} wants to connect to P4 {}", peer_id, server_id);
|
|
||||||
|
|
||||||
// TODO: Auth checks
|
|
||||||
|
|
||||||
let resp_buf = [0, 0, 0, 0];
|
|
||||||
client_send.write_all (&resp_buf).await?;
|
|
||||||
|
|
||||||
{
|
|
||||||
let relay_state = relay_state.lock ().await;
|
|
||||||
match relay_state.p4_server_proxies.get (&server_id) {
|
|
||||||
Some (p4_state) => {
|
|
||||||
p4_state.req_channel.send (RequestP2ToP4 {
|
|
||||||
client_send,
|
|
||||||
client_recv,
|
|
||||||
client_id,
|
|
||||||
}).await.map_err (|_| anyhow::anyhow! ("Can't send request to P4 server"))?;
|
|
||||||
},
|
|
||||||
None => warn! ("That server isn't connected"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
_ => bail! ("Unknown command type from P2"),
|
|
||||||
}
|
|
||||||
|
|
||||||
debug! ("Request ended for P2");
|
|
||||||
|
|
||||||
Ok::<_, anyhow::Error> (())
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
debug! ("P2 {} disconnected", peer_id);
|
|
||||||
},
|
},
|
||||||
4 => {
|
4 => {
|
||||||
let (tx, mut rx) = mpsc::channel (2);
|
handle_p4_connection (relay_state, peer_id, conn).await?;
|
||||||
|
|
||||||
let p4_state = P4State {
|
|
||||||
req_channel: tx,
|
|
||||||
};
|
|
||||||
|
|
||||||
{
|
|
||||||
let mut relay_state = relay_state.lock ().await;
|
|
||||||
relay_state.p4_server_proxies.insert (peer_id, p4_state);
|
|
||||||
}
|
|
||||||
|
|
||||||
while let Some (req) = rx.recv ().await {
|
|
||||||
let connection = connection.clone ();
|
|
||||||
|
|
||||||
tokio::spawn (async move {
|
|
||||||
let RequestP2ToP4 {
|
|
||||||
client_send,
|
|
||||||
client_recv,
|
|
||||||
client_id,
|
|
||||||
} = req;
|
|
||||||
|
|
||||||
debug! ("P4 {} got a request from P2 {}", peer_id, req.client_id);
|
|
||||||
|
|
||||||
let (mut server_send, mut server_recv) = connection.open_bi ().await?;
|
|
||||||
|
|
||||||
let req_buf = [2u8, client_id, 0, 0];
|
|
||||||
server_send.write_all (&req_buf).await?;
|
|
||||||
|
|
||||||
let mut resp_buf = [0u8, 0, 0, 0];
|
|
||||||
server_recv.read_exact (&mut resp_buf).await?;
|
|
||||||
|
|
||||||
let status_code = resp_buf [0];
|
|
||||||
if status_code != 20 {
|
|
||||||
bail! ("P4 rejected request from {}", client_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
debug! ("Relaying bytes...");
|
|
||||||
|
|
||||||
let ptth_conn = PtthNewConnection {
|
|
||||||
client_send,
|
|
||||||
client_recv,
|
|
||||||
server_send,
|
|
||||||
server_recv,
|
|
||||||
}.build ();
|
|
||||||
|
|
||||||
ptth_conn.uplink_task.await??;
|
|
||||||
ptth_conn.downlink_task.await??;
|
|
||||||
|
|
||||||
debug! ("Request ended for P4");
|
|
||||||
Ok::<_, anyhow::Error> (())
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
debug! ("P4 {} disconnected", peer_id);
|
|
||||||
},
|
},
|
||||||
_ => bail! ("Unknown QUIC client type"),
|
_ => bail! ("Unknown QUIC client type"),
|
||||||
}
|
}
|
||||||
|
|
@ -244,3 +144,128 @@ async fn handle_quic_connection (
|
||||||
debug! ("Peer {} disconnected", peer_id);
|
debug! ("Peer {} disconnected", peer_id);
|
||||||
Ok::<_, anyhow::Error> (())
|
Ok::<_, anyhow::Error> (())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn handle_p2_connection (
|
||||||
|
relay_state: Arc <Mutex <RelayState>>,
|
||||||
|
client_id: u8,
|
||||||
|
conn: quinn::NewConnection,
|
||||||
|
) -> anyhow::Result <()>
|
||||||
|
{
|
||||||
|
let quinn::NewConnection {
|
||||||
|
mut bi_streams,
|
||||||
|
..
|
||||||
|
} = conn;
|
||||||
|
|
||||||
|
while let Some (bi_stream) = bi_streams.next ().await {
|
||||||
|
let (mut client_send, mut client_recv) = bi_stream?;
|
||||||
|
let relay_state = Arc::clone (&relay_state);
|
||||||
|
|
||||||
|
tokio::spawn (async move {
|
||||||
|
let mut req_buf = [0u8; 4];
|
||||||
|
client_recv.read_exact (&mut req_buf).await?;
|
||||||
|
|
||||||
|
let cmd_type = req_buf [0];
|
||||||
|
match cmd_type {
|
||||||
|
1 => {
|
||||||
|
let server_id = req_buf [1];
|
||||||
|
|
||||||
|
debug! ("P2 {} wants to connect to P4 {}", client_id, server_id);
|
||||||
|
|
||||||
|
// TODO: Auth checks
|
||||||
|
|
||||||
|
let resp_buf = [0, 0, 0, 0];
|
||||||
|
client_send.write_all (&resp_buf).await?;
|
||||||
|
|
||||||
|
{
|
||||||
|
let relay_state = relay_state.lock ().await;
|
||||||
|
match relay_state.p4_server_proxies.get (&server_id) {
|
||||||
|
Some (p4_state) => {
|
||||||
|
p4_state.req_channel.send (RequestP2ToP4 {
|
||||||
|
client_send,
|
||||||
|
client_recv,
|
||||||
|
client_id,
|
||||||
|
}).await.map_err (|_| anyhow::anyhow! ("Can't send request to P4 server"))?;
|
||||||
|
},
|
||||||
|
None => warn! ("That server isn't connected"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => bail! ("Unknown command type from P2"),
|
||||||
|
}
|
||||||
|
|
||||||
|
debug! ("Request ended for P2");
|
||||||
|
|
||||||
|
Ok::<_, anyhow::Error> (())
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
debug! ("P2 {} disconnected", client_id);
|
||||||
|
Ok (())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_p4_connection (
|
||||||
|
relay_state: Arc <Mutex <RelayState>>,
|
||||||
|
server_id: u8,
|
||||||
|
conn: quinn::NewConnection,
|
||||||
|
) -> anyhow::Result <()>
|
||||||
|
{
|
||||||
|
let quinn::NewConnection {
|
||||||
|
connection,
|
||||||
|
..
|
||||||
|
} = conn;
|
||||||
|
let (tx, mut rx) = mpsc::channel (2);
|
||||||
|
|
||||||
|
let p4_state = P4State {
|
||||||
|
req_channel: tx,
|
||||||
|
};
|
||||||
|
|
||||||
|
{
|
||||||
|
let mut relay_state = relay_state.lock ().await;
|
||||||
|
relay_state.p4_server_proxies.insert (server_id, p4_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
while let Some (req) = rx.recv ().await {
|
||||||
|
let connection = connection.clone ();
|
||||||
|
|
||||||
|
tokio::spawn (async move {
|
||||||
|
let RequestP2ToP4 {
|
||||||
|
client_send,
|
||||||
|
client_recv,
|
||||||
|
client_id,
|
||||||
|
} = req;
|
||||||
|
|
||||||
|
debug! ("P4 {} got a request from P2 {}", server_id, req.client_id);
|
||||||
|
|
||||||
|
let (mut server_send, mut server_recv) = connection.open_bi ().await?;
|
||||||
|
|
||||||
|
let req_buf = [2u8, client_id, 0, 0];
|
||||||
|
server_send.write_all (&req_buf).await?;
|
||||||
|
|
||||||
|
let mut resp_buf = [0u8, 0, 0, 0];
|
||||||
|
server_recv.read_exact (&mut resp_buf).await?;
|
||||||
|
|
||||||
|
let status_code = resp_buf [0];
|
||||||
|
if status_code != 20 {
|
||||||
|
bail! ("P4 rejected request from {}", client_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
debug! ("Relaying bytes...");
|
||||||
|
|
||||||
|
let ptth_conn = PtthNewConnection {
|
||||||
|
client_send,
|
||||||
|
client_recv,
|
||||||
|
server_send,
|
||||||
|
server_recv,
|
||||||
|
}.build ();
|
||||||
|
|
||||||
|
ptth_conn.uplink_task.await??;
|
||||||
|
ptth_conn.downlink_task.await??;
|
||||||
|
|
||||||
|
debug! ("Request ended for P4");
|
||||||
|
Ok::<_, anyhow::Error> (())
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
debug! ("P4 {} disconnected", server_id);
|
||||||
|
Ok (())
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue