Changes to be committed:

modified:   src/client.rs
	modified:   src/config.rs
	modified:   src/main.rs
	modified:   src/server.rs

src/client.rs

@@ -1,18 +1,18 @@
-use crossbeam_channel::{unbounded, Receiver};
-use tokio::{net::UdpSocket, sync::{mpsc, Mutex}};
-use tokio::task::JoinSet;
-use packet::{builder::Builder, icmp, ip};
+use crossbeam_channel::{unbounded};
+use tokio::{net::UdpSocket, sync::{Mutex}};
+
+
 use std::io::{Read, Write};
-use tun2::BoxError;
-use log::{error, info, warn, LevelFilter};
+
+use log::{error, info, warn};
 use std::sync::Arc;
-use std::net::{ SocketAddr, Ipv4Addr };
-use std::collections::HashMap;
+use std::net::{ Ipv4Addr };
+
 use std::process::Command;
-use x25519_dalek::{PublicKey, SharedSecret, StaticSecret};
+use x25519_dalek::{PublicKey, StaticSecret};
 use aes_gcm::{
     aead::{Aead, AeadCore, KeyInit, OsRng},
-    Aes256Gcm, Key, Nonce};
+    Aes256Gcm, Nonce};
 
 use crate::config::ClientConfiguration;
 use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable};

src/config.rs

@@ -1,4 +1,4 @@
-use std::{fs, io::{self, Error, Read}, net::{IpAddr, Ipv4Addr, SocketAddr}, str, sync::Arc, thread, time};
+use std::{net::{Ipv4Addr}, str};
 use serde_derive::Serialize;
 use serde_derive::Deserialize;
 use std::str::FromStr;

src/main.rs

@@ -1,15 +1,15 @@
-use tokio::{net::UdpSocket, sync::mpsc};
-use std::{fs, io::{self, Error, Read}, net::{IpAddr, Ipv4Addr, SocketAddr}, str, sync::Arc, thread, time};
-use std::process::Command;
+
+use std::{fs, net::{Ipv4Addr}, str};
+
 use clap::{App, Arg, ArgMatches};
 use env_logger::Builder;
-use log::{error, info, warn, LevelFilter};
-use serde_derive::Serialize;
-use serde_derive::Deserialize;
-use std::str::FromStr;
-use x25519_dalek::{StaticSecret, PublicKey};
-use rand::{rngs::StdRng, SeedableRng};
-use crate::config::{ ServerConfiguration, ClientConfiguration, ObfsConfig, ObfsProtocol, ServerPeer };
+use log::{error, LevelFilter};
+
+
+
+
+
+use crate::config::{ ServerConfiguration, ClientConfiguration, ObfsProtocol, ServerPeer };
 
 
 mod server;

src/server.rs

@@ -1,17 +1,17 @@
-use crossbeam_channel::{unbounded, Receiver, Sender};
-use tokio::{net::{TcpListener, TcpSocket, TcpStream, UdpSocket}, sync::{mpsc, Mutex}};
-use tokio::task::JoinSet;
-use packet::{builder::Builder, icmp, ip, AsPacket};
-use x25519_dalek::{PublicKey, SharedSecret, StaticSecret};
+use crossbeam_channel::{unbounded};
+use tokio::{net::{UdpSocket}, sync::{Mutex}};
+
+
+use x25519_dalek::{PublicKey, StaticSecret};
 use std::io::{Read, Write};
-use tun2::BoxError;
-use log::{error, info, LevelFilter};
+
+use log::{error, info};
 use std::sync::Arc;
 use std::net::{ SocketAddr, Ipv4Addr, IpAddr };
 use std::collections::HashMap;
-use std::process::Command;
+
 use aes_gcm::{ aead::{Aead, AeadCore, KeyInit, OsRng},
-Aes256Gcm, Key, Nonce };
+Aes256Gcm, Nonce };
 
 use crate::config::{ ServerConfiguration, ServerPeer};