From: Tobias Brunner Date: Mon, 8 Jul 2013 13:38:47 +0000 (+0200) Subject: android: Properly handle dotted-quad notation of IPv6 addresses X-Git-Tag: 5.1.0dr2~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ccf02ee933a0fb4faef26f21447588b7241e425;p=thirdparty%2Fstrongswan.git android: Properly handle dotted-quad notation of IPv6 addresses For nestat output like ::ffff:127.0.0.1:9876 we shall not treat 127 as port but 9876 instead. --- diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java b/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java index b6e740cad1..ed86686d80 100644 --- a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java +++ b/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java @@ -30,7 +30,7 @@ public class PortFilterCollector implements Collector { private static Pattern LISTEN = Pattern.compile("\\bLISTEN\\b"); private static Pattern PROTOCOL = Pattern.compile("\\b(tcp|udp)6?\\b"); - private static Pattern PORT = Pattern.compile("[:]{1,3}(\\d{1,5})\\b"); + private static Pattern PORT = Pattern.compile("[:]{1,3}(\\d{1,5})\\b(?!\\.)"); @Override public Attribute getMeasurement()