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

Re-export the missing types that are used within Args (#87)

Browse source
This commit is contained in:
Andrej Mihajlov 2024-02-10 12:59:48 +01:00 • committed by GitHub
parent ea5ffff82c
commit 9a4bd9f800
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lib.rs
View file

@ -1,5 +1,4 @@
use crate::{ use crate::{
args::ProxyType,
directions::{IncomingDataEvent, IncomingDirection, OutgoingDirection}, directions::{IncomingDataEvent, IncomingDirection, OutgoingDirection},
http::HttpManager, http::HttpManager,
session_info::{IpProtocol, SessionInfo}, session_info::{IpProtocol, SessionInfo},
@ -21,7 +20,7 @@ use tokio::{
use tproxy_config::is_private_ip; use tproxy_config::is_private_ip;
use udp_stream::UdpStream; use udp_stream::UdpStream;
pub use { pub use {
args::{ArgVerbosity, Args}, args::{ArgDns, ArgProxy, ArgVerbosity, Args, ProxyType},
error::{Error, Result}, error::{Error, Result},
}; };
@ -117,7 +116,7 @@ where
let key = args.proxy.credentials.clone(); let key = args.proxy.credentials.clone();
let dns_addr = args.dns_addr; let dns_addr = args.dns_addr;
let ipv6_enabled = args.ipv6_enabled; let ipv6_enabled = args.ipv6_enabled;
let virtual_dns = if args.dns == args::ArgDns::Virtual { let virtual_dns = if args.dns == ArgDns::Virtual {
Some(Arc::new(Mutex::new(VirtualDns::new()))) Some(Arc::new(Mutex::new(VirtualDns::new())))
} else { } else {
None None
@ -183,7 +182,7 @@ where
if is_private_ip(info.dst.ip()) { if is_private_ip(info.dst.ip()) {
info.dst.set_ip(dns_addr); info.dst.set_ip(dns_addr);
} }
if args.dns == args::ArgDns::OverTcp { if args.dns == ArgDns::OverTcp {
let proxy_handler = mgr.new_proxy_handler(info, None, false).await?; let proxy_handler = mgr.new_proxy_handler(info, None, false).await?;
tokio::spawn(async move { tokio::spawn(async move {
if let Err(err) = handle_dns_over_tcp_session(udp, server_addr, proxy_handler, ipv6_enabled).await { if let Err(err) = handle_dns_over_tcp_session(udp, server_addr, proxy_handler, ipv6_enabled).await {
@ -193,7 +192,7 @@ where
}); });
continue; continue;
} }
if args.dns == args::ArgDns::Virtual { if args.dns == ArgDns::Virtual {
tokio::spawn(async move { tokio::spawn(async move {
if let Some(virtual_dns) = virtual_dns { if let Some(virtual_dns) = virtual_dns {
if let Err(err) = handle_virtual_dns_session(udp, virtual_dns).await { if let Err(err) = handle_virtual_dns_session(udp, virtual_dns).await {
@ -204,7 +203,7 @@ where
}); });
continue; continue;
} }
assert_eq!(args.dns, args::ArgDns::Direct); assert_eq!(args.dns, ArgDns::Direct);
} }
let domain_name = if let Some(virtual_dns) = &virtual_dns { let domain_name = if let Some(virtual_dns) = &virtual_dns {
let mut virtual_dns = virtual_dns.lock().await; let mut virtual_dns = virtual_dns.lock().await;