ospab
/
ostp
mirror of https://github.com/ospab/ostp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix syntax and type errors after DNS removal

This commit is contained in:
ospab 2026-06-10 22:59:10 +03:00
parent 9f35caf4ca
commit fbf13b86f3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ostp/src/main.rs
View File

@ -130,6 +130,7 @@ fn parse_ostp_link(link: &str) -> Result<ClientConfig> {
debug: Some(false), debug: Some(false),
exclude: None, exclude: None,
mux: None, mux: None,
gui: None,
}) })
} }
@ -340,6 +341,7 @@ struct ClientConfig {
exclude: Option<ExcludeConfig>, exclude: Option<ExcludeConfig>,
mux: Option<MuxConfig>, mux: Option<MuxConfig>,
transport: Option<TransportConfigRaw>, transport: Option<TransportConfigRaw>,
gui: Option<serde_json::Value>,
} }
#[derive(Debug, Deserialize, Serialize, Clone)] #[derive(Debug, Deserialize, Serialize, Clone)]
@ -395,6 +397,7 @@ struct OutboundConfig {
struct OutboundRule { struct OutboundRule {
domain_suffix: Option<Vec<String>>, domain_suffix: Option<Vec<String>>,
ip_cidr: Option<Vec<String>>, ip_cidr: Option<Vec<String>>,
protocol: Option<String>,
action: Option<String>, action: Option<String>,
} }
@ -1012,6 +1015,7 @@ async fn run_app() -> Result<()> {
.map(|r| ostp_server::OutboundRule { .map(|r| ostp_server::OutboundRule {
domain_suffix: r.domain_suffix.unwrap_or_default(), domain_suffix: r.domain_suffix.unwrap_or_default(),
ip_cidr: r.ip_cidr.unwrap_or_default(), ip_cidr: r.ip_cidr.unwrap_or_default(),
protocol: r.protocol,
action: parse_outbound_action(r.action), action: parse_outbound_action(r.action),
}) })
.collect(), .collect(),
@ -1208,6 +1212,7 @@ async fn run_client_directly(client_cfg: ClientConfig) -> Result<()> {
}, },
dns_server: client_cfg.tun.as_ref().and_then(|t| t.dns.clone()), dns_server: client_cfg.tun.as_ref().and_then(|t| t.dns.clone()),
kill_switch: client_cfg.tun.as_ref().and_then(|t| t.kill_switch).unwrap_or(false), kill_switch: client_cfg.tun.as_ref().and_then(|t| t.kill_switch).unwrap_or(false),
gui: None,
}; };
// Run the client implementation // Run the client implementation