Merge branch 'bluetooth-race' into 'master'
Fix race condition when closing redundant Bluetooth sockets The Bluetooth invitation code has a race condition: if Alice and Bob connect to each other at roughly the same time, they each consider their outgoing socket to be redundant and close it, resulting in both sockets being closed. This can be triggered pretty reliably by using two phones of the same model and pressing 'Continue' at the same time on both phones. When more than one invitation socket is opened, Alice should pick which one to use and Bob should use whichever one Alice picks, which Bob can detect by trying to read from both sockets. Hopefully the Bluetooth invitation code will be retired when #117 is merged, but I'm putting this up for review in case we need to keep Bluetooth as a fallback method. See merge request !120
No related branches found
No related tags found
Showing
- briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPlugin.java 101 additions, 71 deletions...org/briarproject/plugins/droidtooth/DroidtoothPlugin.java
- briar-android/src/org/briarproject/plugins/droidtooth/DroidtoothPluginFactory.java 1 addition, 5 deletions...arproject/plugins/droidtooth/DroidtoothPluginFactory.java
- briar-android/src/org/briarproject/plugins/tor/TorPlugin.java 1 addition, 1 deletion...r-android/src/org/briarproject/plugins/tor/TorPlugin.java
- briar-api/src/org/briarproject/api/plugins/duplex/DuplexPlugin.java 1 addition, 1 deletion...src/org/briarproject/api/plugins/duplex/DuplexPlugin.java
- briar-core/src/org/briarproject/invitation/AliceConnector.java 1 addition, 1 deletion...-core/src/org/briarproject/invitation/AliceConnector.java
- briar-core/src/org/briarproject/invitation/BobConnector.java 1 addition, 1 deletionbriar-core/src/org/briarproject/invitation/BobConnector.java
- briar-core/src/org/briarproject/invitation/Connector.java 4 additions, 2 deletionsbriar-core/src/org/briarproject/invitation/Connector.java
- briar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java 1 addition, 1 deletionbriar-core/src/org/briarproject/plugins/tcp/TcpPlugin.java
- briar-core/src/org/briarproject/util/LatchedReference.java 0 additions, 30 deletionsbriar-core/src/org/briarproject/util/LatchedReference.java
- briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPlugin.java 106 additions, 75 deletions...c/org/briarproject/plugins/bluetooth/BluetoothPlugin.java
- briar-desktop/src/org/briarproject/plugins/bluetooth/BluetoothPluginFactory.java 2 additions, 6 deletions...riarproject/plugins/bluetooth/BluetoothPluginFactory.java
- briar-desktop/src/org/briarproject/plugins/modem/ModemPlugin.java 1 addition, 1 deletion...sktop/src/org/briarproject/plugins/modem/ModemPlugin.java
- briar-tests/src/org/briarproject/plugins/DuplexClientTest.java 0 additions, 111 deletions...-tests/src/org/briarproject/plugins/DuplexClientTest.java
- briar-tests/src/org/briarproject/plugins/DuplexServerTest.java 0 additions, 114 deletions...-tests/src/org/briarproject/plugins/DuplexServerTest.java
- briar-tests/src/org/briarproject/plugins/DuplexTest.java 0 additions, 102 deletionsbriar-tests/src/org/briarproject/plugins/DuplexTest.java
Loading
Please register or sign in to comment