Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

use btreemap instead of indexmap

Browse Source 
to establish canonical lock ordering
This commit is contained in:
Aiden McClelland
2021-09-27 17:19:58 -06:00
committed by Aiden McClelland
parent a28f6ca5e2
commit 1a86f393d6
22 changed files with 228 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
appmgr/src/net/interface.rs
View File

@@ -1,9 +1,9 @@
use std::collections::HashMap;
use std::collections::{BTreeMap, HashMap};
use std::path::Path;
use anyhow::anyhow;
use futures::TryStreamExt;
use indexmap::{IndexMap, IndexSet};
use indexmap::IndexSet;
use itertools::Either;
use serde::{Deserialize, Deserializer, Serialize};
use sqlx::{Executor, Sqlite};
@@ -17,7 +17,7 @@ use crate::Error;
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "kebab-case")]
pub struct Interfaces(pub IndexMap<InterfaceId, Interface>); // TODO
pub struct Interfaces(pub BTreeMap<InterfaceId, Interface>); // TODO
impl Interfaces {
pub async fn install<Ex>(
&self,
@@ -27,7 +27,7 @@ impl Interfaces {
where
for<'a> &'a mut Ex: Executor<'a, Database = Sqlite>,
{
let mut interface_addresses = InterfaceAddressMap(IndexMap::new());
let mut interface_addresses = InterfaceAddressMap(BTreeMap::new());
for (id, iface) in &self.0 {
let mut addrs = InterfaceAddresses {
tor_address: None,
@@ -101,7 +101,7 @@ impl Interfaces {
}
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize)]
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize)]
pub struct InterfaceId<S: AsRef<str> = String>(Id<S>);
impl<S: AsRef<str>> From<Id<S>> for InterfaceId<S> {
fn from(id: Id<S>) -> Self {
@@ -148,7 +148,7 @@ pub struct Interface {
pub name: String,
pub description: String,
pub tor_config: Option<TorConfig>,
pub lan_config: Option<IndexMap<Port, LanPortConfig>>,
pub lan_config: Option<BTreeMap<Port, LanPortConfig>>,
pub ui: bool,
pub protocols: IndexSet<String>,
}
@@ -156,7 +156,7 @@ pub struct Interface {
#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
#[serde(rename_all = "kebab-case")]
pub struct TorConfig {
pub port_mapping: IndexMap<Port, Port>,
pub port_mapping: BTreeMap<Port, Port>,
}
#[derive(Clone, Debug, Deserialize, Serialize)]

6
appmgr/src/net/nginx.rs
View File

@@ -1,9 +1,9 @@
use std::collections::HashMap;
use std::collections::{BTreeMap, HashMap};
use std::net::Ipv4Addr;
use std::path::PathBuf;
use futures::FutureExt;
use indexmap::{IndexMap, IndexSet};
use indexmap::IndexSet;
use sqlx::SqlitePool;
use tokio::sync::Mutex;
@@ -201,6 +201,6 @@ struct PackageNetInfo {
}
pub struct InterfaceMetadata {
pub dns_base: String,
pub lan_config: IndexMap<Port, LanPortConfig>,
pub lan_config: BTreeMap<Port, LanPortConfig>,
pub protocols: IndexSet<String>,
}