Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Always call the callback outside the plugin's lock.

Browse Source
This commit is contained in:
akwizgran
2011-10-08 13:13:28 +01:00
parent 50e5c51d77
commit 125ae1b640
5 changed files with 38 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/net/sf/briar/plugins/socket/SocketPlugin.java
View File

@@ -26,10 +26,11 @@ implements StreamTransportPlugin {
// This field should be accessed with this's lock held
protected ServerSocket socket = null;
protected abstract void setLocalSocketAddress(SocketAddress s);
// These methods should be called with this's lock held and started == true
protected abstract SocketAddress getLocalSocketAddress();
protected abstract SocketAddress getSocketAddress(ContactId c);
protected abstract void setLocalSocketAddress(SocketAddress s);
protected abstract Socket createClientSocket() throws IOException;
protected abstract ServerSocket createServerSocket() throws IOException;
@@ -104,8 +105,7 @@ implements StreamTransportPlugin {
ServerSocket ss;
Socket s;
synchronized(this) {
if(!started) return;
if(socket == null) return;
if(!started || socket == null) return;
ss = socket;
}
try {
@@ -114,20 +114,8 @@ implements StreamTransportPlugin {
if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage());
return;
}
synchronized(this) {
if(!started) {
try {
s.close();
} catch(IOException e) {
if(LOG.isLoggable(Level.WARNING))
LOG.warning(e.getMessage());
}
return;
}
SocketTransportConnection conn =
new SocketTransportConnection(s);
callback.incomingConnectionCreated(conn);
}
SocketTransportConnection conn = new SocketTransportConnection(s);
callback.incomingConnectionCreated(conn);
}
}
@@ -179,11 +167,7 @@ implements StreamTransportPlugin {
private void connectAndCallBack(ContactId c) {
StreamTransportConnection conn = createConnection(c);
if(conn != null) {
synchronized(this) {
if(started) callback.outgoingConnectionCreated(c, conn);
}
}
if(conn != null) callback.outgoingConnectionCreated(c, conn);
}
public StreamTransportConnection createConnection(ContactId c) {