simono41/prometheus_wireguard_exporter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Parse strings using std::net to support peers with IPv6 addresses

Browse source 
Also alter datatype for ports to `u16` as tcp port numbers are unsigned
16bit integers.
This commit is contained in:
Maximilian Bosch 2019-06-02 22:06:27 +02:00
parent b9f0357f99
commit 1b4a7a2df1
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/wireguard.rs
View file

@ -4,6 +4,7 @@ use crate::wireguard_config::PeerEntryHashMap;
use log::{debug, trace}; use log::{debug, trace};
use std::collections::HashMap; use std::collections::HashMap;
use std::convert::TryFrom; use std::convert::TryFrom;
use std::net::SocketAddr;
const EMPTY: &str = "(none)"; const EMPTY: &str = "(none)";
@ -11,7 +12,7 @@ const EMPTY: &str = "(none)";
pub(crate) struct LocalEndpoint { pub(crate) struct LocalEndpoint {
pub public_key: String, pub public_key: String,
pub private_key: String, pub private_key: String,
pub local_port: u32, pub local_port: u16,
pub persistent_keepalive: bool, pub persistent_keepalive: bool,
} }
@ -19,7 +20,7 @@ pub(crate) struct LocalEndpoint {
pub(crate) struct RemoteEndpoint { pub(crate) struct RemoteEndpoint {
pub public_key: String, pub public_key: String,
pub remote_ip: Option<String>, pub remote_ip: Option<String>,
pub remote_port: Option<u32>, pub remote_port: Option<u16>,
pub local_ip: String, pub local_ip: String,
pub local_subnet: String, pub local_subnet: String,
pub latest_handshake: u64, pub latest_handshake: u64,
@ -69,7 +70,7 @@ impl TryFrom<&str> for WireGuard {
Endpoint::Local(LocalEndpoint { Endpoint::Local(LocalEndpoint {
public_key: v[1].to_owned(), public_key: v[1].to_owned(),
private_key: v[2].to_owned(), private_key: v[2].to_owned(),
local_port: v[3].parse::<u32>().unwrap(), local_port: v[3].parse::<u16>().unwrap(),
persistent_keepalive: to_bool(v[4]), persistent_keepalive: to_bool(v[4]),
}) })
} else { } else {
@ -77,10 +78,11 @@ impl TryFrom<&str> for WireGuard {
let public_key = v[1].to_owned(); let public_key = v[1].to_owned();
let (remote_ip, remote_port) = if let Some(ip_and_port) = to_option_string(v[3]) { let (remote_ip, remote_port) = if let Some(ip_and_port) = to_option_string(v[3]) {
let toks: Vec<&str> = ip_and_port.split(':').collect(); let addr: SocketAddr = ip_and_port.parse::<SocketAddr>().unwrap();
( (
Some(toks[0].to_owned()), Some(addr.ip().to_string()),
Some(toks[1].parse::<u32>().unwrap()), Some(addr.port()),
) )
} else { } else {
(None, None) (None, None)