liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

fix regressions

Browse Source
This commit is contained in:
John Smith
2022-05-01 15:33:14 -04:00
parent a20b42aae1
commit 67de776c6d
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
veilid-core/src/intf/native/network/mod.rs
View File

@@ -454,6 +454,14 @@ impl Network {
// that we have ports available to us
self.free_bound_first_ports();
// If we have static public dialinfo, upgrade our network class
{
let mut inner = self.inner.lock();
if !inner.static_public_dialinfo.is_empty() {
inner.network_class = Some(NetworkClass::InboundCapable);
}
}
info!("network started");
self.inner.lock().network_started = true;
Ok(())

11
veilid-core/src/intf/native/protected_store.rs
View File

@@ -62,9 +62,14 @@ impl ProtectedStore {
{
let insecure_fallback_directory =
Path::new(&c.protected_store.insecure_fallback_directory);
let insecure_keyring_file = insecure_fallback_directory
.to_owned()
.join("insecure_keyring");
let insecure_keyring_file = insecure_fallback_directory.to_owned().join(format!(
"insecure_keyring{}",
if c.namespace.is_empty() {
"".to_owned()
} else {
format!("_{}", c.namespace)
}
));
inner.keyring_manager = Some(
KeyringManager::new_insecure(&c.program_name, &insecure_keyring_file)
.map_err(map_to_string)