refactor: clean up unused code and improve type annotations

Author: spacemeowx2

protocol/raw/src/config.rs

@@ -100,6 +100,7 @@ pub struct RawNetConfig {
 }
 
 pub struct TunTapSetup {
+    #[allow(dead_code)]
     pub name: Option<String>,
     pub addr: Ipv4Addr,
     pub destination_addr: IpCidr,

protocol/raw/src/device.rs

@@ -2,6 +2,7 @@ use std::{net::Ipv4Addr, str::FromStr};
 
 use crate::config::{DeviceConfig, RawNetConfig, TunTap, TunTapSetup};
 use boxed::BoxedAsyncDevice;
+#[allow(unused_imports)]
 pub use interface_info::get_interface_info;
 use rd_interface::{Error, Result};
 use tokio_smoltcp::smoltcp::wire::{EthernetAddress, IpCidr};

protocol/rpc/src/types.rs

@@ -19,6 +19,7 @@ pub enum RpcValue {
 }
 
 #[derive(Debug, Deserialize, Serialize)]
+#[allow(dead_code)]
 pub enum Error {
     ObjectNotFound,
 }

protocol/ss/src/tests.rs

@@ -29,7 +29,7 @@ async fn test_ss_server_client() {
         udp: true,
         cipher: Cipher::AES_128_GCM,
     };
-    let server = server::SSServer::new(server_cfg);
+    let server = server::SSServer::new(server_cfg).unwrap();
     tokio::spawn(async move { server.start().await });
 
     sleep(Duration::from_secs(1)).await;
@@ -41,7 +41,7 @@ async fn test_ss_server_client() {
         cipher: Cipher::AES_128_GCM,
         net: NetRef::new_with_value(Value::String("local".to_string()), local.clone()),
     };
-    let client = client::SSNet::new(client_cfg).into_dyn();
+    let client = client::SSNet::new(client_cfg).unwrap().into_dyn();
 
     assert_echo(&client, "127.0.0.1:26666").await;
     assert_echo_udp(&client, "127.0.0.1:26666").await;

protocol/ss/src/wrapper.rs

@@ -7,7 +7,7 @@ use rd_interface::{
 };
 use shadowsocks::{
     context::SharedContext,
-    crypto::{CipherCategory, CipherKind},
+    crypto::CipherKind,
     relay::{socks5::Address as SSAddress, tcprelay::crypto_io},
     ProxyClientStream, ServerConfig,
 };
@@ -233,28 +233,6 @@ impl IUdpSocket for WrapSSUdp {
 pub struct CryptoStream<S>(crypto_io::CryptoStream<S>, SharedContext);
 
 impl<S> CryptoStream<S> {
-    pub fn from_stream(context: SharedContext, stream: S, method: CipherKind, key: &[u8]) -> Self {
-        Self::from_client_stream(context, stream, method, key)
-    }
-
-    pub fn from_client_stream(
-        context: SharedContext,
-        stream: S,
-        method: CipherKind,
-        key: &[u8],
-    ) -> Self {
-        CryptoStream(
-            crypto_io::CryptoStream::<S>::from_stream(
-                &context,
-                stream,
-                crypto_io::StreamType::Client,
-                method,
-                key,
-            ),
-            context,
-        )
-    }
-
     pub fn from_server_stream(
         context: SharedContext,
         stream: S,

rd-interface/src/config/compact_vec_string.rs

@@ -48,7 +48,7 @@ impl CompactVecString {
         self.underlying.shrink_to_fit();
         self.index.shrink_to_fit();
     }
-    pub fn iter(&self) -> Iter {
+    pub fn iter(&self) -> Iter<'_> {
         Iter {
             inner: self,
             index: 0,

rd-std/src/builtin/dns.rs

@@ -2,8 +2,7 @@ use std::net::SocketAddr;
 
 use rd_derive::rd_config;
 use rd_interface::{
-    async_trait, config::NetRef, prelude::*, registry::Builder, Address, Error, INet, IntoDyn, Net,
-    Result,
+    async_trait, config::NetRef, prelude::*, registry::Builder, Address, INet, IntoDyn, Net, Result,
 };
 use trust_dns_resolver::{
     config::{NameServerConfig, Protocol, ResolverConfig, ResolverOpts},
@@ -34,7 +33,6 @@ pub struct DnsConfig {
 }
 
 pub struct DnsNet {
-    net: Net,
     resolver: AsyncResolver<GenericConnector<RDRuntime>>,
 }
 
@@ -95,7 +93,7 @@ impl Builder<Net> for DnsNet {
             GenericConnector::new(RDRuntime { net: net.clone() }),
         );
 
-        Ok(Self { resolver, net })
+        Ok(Self { resolver })
     }
 }
 

rd-std/src/util.rs

@@ -43,6 +43,7 @@ pub fn is_reserved(addr: IpAddr) -> bool {
         IpAddr::V4(a) => {
             let [a0, a1, ..] = a.octets();
             a.is_unspecified()
+                || a0 == 0 // 0.0.0.0/8 ("this host on this network")
                 || a.is_loopback()
                 || a.is_private()
                 || (a0 == 169 && a1 == 254) // 169.254.0.0/16

src/config.rs

@@ -236,12 +236,6 @@ pub struct Import {
 
 impl Import {}
 
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub(crate) struct ConfigImport {
-    #[serde(default)]
-    import: Vec<Import>,
-}
-
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ConfigExt {
     #[serde(flatten)]