|
|
@ -417,19 +417,21 @@ public class EmailService implements AutoCloseable {
|
|
|
|
if (iaddr.equals(main))
|
|
|
|
if (iaddr.equals(main))
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
if (!vpn) {
|
|
|
|
|
|
|
|
if (iaddr instanceof Inet4Address) {
|
|
|
|
if (iaddr instanceof Inet4Address) {
|
|
|
|
if (ip4 || !has4)
|
|
|
|
if (!has4)
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!vpn && ip4)
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
ip4 = true;
|
|
|
|
ip4 = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (iaddr instanceof Inet6Address) {
|
|
|
|
if (iaddr instanceof Inet6Address) {
|
|
|
|
if (ip6 || !has6)
|
|
|
|
if (!has6)
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!vpn && ip6)
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
ip6 = true;
|
|
|
|
ip6 = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
EntityLog.log(context, "Falling back to " + iaddr.getHostAddress());
|
|
|
|
EntityLog.log(context, "Falling back to " + iaddr.getHostAddress());
|
|
|
|