ProfessionalUwU/echoip-slatecave
1
0
Fork 0
mirror of https://codeberg.org/slatian/service.echoip-slatecave.git synced 2025-07-19 23:36:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use a PathBuf instead of a String for storing the mmdb locations

Browse Source
This commit is contained in:
Slatian
2025-04-11 21:49:36 +02:00
parent 34e5e8f95c
commit f01f6a886d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/config/mod.rs
View File

@ -3,6 +3,7 @@ use serde::Deserialize;
use std::net::SocketAddr;
use std::num::NonZeroU32;
use std::path::PathBuf;
mod dns;
@ -28,8 +29,8 @@ pub struct ServerConfig {
#[derive(Deserialize, Clone)]
pub struct GeoIpConfig {
pub asn_database: Option<String>,
pub location_database: Option<String>,
pub asn_database: Option<PathBuf>,
pub location_database: Option<PathBuf>,
}
#[derive(Deserialize, Clone)]
@ -59,8 +60,8 @@ impl Default for ServerConfig {
impl Default for GeoIpConfig {
fn default() -> Self {
GeoIpConfig {
asn_database: Some("mmdb/GeoLite2-ASN.mmdb".to_string()),
location_database: Some("mmdb/GeoLite2-City.mmdb".to_string()),
asn_database: Some("mmdb/GeoLite2-ASN.mmdb".into()),
location_database: Some("mmdb/GeoLite2-City.mmdb".into()),
}
}
}

7
src/geoip.rs
View File

@ -11,6 +11,7 @@ use parking_lot::RwLock;
use std::collections::BTreeMap;
use std::net::IpAddr;
use std::path::Path;
use std::path::PathBuf;
/* Datatypes */
@ -51,7 +52,7 @@ pub struct AsnResult {
pub struct MMDBCarrier {
pub mmdb: RwLock<Option<maxminddb::Reader<Vec<u8>>>>,
pub name: String,
pub path: Option<String>,
pub path: Option<PathBuf>,
}
pub trait QueryLocation {
@ -227,7 +228,7 @@ impl QueryLocation for MMDBCarrier {
}
impl MMDBCarrier {
pub fn new(name: String, path: Option<String>) -> MMDBCarrier {
pub fn new(name: String, path: Option<PathBuf>) -> MMDBCarrier {
MMDBCarrier {
mmdb: RwLock::new(None),
name: name,
@ -237,7 +238,7 @@ impl MMDBCarrier {
pub fn reload_database(&self) -> Result<(),maxminddb::MaxMindDbError> {
match &self.path {
Some(path) => self.load_database_from_path(Path::new(&path)),
Some(path) => self.load_database_from_path(path),
None => Ok(()),
}
}