core
/
trifid
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 7 Releases Wiki Activity

bump crate versions & clean warnings

This commit is contained in:
core 2023-09-26 09:14:42 -04:00
parent babfc526ba
commit c077c828ac
Signed by: core
GPG Key ID: FDBF740DADDCEECF
8 changed files with 423 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

808
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

3
Cargo.toml
View File

@ -8,4 +8,5 @@ members = [
"dnapi-rs", "dnapi-rs",
"tfcli", "tfcli",
"nebula-ffi" "nebula-ffi"
] ]
resolver = "2"

2
dnapi-rs/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "dnapi-rs" name = "dnapi-rs"
version = "0.1.15" version = "0.2.0"
edition = "2021" edition = "2021"
description = "A rust client for the Defined Networking API" description = "A rust client for the Defined Networking API"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"

4
nebula-ffi/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "nebula-ffi" name = "nebula-ffi"
version = "0.1.4" version = "0.2.0"
edition = "2021" edition = "2021"
description = "A Rust wrapper crate for communicating with Nebula via a CGO FFI." description = "A Rust wrapper crate for communicating with Nebula via a CGO FFI."
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
@ -13,4 +13,4 @@ repository = "https://git.e3t.cc/~core/trifid"
[build-dependencies] [build-dependencies]
gobuild = "0.1.0-alpha.2" gobuild = "0.1.0-alpha.2"
bindgen = "0.66.1" bindgen = "0.68.1"

2
tfcli/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "tfcli" name = "tfcli"
version = "0.1.5" version = "0.2.0"
edition = "2021" edition = "2021"
description = "Command-line client for managing trifid-api" description = "Command-line client for managing trifid-api"
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"

5
tfcli/src/host.rs
View File

@ -145,6 +145,7 @@ pub struct HostGetResponse {
pub metadata: HostGetMetadata, pub metadata: HostGetMetadata,
} }
#[allow(clippy::too_many_arguments)]
pub async fn create_host(name: String, network_id: String, role_id: String, ip_address: Ipv4Addr, listen_port: Option<u16>, lighthouse: bool, relay: bool, static_address: Option<SocketAddrV4>, server: Url) -> Result<(), Box<dyn Error>> { pub async fn create_host(name: String, network_id: String, role_id: String, ip_address: Ipv4Addr, listen_port: Option<u16>, lighthouse: bool, relay: bool, static_address: Option<SocketAddrV4>, server: Url) -> Result<(), Box<dyn Error>> {
if lighthouse && relay { if lighthouse && relay {
eprintln!("[error] Error creating host: a host cannot be both a lighthouse and a relay at the same time"); eprintln!("[error] Error creating host: a host cannot be both a lighthouse and a relay at the same time");
@ -171,7 +172,7 @@ pub async fn create_host(name: String, network_id: String, role_id: String, ip_a
let token = format!("{} {}", session_token, auth_token); let token = format!("{} {}", session_token, auth_token);
let res = client.post(server.join(&format!("/v1/hosts"))?).json(&HostCreateBody { let res = client.post(server.join("/v1/hosts")?).json(&HostCreateBody {
name, name,
network_id, network_id,
role_id, role_id,
@ -305,7 +306,7 @@ pub async fn update_host(id: String, listen_port: Option<u16>, static_address: O
let res = client.put(server.join(&format!("/v1/hosts/{}?extension=extended_hosts", id))?).json(&HostUpdateBody { let res = client.put(server.join(&format!("/v1/hosts/{}?extension=extended_hosts", id))?).json(&HostUpdateBody {
listen_port: listen_port.unwrap_or(0), listen_port: listen_port.unwrap_or(0),
static_addresses: static_address.map_or_else(|| vec![], |u| vec![u]), static_addresses: static_address.map_or_else(Vec::new, |u| vec![u]),
name, name,
ip, ip,
role role

8
tfclient/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "tfclient" name = "tfclient"
version = "0.2.4" version = "0.2.5"
edition = "2021" edition = "2021"
description = "An open-source reimplementation of a Defined Networking-compatible client" description = "An open-source reimplementation of a Defined Networking-compatible client"
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
@ -19,7 +19,7 @@ simple_logger = "4.1"
sha2 = "0.10" sha2 = "0.10"
hex = "0.4" hex = "0.4"
url = "2.3" url = "2.3"
toml = "0.7" toml = "0.8.0"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
ctrlc = "3.2" ctrlc = "3.2"
@ -28,9 +28,9 @@ base64 = "0.21"
chrono = "0.4" chrono = "0.4"
ipnet = "2.7" ipnet = "2.7"
base64-serde = "0.7" base64-serde = "0.7"
dnapi-rs = { version = "0.1", path = "../dnapi-rs" } dnapi-rs = { version = "0.2", path = "../dnapi-rs" }
serde_yaml = "0.9" serde_yaml = "0.9"
nebula-ffi = { version = "0.1", path = "../nebula-ffi", optional = true } nebula-ffi = { version = "0.2", path = "../nebula-ffi", optional = true }
[package.metadata.deb] [package.metadata.deb]
maintainer = "c0repwn3r <core@e3t.cc>" maintainer = "c0repwn3r <core@e3t.cc>"
copyright = "e3team <admin@e3t.cc>" copyright = "e3team <admin@e3t.cc>"

8
trifid-api/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "trifid-api" name = "trifid-api"
version = "0.1.5" version = "0.2.0"
edition = "2021" edition = "2021"
description = "Pure-rust Defined Networking compatible management server" description = "Pure-rust Defined Networking compatible management server"
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
@ -19,7 +19,7 @@ serde = { version = "1", features = ["derive"] } # Serialization and deserial
serde_json = "1.0.95" # Serialization and deserialization (cursors) serde_json = "1.0.95" # Serialization and deserialization (cursors)
once_cell = "1" # Config once_cell = "1" # Config
toml = "0.7" # Config / Serialization and deserialization toml = "0.8" # Config / Serialization and deserialization
serde_yaml = "0.9.21" # Config / Serialization and deserialization serde_yaml = "0.9.21" # Config / Serialization and deserialization
log = "0.4" # Logging log = "0.4" # Logging
@ -36,9 +36,9 @@ base64 = "0.21.0" # Misc.
chrono = "0.4.24" # Misc. chrono = "0.4.24" # Misc.
derivative = "2.2.0" # Misc. derivative = "2.2.0" # Misc.
trifid-pki = { version = "0.1.9", features = ["serde_derive"] } # Cryptography trifid-pki = { version = "0.1", features = ["serde_derive"] } # Cryptography
aes-gcm = "0.10.1" # Cryptography aes-gcm = "0.10.1" # Cryptography
ed25519-dalek = "2.0.0-rc.2" # Cryptography ed25519-dalek = "2.0.0-rc.2" # Cryptography
dnapi-rs = { version = "0.1", path = "../dnapi-rs" } # API message types dnapi-rs = { version = "0.2", path = "../dnapi-rs" } # API message types
ipnet = "2.7.2" # API message types ipnet = "2.7.2" # API message types