Compare commits

..

No commits in common. "cf72198b1fe3ca63b2cfde3b37655e724a94e631" and "766401b2197e9a2e59a2f6ce1a6e45b1c02d9eb2" have entirely different histories.

6 changed files with 13 additions and 13 deletions

12
Cargo.lock generated
View File

@ -1447,7 +1447,7 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
[[package]] [[package]]
name = "ostp" name = "ostp"
version = "0.3.16" version = "0.3.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@ -1471,7 +1471,7 @@ dependencies = [
[[package]] [[package]]
name = "ostp-client" name = "ostp-client"
version = "0.3.16" version = "0.3.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@ -1506,7 +1506,7 @@ dependencies = [
[[package]] [[package]]
name = "ostp-core" name = "ostp-core"
version = "0.3.16" version = "0.3.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"byteorder", "byteorder",
@ -1543,7 +1543,7 @@ dependencies = [
[[package]] [[package]]
name = "ostp-server" name = "ostp-server"
version = "0.3.16" version = "0.3.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@ -1576,7 +1576,7 @@ dependencies = [
[[package]] [[package]]
name = "ostp-tun" name = "ostp-tun"
version = "0.3.16" version = "0.3.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"libc", "libc",
@ -1588,7 +1588,7 @@ dependencies = [
[[package]] [[package]]
name = "ostp-tun-helper" name = "ostp-tun-helper"
version = "0.3.16" version = "0.3.14"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",

View File

@ -12,7 +12,7 @@ resolver = "2"
[workspace.package] [workspace.package]
edition = "2021" edition = "2021"
license = "BSL 1.1" license = "BSL 1.1"
version = "0.3.16" version = "0.3.14"
[workspace.dependencies] [workspace.dependencies]
anyhow = "1.0" anyhow = "1.0"

View File

@ -6,7 +6,7 @@ use crate::tunnel::router::{Router, Session};
use crate::tunnel::outbounds::OutboundManager; use crate::tunnel::outbounds::OutboundManager;
use tokio::sync::watch; use tokio::sync::watch;
#[cfg(any(target_os = "windows", target_os = "linux", target_os = "android"))] #[cfg(any(target_os = "windows", target_os = "linux"))]
pub async fn run_tun_inbound( pub async fn run_tun_inbound(
config: ClientConfig, config: ClientConfig,
inbound_config: InboundConfig, inbound_config: InboundConfig,
@ -21,7 +21,7 @@ pub async fn run_tun_inbound(
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
use futures::{StreamExt, SinkExt}; use futures::{StreamExt, SinkExt};
let InboundConfig::Tun { tag, auto_route, mtu, fd, .. } = inbound_config else { let InboundConfig::Tun { tag, auto_route, mtu, .. } = inbound_config else {
return Err(anyhow!("Invalid config for TUN inbound")); return Err(anyhow!("Invalid config for TUN inbound"));
}; };
@ -300,7 +300,7 @@ pub async fn run_tun_inbound(
Ok(()) Ok(())
} }
#[cfg(not(any(target_os = "windows", target_os = "linux", target_os = "android")))] #[cfg(not(any(target_os = "windows", target_os = "linux")))]
pub async fn run_tun_inbound( pub async fn run_tun_inbound(
_config: ClientConfig, _config: ClientConfig,
_inbound_config: InboundConfig, _inbound_config: InboundConfig,

View File

@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 0.3.16+29 version: 0.3.14+27
environment: environment:
sdk: ^3.11.4 sdk: ^3.11.4

View File

@ -1,7 +1,7 @@
{ {
"$schema": "https://schema.tauri.app/config/2", "$schema": "https://schema.tauri.app/config/2",
"productName": "ostp-gui", "productName": "ostp-gui",
"version": "0.3.16", "version": "0.3.14",
"identifier": "com.ospab.ostp", "identifier": "com.ospab.ostp",
"build": { "build": {
"frontendDist": "../src" "frontendDist": "../src"

@ -1 +1 @@
Subproject commit 99e1c6ff5406a1ad015f65bb2aa45be11487342e Subproject commit 43b4935fd2addc284a5ae8719824652f9063b95d