luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-05-14 14:02:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

rename have_data to data_size

Browse source
This commit is contained in:
ssrlive 2023-10-06 21:21:33 +08:00
parent 6169014564
commit 81db9cb181
3 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/http.rs
View file

@ -366,15 +366,15 @@ impl ProxyHandler for HttpConnection {
self.state == HttpState::Established
}
fn have_data(&mut self, dir: Direction) -> bool {
fn data_len(&self, dir: Direction) -> usize {
match dir {
Direction::Incoming(incoming) => match incoming {
IncomingDirection::FromServer => !self.server_inbuf.is_empty(),
IncomingDirection::FromClient => !self.client_inbuf.is_empty() || !self.data_buf.is_empty(),
IncomingDirection::FromServer => self.server_inbuf.len(),
IncomingDirection::FromClient => self.client_inbuf.len().max(self.data_buf.len()),
},
Direction::Outgoing(outgoing) => match outgoing {
OutgoingDirection::ToServer => !self.server_outbuf.is_empty(),
OutgoingDirection::ToClient => !self.client_outbuf.is_empty(),
OutgoingDirection::ToServer => self.server_outbuf.len(),
OutgoingDirection::ToClient => self.client_outbuf.len(),
},
}
}

10
src/socks.rs
View file

@ -314,15 +314,15 @@ impl ProxyHandler for SocksProxyImpl {
self.state == SocksState::Established
}
fn have_data(&mut self, dir: Direction) -> bool {
fn data_len(&self, dir: Direction) -> usize {
match dir {
Direction::Incoming(incoming) => match incoming {
IncomingDirection::FromServer => !self.server_inbuf.is_empty(),
IncomingDirection::FromClient => !self.client_inbuf.is_empty() || !self.data_buf.is_empty(),
IncomingDirection::FromServer => self.server_inbuf.len(),
IncomingDirection::FromClient => self.client_inbuf.len().max(self.data_buf.len()),
},
Direction::Outgoing(outgoing) => match outgoing {
OutgoingDirection::ToServer => !self.server_outbuf.is_empty(),
OutgoingDirection::ToClient => !self.client_outbuf.is_empty(),
OutgoingDirection::ToServer => self.server_outbuf.len(),
OutgoingDirection::ToClient => self.client_outbuf.len(),
},
}
}

19
src/tun2proxy.rs
View file

@ -197,7 +197,7 @@ pub(crate) trait ProxyHandler {
fn consume_data(&mut self, dir: OutgoingDirection, size: usize);
fn peek_data(&mut self, dir: OutgoingDirection) -> OutgoingDataEvent;
fn connection_established(&self) -> bool;
fn have_data(&mut self, dir: Direction) -> bool;
fn data_len(&self, dir: Direction) -> usize;
fn reset_connection(&self) -> bool;
fn get_udp_associate(&self) -> Option<SocketAddr>;
}
@ -395,13 +395,10 @@ impl<'a> TunToProxy<'a> {
None => return Ok(()),
};
let mut closed_ends = 0;
let handler = state.proxy_handler.as_ref();
if (state.close_state & SERVER_WRITE_CLOSED) == SERVER_WRITE_CLOSED
&& !state
.proxy_handler
.have_data(Direction::Incoming(IncomingDirection::FromServer))
&& !state
.proxy_handler
.have_data(Direction::Outgoing(OutgoingDirection::ToClient))
&& handler.data_len(Direction::Incoming(IncomingDirection::FromServer)) == 0
&& handler.data_len(Direction::Outgoing(OutgoingDirection::ToClient)) == 0
{
// Close tun interface
let socket = self.sockets.get_mut::<tcp::Socket>(state.smoltcp_handle);
@ -411,12 +408,8 @@ impl<'a> TunToProxy<'a> {
}
if (state.close_state & CLIENT_WRITE_CLOSED) == CLIENT_WRITE_CLOSED
&& !state
.proxy_handler
.have_data(Direction::Incoming(IncomingDirection::FromClient))
&& !state
.proxy_handler
.have_data(Direction::Outgoing(OutgoingDirection::ToServer))
&& handler.data_len(Direction::Incoming(IncomingDirection::FromClient)) == 0
&& handler.data_len(Direction::Outgoing(OutgoingDirection::ToServer)) == 0
{
// Close remote server
if let Err(err) = state.mio_stream.shutdown(Shutdown::Write) {