Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Use namespaced strings for Transport IDs

Browse Source
This commit is contained in:
Torsten Grote
2016-11-17 17:06:26 -02:00
parent 37e61c97ea
commit e32313c30b
16 changed files with 71 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/org/briarproject/keyagreement/PayloadParserImpl.java
View File

@@ -9,6 +9,8 @@ import org.briarproject.api.keyagreement.Payload;
import org.briarproject.api.keyagreement.PayloadParser;
import org.briarproject.api.keyagreement.TransportDescriptor;
import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.plugins.BluetoothConstants;
import org.briarproject.api.plugins.TorConstants;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -55,10 +57,10 @@ class PayloadParserImpl implements PayloadParser {
BdfList descriptor = payload.getList(i);
long transportId = descriptor.getLong(0);
if (transportId == TRANSPORT_ID_BLUETOOTH) {
TransportId id = new TransportId("bt");
TransportId id = BluetoothConstants.ID;
recognised.add(new TransportDescriptor(id, descriptor));
} else if (transportId == TRANSPORT_ID_LAN) {
TransportId id = new TransportId("lan");
TransportId id = TorConstants.ID;
recognised.add(new TransportDescriptor(id, descriptor));
}
}

3
briar-core/src/org/briarproject/plugins/tcp/LanTcpPlugin.java
View File

@@ -33,14 +33,13 @@ import java.util.logging.Logger;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.api.keyagreement.KeyAgreementConstants.TRANSPORT_ID_LAN;
import static org.briarproject.api.plugins.LanTcpConstants.ID;
import static org.briarproject.util.ByteUtils.MAX_16_BIT_UNSIGNED;
import static org.briarproject.util.PrivacyUtils.scrubSocketAddress;
@NotNullByDefault
class LanTcpPlugin extends TcpPlugin {
static final TransportId ID = new TransportId("lan");
private static final Logger LOG =
Logger.getLogger(LanTcpPlugin.class.getName());

4
briar-core/src/org/briarproject/plugins/tcp/LanTcpPluginFactory.java
View File

@@ -9,6 +9,8 @@ import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import java.util.concurrent.Executor;
import static org.briarproject.api.plugins.LanTcpConstants.ID;
public class LanTcpPluginFactory implements DuplexPluginFactory {
private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
@@ -28,7 +30,7 @@ public class LanTcpPluginFactory implements DuplexPluginFactory {
@Override
public TransportId getId() {
return LanTcpPlugin.ID;
return ID;
}
@Override

4
briar-core/src/org/briarproject/plugins/tcp/WanTcpPlugin.java
View File

@@ -16,12 +16,12 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Executor;
import static org.briarproject.api.plugins.WanTcpConstants.ID;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
class WanTcpPlugin extends TcpPlugin {
static final TransportId ID = new TransportId("wan");
private static final String PROP_IP_PORT = "ipPort";
private final PortMapper portMapper;

4
briar-core/src/org/briarproject/plugins/tcp/WanTcpPluginFactory.java
View File

@@ -10,6 +10,8 @@ import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
import java.util.concurrent.Executor;
import static org.briarproject.api.plugins.WanTcpConstants.ID;
public class WanTcpPluginFactory implements DuplexPluginFactory {
private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
@@ -31,7 +33,7 @@ public class WanTcpPluginFactory implements DuplexPluginFactory {
@Override
public TransportId getId() {
return WanTcpPlugin.ID;
return ID;
}
@Override