void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-08 21:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP it good

Browse source
This commit is contained in:
Adam Ierymenko 2022-09-21 16:58:06 -04:00
parent 768ec6e710
commit dca7bb8e85
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
controller/src/controller.rs
View file

@ -109,25 +109,25 @@ impl<DatabaseImpl: Database> InnerProtocol for Controller<DatabaseImpl> {
fn handle_error<HostSystemImpl: HostSystem>( fn handle_error<HostSystemImpl: HostSystem>(
&self, &self,
source: &Arc<Peer<HostSystemImpl>>, _source: &Arc<Peer<HostSystemImpl>>,
source_path: &Arc<Path<HostSystemImpl>>, _source_path: &Arc<Path<HostSystemImpl>>,
in_re_verb: u8, _in_re_verb: u8,
in_re_message_id: u64, _in_re_message_id: u64,
error_code: u8, _error_code: u8,
payload: &PacketBuffer, _payload: &PacketBuffer,
cursor: &mut usize, _cursor: &mut usize,
) -> PacketHandlerResult { ) -> PacketHandlerResult {
PacketHandlerResult::NotHandled PacketHandlerResult::NotHandled
} }
fn handle_ok<HostSystemImpl: HostSystem>( fn handle_ok<HostSystemImpl: HostSystem>(
&self, &self,
source: &Arc<Peer<HostSystemImpl>>, _source: &Arc<Peer<HostSystemImpl>>,
source_path: &Arc<Path<HostSystemImpl>>, _source_path: &Arc<Path<HostSystemImpl>>,
in_re_verb: u8, _in_re_verb: u8,
in_re_message_id: u64, _in_re_message_id: u64,
payload: &PacketBuffer, _payload: &PacketBuffer,
cursor: &mut usize, _cursor: &mut usize,
) -> PacketHandlerResult { ) -> PacketHandlerResult {
PacketHandlerResult::NotHandled PacketHandlerResult::NotHandled
} }

13
service/src/datadir.rs
View file

@ -1,11 +1,10 @@
// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. // (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md.
use std::path::{Path, PathBuf};
use std::str::FromStr;
use std::sync::Arc;
use crate::localconfig::Config; use crate::localconfig::Config;
use crate::utils::{read_limit, DEFAULT_FILE_IO_READ_LIMIT}; use crate::utils::{read_limit, DEFAULT_FILE_IO_READ_LIMIT};
use std::path::{Path, PathBuf};
use std::str::FromStr;
use std::sync::Arc;
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
@ -46,7 +45,8 @@ impl NodeStorage for DataDir {
} }
fn save_node_identity(&self, id: &Identity) { fn save_node_identity(&self, id: &Identity) {
tokio::runtime::Handle::current().block_on(async { /*
tokio::runtime::Handle::current().spawn(async move {
assert!(id.secret.is_some()); assert!(id.secret.is_some());
let id_secret_str = id.to_secret_string(); let id_secret_str = id.to_secret_string();
let id_public_str = id.to_string(); let id_public_str = id.to_string();
@ -55,7 +55,8 @@ impl NodeStorage for DataDir {
let _ = tokio::fs::write(&secret_path, id_secret_str.as_bytes()).await; let _ = tokio::fs::write(&secret_path, id_secret_str.as_bytes()).await;
assert!(crate::utils::fs_restrict_permissions(&secret_path)); assert!(crate::utils::fs_restrict_permissions(&secret_path));
let _ = tokio::fs::write(self.base_path.join(IDENTITY_PUBLIC_FILENAME), id_public_str.as_bytes()).await; let _ = tokio::fs::write(self.base_path.join(IDENTITY_PUBLIC_FILENAME), id_public_str.as_bytes()).await;
}) });
*/
} }
} }