From 850ad18a36b916d46fbda8f91db247ba9c947420 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 15 Jan 2020 17:40:20 +0000 Subject: [PATCH] Check that server sockets are closed as expected. --- .../briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java | 2 +- .../bramble/plugin/bluetooth/BluetoothPlugin.java | 4 ---- .../java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java | 1 - .../java/org/briarproject/bramble/plugin/tor/TorPlugin.java | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java index 00ea54c03..3df2d1721 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java @@ -154,7 +154,7 @@ class AndroidLanTcpPlugin extends LanTcpPlugin implements EventListener { } else if (addrs.isEmpty()) { LOG.info("Not connected to wifi"); socketFactory = SocketFactory.getDefault(); - // TODO: Check that socket was closed when interface went down + // Server socket was closed when wifi interface went down } else { LOG.info("Connected to wifi"); socketFactory = getSocketFactory(); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java index 8df0d40f6..79e86584f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java @@ -132,9 +132,6 @@ abstract class BluetoothPlugin implements DuplexPlugin, EventListener { void onAdapterDisabled() { LOG.info("Bluetooth disabled"); - // TODO: Is this needed, or will the socket be closed automatically? - SS ss = state.clearServerSocket(); - tryToClose(ss); connectionLimiter.allConnectionsClosed(); callback.pluginStateChanged(getState()); } @@ -237,7 +234,6 @@ abstract class BluetoothPlugin implements DuplexPlugin, EventListener { conn = acceptConnection(ss); } catch (IOException e) { // This is expected when the socket is closed - // TODO: Check that this is logged at shutdown/when BT disabled LOG.info("Server socket closed"); state.clearServerSocket(); return; diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java index 85bd9e468..ca99a745f 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java @@ -174,7 +174,6 @@ abstract class TcpPlugin implements DuplexPlugin { s.setSoTimeout(socketTimeout); } catch (IOException e) { // This is expected when the server socket is closed - // TODO: Check that this is logged at shutdown/when LAN disabled LOG.info("Server socket closed"); state.clearServerSocket(ss); callback.pluginStateChanged(getState()); diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java index d973075f0..0ffa6ead9 100644 --- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java +++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java @@ -463,7 +463,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener { s.setSoTimeout(socketTimeout); } catch (IOException e) { // This is expected when the server socket is closed - // TODO: Check that this is logged at shutdown LOG.info("Server socket closed"); state.clearServerSocket(ss); return;