This commit is contained in:
Luna Yao
2026-05-04 02:06:50 +02:00
parent 22c458163a
commit c9e610a175
3 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -7,14 +7,14 @@ use crate::{
api::manage::ConfigSource as RpcConfigSource, api::manage::ConfigSource as RpcConfigSource,
common::{CompressionAlgoPb, PortForwardConfigPb, SecureModeConfig, SocketType}, common::{CompressionAlgoPb, PortForwardConfigPb, SecureModeConfig, SocketType},
}, },
tunnel::{generate_digest_from_str, IpScheme, TunnelScheme}, tunnel::{IpScheme, TunnelScheme, generate_digest_from_str},
utils, utils,
}; };
use anyhow::Context; use anyhow::Context;
use base64::{prelude::BASE64_STANDARD, Engine as _}; use base64::{Engine as _, prelude::BASE64_STANDARD};
use bon::Builder; use bon::Builder;
use clap::builder::PossibleValue;
use clap::ValueEnum; use clap::ValueEnum;
use clap::builder::PossibleValue;
use derivative::Derivative; use derivative::Derivative;
use derive_more::{Constructor, Deref}; use derive_more::{Constructor, Deref};
use getset::Getters; use getset::Getters;
+1 -1
View File
@@ -5,9 +5,9 @@ use crate::dns::config::{DNS_DEFAULT_ADDRESSES, DNS_DEFAULT_DOMAIN};
use crate::dns::utils::addr::NameServerAddrGroup; use crate::dns::utils::addr::NameServerAddrGroup;
use crate::proto::dns::GetExportConfigResponse; use crate::proto::dns::GetExportConfigResponse;
use hickory_proto::rr::LowerName; use hickory_proto::rr::LowerName;
use optionize::{Optionizable, optionized};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
use optionize::{optionized, Optionizable};
#[optionized] #[optionized]
#[optionize(name = "DnsConfigRaw")] #[optionize(name = "DnsConfigRaw")]
+1 -1
View File
@@ -7,11 +7,11 @@ use derive_more::From;
use hickory_proto::op::ResponseCode; use hickory_proto::op::ResponseCode;
use hickory_proto::rr::LowerName; use hickory_proto::rr::LowerName;
use maplit::hashset; use maplit::hashset;
use optionize::{Optionizable, optionized};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashSet; use std::collections::HashSet;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::net::{Ipv4Addr, Ipv6Addr}; use std::net::{Ipv4Addr, Ipv6Addr};
use optionize::{optionized, Optionizable};
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Hash, From, Deserialize, Serialize)] #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Hash, From, Deserialize, Serialize)]
#[serde(untagged)] #[serde(untagged)]