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

Plugins don't need their own copies of configs and properties.

Browse Source
This commit is contained in:
akwizgran
2011-10-12 16:52:39 +01:00
parent 631f4e74b5
commit 3a07d1b882
14 changed files with 226 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java
View File

@@ -39,23 +39,36 @@ class SimpleSocketPlugin extends SocketPlugin {
}
@Override
protected SocketAddress getLocalSocketAddress() {
protected Socket createClientSocket() throws IOException {
assert started;
return createSocketAddress(localProperties);
return new Socket();
}
@Override
protected SocketAddress getSocketAddress(ContactId c) {
protected ServerSocket createServerSocket() throws IOException {
assert started;
TransportProperties properties = remoteProperties.get(c);
if(properties == null) return null;
return createSocketAddress(properties);
return new ServerSocket();
}
private SocketAddress createSocketAddress(TransportProperties properties) {
assert properties != null;
String host = properties.get("host");
String portString = properties.get("port");
@Override
protected synchronized SocketAddress getLocalSocketAddress() {
assert started;
return createSocketAddress(callback.getLocalProperties());
}
@Override
protected synchronized SocketAddress getRemoteSocketAddress(ContactId c) {
assert started;
TransportProperties p = callback.getRemoteProperties().get(c);
return p == null ? null : createSocketAddress(p);
}
private synchronized SocketAddress createSocketAddress(
TransportProperties p) {
assert started;
assert p != null;
String host = p.get("host");
String portString = p.get("port");
if(host == null || portString == null) return null;
int port;
try {
@@ -67,32 +80,17 @@ class SimpleSocketPlugin extends SocketPlugin {
}
@Override
protected void setLocalSocketAddress(SocketAddress s) {
TransportProperties p;
synchronized(this) {
if(!started) return;
p = new TransportProperties(localProperties);
}
protected synchronized void setLocalSocketAddress(SocketAddress s) {
assert started;
if(!(s instanceof InetSocketAddress))
throw new IllegalArgumentException();
InetSocketAddress i = (InetSocketAddress) s;
String host = i.getAddress().getHostAddress();
String port = String.valueOf(i.getPort());
// FIXME: Special handling for private IP addresses?
TransportProperties p = callback.getLocalProperties();
p.put("host", host);
p.put("port", port);
callback.setLocalProperties(p);
}
@Override
protected Socket createClientSocket() throws IOException {
assert started;
return new Socket();
}
@Override
protected ServerSocket createServerSocket() throws IOException {
assert started;
return new ServerSocket();
}
}