luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-04-19 21:39:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Check whether connection is still active upon mio event

Browse source 
Fix issue #3
This commit is contained in:
B. Blechschmidt 2022-12-10 21:29:57 +01:00
parent 41c22fa4d4
commit be3d7e314b
1 changed files with 50 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
src/tun2proxy.rs
View file

@ -439,61 +439,62 @@ impl<'a> TunToProxy<'a> {
} }
fn mio_socket_event(&mut self, event: &Event) { fn mio_socket_event(&mut self, event: &Event) {
let connection = *self.token_to_connection.get(&event.token()).unwrap(); if let Some(conn_ref) = self.token_to_connection.get(&event.token()) {
let connection = *conn_ref;
if event.is_readable() {
{
let state = self.connections.get_mut(&connection).unwrap();
if event.is_readable() { let mut buf = [0u8; 4096];
{ let read_result = state.mio_stream.read(&mut buf);
let state = self.connections.get_mut(&connection).unwrap(); let read = if read_result.is_err() {
error!("READ from proxy: {}", read_result.as_ref().err().unwrap());
0
} else {
read_result.unwrap()
};
let mut buf = [0u8; 4096]; if read == 0 {
let read_result = state.mio_stream.read(&mut buf); {
let read = if read_result.is_err() { let socket = self.iface.get_socket::<TcpSocket>(
error!("READ from proxy: {}", read_result.as_ref().err().unwrap()); self.connections.get(&connection).unwrap().smoltcp_handle,
0 );
} else { socket.close();
read_result.unwrap() }
}; self.expect_smoltcp_send();
self.remove_connection(&connection.clone());
if read == 0 { return;
{ }
let socket = self.iface.get_socket::<TcpSocket>(
self.connections.get(&connection).unwrap().smoltcp_handle, let event = IncomingDataEvent {
); direction: IncomingDirection::FromServer,
socket.close(); buffer: &buf[0..read],
};
if let Err(error) = state.handler.push_data(event) {
state.mio_stream.shutdown(Both).unwrap();
{
let socket = self.iface.get_socket::<TcpSocket>(
self.connections.get(&connection).unwrap().smoltcp_handle,
);
socket.close();
}
self.expect_smoltcp_send();
Self::print_error(error);
self.remove_connection(&connection.clone());
return;
} }
self.expect_smoltcp_send();
self.remove_connection(&connection.clone());
return;
} }
let event = IncomingDataEvent { // We have read from the proxy server and pushed the data to the connection handler.
direction: IncomingDirection::FromServer, // Thus, expect data to be processed (e.g. decapsulated) and forwarded to the client.
buffer: &buf[0..read],
}; //self.expect_smoltcp_send();
if let Err(error) = state.handler.push_data(event) { self.write_to_client(&connection);
state.mio_stream.shutdown(Both).unwrap(); self.expect_smoltcp_send();
{ }
let socket = self.iface.get_socket::<TcpSocket>( if event.is_writable() {
self.connections.get(&connection).unwrap().smoltcp_handle, self.write_to_server(&connection);
);
socket.close();
}
self.expect_smoltcp_send();
Self::print_error(error);
self.remove_connection(&connection.clone());
return;
}
} }
// We have read from the proxy server and pushed the data to the connection handler.
// Thus, expect data to be processed (e.g. decapsulated) and forwarded to the client.
//self.expect_smoltcp_send();
self.write_to_client(&connection);
self.expect_smoltcp_send();
}
if event.is_writable() {
self.write_to_server(&connection);
} }
} }