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

Plugin refactoring.

Browse Source
This commit is contained in:
akwizgran
2011-10-07 13:17:13 +01:00
parent a37186d574
commit ea6beac011
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,14 @@ implements StreamTransportPlugin {
return;
}
synchronized(this) {
if(!started) return;
if(!started) {
try {
ss.close();
} catch(IOException e) {
// FIXME: Logging
}
return;
}
socket = ss;
setLocalSocketAddress(ss.getLocalSocketAddress());
startListener();
@@ -151,13 +158,13 @@ implements StreamTransportPlugin {
private Runnable createConnector(final ContactId c) {
return new Runnable() {
public void run() {
connect(c);
connectAndCallBack(c);
}
};
}
private void connect(ContactId c) {
StreamTransportConnection conn = createAndConnectSocket(c);
private void connectAndCallBack(ContactId c) {
StreamTransportConnection conn = createConnection(c);
if(conn != null) {
synchronized(this) {
if(started) callback.outgoingConnectionCreated(c, conn);
@@ -165,7 +172,7 @@ implements StreamTransportPlugin {
}
}
private StreamTransportConnection createAndConnectSocket(ContactId c) {
public StreamTransportConnection createConnection(ContactId c) {
SocketAddress addr;
Socket s;
try {
@@ -181,11 +188,4 @@ implements StreamTransportPlugin {
}
return new SocketTransportConnection(s);
}
public StreamTransportConnection createConnection(ContactId c) {
synchronized(this) {
if(!started) return null;
}
return createAndConnectSocket(c);
}
}