mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Explicitly disable socket keep-alive

This commit is contained in:
M66B 2020-08-27 10:15:26 +02:00
parent cff6d1a8a2
commit 0cd4903f70
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/faircode/email/EmailService.java
View File

@ -38,6 +38,7 @@ import java.net.InetAddress;
import java.net.InterfaceAddress;
import java.net.NetworkInterface;
import java.net.Socket;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
@ -738,8 +739,8 @@ public class EmailService implements AutoCloseable {
return configure(factory.createSocket(address, port, localAddress, localPort));
}
private Socket configure(Socket socket) {
Log.i("Socket type=" + socket.getClass());
private Socket configure(Socket socket) throws SocketException {
configureSocketOptions(socket);
return socket;
}
}
@ -878,7 +879,9 @@ public class EmailService implements AutoCloseable {
throw new IOException("createSocket");
}
private Socket configure(Socket socket) {
private Socket configure(Socket socket) throws SocketException {
configureSocketOptions(socket);
if (socket instanceof SSLSocket) {
SSLSocket sslSocket = (SSLSocket) socket;
@ -1021,6 +1024,18 @@ public class EmailService implements AutoCloseable {
}
}
private static void configureSocketOptions(Socket socket) throws SocketException {
Log.i("Socket type=" + socket.getClass() +
" timeout=" + socket.getSoTimeout() +
" linger=" + socket.getSoLinger() +
" keepalive=" + socket.getKeepAlive());
if (socket.getKeepAlive()) {
Log.e("Socket keep-alive");
socket.setKeepAlive(false);
}
}
class UntrustedException extends MessagingException {
private String fingerprint;