IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2024-11-22 00:07:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to use the new geo2.bin file (which includes country as an ISO code, and separates country and city for easier analysis).

Browse Source
This commit is contained in:
Herbert Wolverson 2024-07-23 11:47:20 -05:00
parent 57bb09bc45
commit b851fab0a3
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/rust/lqosd/src/throughput_tracker/flow_data/flow_analysis/asn.rs
View File

@ -15,12 +15,23 @@ struct AsnEncoded {
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
struct GeoIpLocation { pub struct GeoIpLocation {
network: IpAddr, pub network: IpAddr,
prefix: u8, pub prefix: u8,
latitude: f64, pub latitude: f64,
longitude: f64, pub longitude: f64,
city_and_country: String, pub city: String,
pub country: String,
pub country_iso_code: String,
}
impl GeoIpLocation {
pub fn city_and_country(&self) -> String {
format!("{}, {}", self.city, self.country)
.trim_end_matches(',')
.trim()
.to_string()
}
} }
@ -36,7 +47,7 @@ pub struct GeoTable {
} }
impl GeoTable { impl GeoTable {
const FILENAME: &'static str = "geo.bin"; const FILENAME: &'static str = "geo2.bin";
fn file_path() -> std::path::PathBuf { fn file_path() -> std::path::PathBuf {
Path::new(&lqos_config::load_config().unwrap().lqos_directory) Path::new(&lqos_config::load_config().unwrap().lqos_directory)
@ -46,7 +57,7 @@ impl GeoTable {
fn download() -> anyhow::Result<()> { fn download() -> anyhow::Result<()> {
log::info!("Downloading ASN-IP Table"); log::info!("Downloading ASN-IP Table");
let file_path = Self::file_path(); let file_path = Self::file_path();
let url = "https://stats.libreqos.io/geo.bin"; let url = "https://stats.libreqos.io/geo2.bin";
let response = reqwest::blocking::get(url)?; let response = reqwest::blocking::get(url)?;
let content = response.bytes()?; let content = response.bytes()?;
let bytes = &content[0..]; let bytes = &content[0..];
@ -130,8 +141,8 @@ impl GeoTable {
owners = matched.1.organization.clone(); owners = matched.1.organization.clone();
} }
if let Some(matched) = self.geo_trie.longest_match(ip) { if let Some(matched) = self.geo_trie.longest_match(ip) {
log::debug!("Matched Geo: {:?}", matched.1.city_and_country); log::debug!("Matched Geo: {:?}", matched.1.city_and_country());
country = matched.1.city_and_country.clone(); country = matched.1.city_and_country();
} }
(owners, country) (owners, country)
@ -145,7 +156,7 @@ impl GeoTable {
}; };
if let Some(matched) = self.geo_trie.longest_match(ip) { if let Some(matched) = self.geo_trie.longest_match(ip) {
log::debug!("Matched Geo: {:?}", matched.1.city_and_country); log::debug!("Matched Geo: {:?}", matched.1.city_and_country());
return (matched.1.latitude, matched.1.longitude); return (matched.1.latitude, matched.1.longitude);
} }