|
|
@@ -8,6 +8,8 @@ use std::process::exit; |
|
|
|
|
|
|
|
use clap::{Arg, ArgMatches, App}; |
|
|
|
|
|
|
|
use futures_util::future::join; |
|
|
|
|
|
|
|
use pnet::datalink; |
|
|
|
|
|
|
|
use whoami; |
|
|
@@ -117,8 +119,7 @@ async fn main() { |
|
|
|
let proxy_port = args.value_of("proxy_port").unwrap().parse::<u16>().unwrap(); |
|
|
|
let proxy_ip = proxy_bind_addr.unwrap().ip(); |
|
|
|
|
|
|
|
let proxy = start_proxy(dns1_ip, dns2_ip, proxy_ip, proxy_port); |
|
|
|
let admin = start_admin(admin_port, proxy_ip.to_string(), proxy_port, password_hash); |
|
|
|
proxy.await; |
|
|
|
admin.await; |
|
|
|
let proxy = start_proxy(dns1_ip, dns2_ip, proxy_ip, proxy_port); |
|
|
|
join(admin, proxy).await; |
|
|
|
} |