Fixed IPv6 local host address

6 years ago · 645c843161
parent a4ab65cc50
commit 645c843161
1 changed files with 5 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@ -270,8 +270,11 @@ public class ServiceSend extends LifecycleService {
            InetAddress addr = InetAddress.getByName(ident.host);
            if (addr instanceof Inet4Address)
                haddr = "[" + Inet4Address.getLocalHost().getHostAddress() + "]";
-            else
-                haddr = "[IPv6:" + Inet6Address.getLocalHost().getHostAddress() + "]";
+            else {
+                // Inet6Address.getLocalHost() will return the IPv6 local host
+                byte[] LOOPBACK = new byte[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+                haddr = "[IPv6:" + Inet6Address.getByAddress("ip6-localhost", LOOPBACK, 0).getHostAddress() + "]";
+            }
        } else
            haddr = ident.host;