mirror of
https://github.com/EasyTier/EasyTier.git
synced 2024-11-16 03:32:43 +08:00
Merge pull request #97 from wuyumin/yumin-dev
This commit is contained in:
commit
68c077820f
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -26,3 +26,6 @@ nohup.out
|
|||
components.d.ts
|
||||
|
||||
musl_gcc
|
||||
|
||||
# log
|
||||
easytier-panic.log
|
||||
|
|
4
Cargo.lock
generated
4
Cargo.lock
generated
|
@ -387,7 +387,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "boringtun"
|
||||
version = "0.6.0"
|
||||
source = "git+https://github.com/EasyTier/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a"
|
||||
source = "git+https://github.com/EasyTier/boringtun.git?rev=449204c#449204c3eca736dc23b075d81426527a357e2f2a"
|
||||
dependencies = [
|
||||
"aead",
|
||||
"atomic-shim",
|
||||
|
@ -1266,7 +1266,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
|
|||
|
||||
[[package]]
|
||||
name = "easytier"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1-pre"
|
||||
dependencies = [
|
||||
"aes-gcm",
|
||||
"anyhow",
|
||||
|
|
|
@ -8,3 +8,8 @@ panic = "unwind"
|
|||
|
||||
[profile.release]
|
||||
panic = "unwind"
|
||||
# panic = "abort"
|
||||
# lto = true
|
||||
# codegen-units = 1
|
||||
# strip = true
|
||||
# opt-level = "z"
|
||||
|
|
|
@ -3,7 +3,7 @@ name = "easytier"
|
|||
description = "A full meshed p2p VPN, connecting all your devices in one network with one command."
|
||||
homepage = "https://github.com/KKRainbow/EasyTier"
|
||||
repository = "https://github.com/KKRainbow/EasyTier"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1-pre"
|
||||
edition = "2021"
|
||||
authors = ["kkrainbow"]
|
||||
keywords = ["vpn", "p2p", "network", "easytier"]
|
||||
|
@ -127,7 +127,7 @@ network-interface = "1.1.1"
|
|||
pathfinding = "4.9.1"
|
||||
|
||||
# for encryption
|
||||
boringtun = { git = "https://github.com/EasyTier/boringtun.git", optional = true }
|
||||
boringtun = { git = "https://github.com/EasyTier/boringtun.git", optional = true, rev = "449204c" }
|
||||
ring = { version = "0.17", optional = true }
|
||||
bitflags = "2.5"
|
||||
aes-gcm = { version = "0.10.3", optional = true }
|
||||
|
|
|
@ -25,7 +25,7 @@ use humansize::format_size;
|
|||
use tabled::settings::Style;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(author, version, about, long_about = None)]
|
||||
#[command(name = "easytier-cli", author, version, about, long_about = None)]
|
||||
struct Cli {
|
||||
/// the instance name
|
||||
#[arg(short = 'p', long, default_value = "127.0.0.1:15888")]
|
||||
|
|
|
@ -41,7 +41,7 @@ use mimalloc_rust::*;
|
|||
static GLOBAL_MIMALLOC: GlobalMiMalloc = GlobalMiMalloc;
|
||||
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(author, version, about, long_about = None)]
|
||||
#[command(name = "easytier-core", author, version, about, long_about = None)]
|
||||
struct Cli {
|
||||
#[arg(
|
||||
short,
|
||||
|
|
Loading…
Reference in New Issue
Block a user