mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2025-04-02 18:31:50 -04:00
refactor: rename to gpcommon
This commit is contained in:
parent
ec0bff1e36
commit
f42f0d248e
40
Cargo.lock
generated
40
Cargo.lock
generated
@ -51,8 +51,8 @@ checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
|
|||||||
name = "app"
|
name = "app"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"common",
|
|
||||||
"env_logger",
|
"env_logger",
|
||||||
|
"gpcommon",
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@ -357,23 +357,6 @@ dependencies = [
|
|||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "common"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"async-trait",
|
|
||||||
"bytes",
|
|
||||||
"cc",
|
|
||||||
"data-encoding",
|
|
||||||
"log",
|
|
||||||
"ring",
|
|
||||||
"serde",
|
|
||||||
"serde_json",
|
|
||||||
"thiserror",
|
|
||||||
"tokio",
|
|
||||||
"tokio-util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "convert_case"
|
name = "convert_case"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
@ -1101,16 +1084,33 @@ dependencies = [
|
|||||||
name = "gpclient"
|
name = "gpclient"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"common",
|
"gpcommon",
|
||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gpcommon"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"async-trait",
|
||||||
|
"bytes",
|
||||||
|
"cc",
|
||||||
|
"data-encoding",
|
||||||
|
"log",
|
||||||
|
"ring",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"thiserror",
|
||||||
|
"tokio",
|
||||||
|
"tokio-util",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gpservice"
|
name = "gpservice"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"common",
|
|
||||||
"env_logger",
|
"env_logger",
|
||||||
|
"gpcommon",
|
||||||
"log",
|
"log",
|
||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
|
|
||||||
members = [
|
members = [
|
||||||
"common",
|
"gpcommon",
|
||||||
"gpclient",
|
"gpclient",
|
||||||
"gpservice",
|
"gpservice",
|
||||||
"gpauth",
|
"gpauth",
|
||||||
|
@ -6,5 +6,5 @@ edition = "2021"
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
common = { path = "../common" }
|
gpcommon = { path = "../gpcommon" }
|
||||||
tokio = { version = "1.0", features = ["full"] }
|
tokio = { version = "1.0", features = ["full"] }
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
use common::{Client, SOCKET_PATH};
|
use gpcommon::{Client, SOCKET_PATH};
|
||||||
use tokio::{io::AsyncReadExt, net::UnixStream, sync::mpsc};
|
use tokio::{io::AsyncReadExt, net::UnixStream, sync::mpsc};
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
|
0
common/.gitignore → gpcommon/.gitignore
vendored
0
common/.gitignore → gpcommon/.gitignore
vendored
@ -1,5 +1,5 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "common"
|
name = "gpcommon"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
@ -21,7 +21,7 @@ serde_json = "1.0"
|
|||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
env_logger = "0.10"
|
env_logger = "0.10"
|
||||||
common = { path = "../../common" }
|
gpcommon = { path = "../../gpcommon" }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
# by default Tauri runs in production mode
|
# by default Tauri runs in production mode
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
windows_subsystem = "windows"
|
windows_subsystem = "windows"
|
||||||
)]
|
)]
|
||||||
|
|
||||||
use common::{Client, ServerApiError, VpnStatus};
|
use gpcommon::{Client, ServerApiError, VpnStatus};
|
||||||
use env_logger::Env;
|
use env_logger::Env;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
@ -6,7 +6,7 @@ edition = "2021"
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
common = { path = "../common" }
|
gpcommon = { path = "../gpcommon" }
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
env_logger = "0.10"
|
env_logger = "0.10"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
@ -15,4 +15,4 @@ log = "0.4"
|
|||||||
# procfs = "0.15"
|
# procfs = "0.15"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
common = { path = "../common" }
|
gpcommon = { path = "../gpcommon" }
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
use common::sha256_digest;
|
use gpcommon::sha256_digest;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::{env, fs};
|
use std::{env, fs};
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
include!(concat!(env!("OUT_DIR"), "/client_hash.rs"));
|
include!(concat!(env!("OUT_DIR"), "/client_hash.rs"));
|
||||||
|
|
||||||
// use aes_gcm::{aead::OsRng, Aes256Gcm, KeyInit};
|
// use aes_gcm::{aead::OsRng, Aes256Gcm, KeyInit};
|
||||||
use common::{server, SOCKET_PATH};
|
use gpcommon::{server, SOCKET_PATH};
|
||||||
use env_logger::Env;
|
use env_logger::Env;
|
||||||
use log::error;
|
use log::error;
|
||||||
use tokio::signal;
|
use tokio::signal;
|
||||||
|
Loading…
Reference in New Issue
Block a user