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

bugfix

This commit is contained in:
core 2023-03-30 20:28:13 -04:00
parent 77a63ee7f4
commit 5f6c596a12
Signed by: core
GPG Key ID: FDBF740DADDCEECF
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2480,7 +2480,7 @@ dependencies = [
[[package]] [[package]]
name = "tfclient" name = "tfclient"
version = "0.1.3" version = "0.1.4"
dependencies = [ dependencies = [
"base64 0.21.0", "base64 0.21.0",
"base64-serde", "base64-serde",

2
tfclient/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "tfclient" name = "tfclient"
version = "0.1.3" version = "0.1.4"
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"

14
tfclient/src/daemon.rs
View File

@ -94,6 +94,14 @@ pub fn daemon_main(name: String, server: String) {
nebulaworker_main(config_nebula, name_nebula, transmitter_nebula, rx_nebula); nebulaworker_main(config_nebula, name_nebula, transmitter_nebula, rx_nebula);
}); });
info!("Starting socket worker thread...");
let name_socket = name.clone();
let config_socket = config.clone();
let tx_socket = transmitter.clone();
let socket_thread = thread::spawn(move || {
socketworker_main(config_socket, name_socket, tx_socket, rx_socket);
});
info!("Starting timer thread..."); info!("Starting timer thread...");
if !config.disable_automatic_config_updates { if !config.disable_automatic_config_updates {
let timer_transmitter = transmitter.clone(); let timer_transmitter = transmitter.clone();
@ -113,12 +121,6 @@ pub fn daemon_main(name: String, server: String) {
info!("automatic config updates have been disabled - not starting timer thread"); info!("automatic config updates have been disabled - not starting timer thread");
} }
info!("Starting socket worker thread...");
let name_socket = name.clone();
let socket_thread = thread::spawn(move || {
socketworker_main(config, name_socket, transmitter, rx_socket);
});
info!("Waiting for socket thread to exit..."); info!("Waiting for socket thread to exit...");
match socket_thread.join() { match socket_thread.join() {
Ok(_) => (), Ok(_) => (),