Merge pull request #18 from Ma27/workaround-link-local-zone-ids

Strip link-local zone ids from IPv6 socket addrs
MindFlavor · Nov 8, 2019 · 90a1585 · 90a1585
2 parents 09aa62a + 9a54a8f
commit 90a1585
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,4 +26,4 @@ failure                  = "0.1.5"
 hyper                    = "0.12.29"
 http                     = "0.1.17"
 prometheus_exporter_base = "0.2.0"
-
+regex                    = "1.3.1"
diff --git a/src/wireguard.rs b/src/wireguard.rs
@@ -5,6 +5,7 @@ use prometheus_exporter_base::PrometheusCounter;
 use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::net::SocketAddr;
+use regex::Regex;
 
 const EMPTY: &str = "(none)";
 
@@ -77,7 +78,8 @@ impl TryFrom<&str> for WireGuard {
                 let public_key = v[1].to_owned();
 
                 let (remote_ip, remote_port) = if let Some(ip_and_port) = to_option_string(v[3]) {
-                    let addr: SocketAddr = ip_and_port.parse::<SocketAddr>().unwrap();
+                    let re = Regex::new(r"^\[(?P<ip>[A-Fa-f0-9:]+)%(.*)\]:(?P<port>[0-9]+)$").unwrap();
+                    let addr: SocketAddr = re.replace_all(&ip_and_port, "[$ip]:$port").parse::<SocketAddr>().unwrap();
 
                     (Some(addr.ip().to_string()), Some(addr.port()))
                 } else {