Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Transport properties client. #229

Browse Source
This commit is contained in:
akwizgran
2016-01-22 11:32:39 +00:00
parent baa580c6f4
commit 88475bdd54
66 changed files with 748 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-api/src/org/briarproject/api/StringMap.java
View File

@@ -3,7 +3,7 @@ package org.briarproject.api;
import java.util.Hashtable;
import java.util.Map;
abstract class StringMap extends Hashtable<String, String> {
public abstract class StringMap extends Hashtable<String, String> {
private static final long serialVersionUID = 2497176435908100448L;

8
briar-api/src/org/briarproject/api/TransportId.java
View File

@@ -1,12 +1,13 @@
package org.briarproject.api;
import static org.briarproject.api.TransportPropertyConstants.MAX_TRANSPORT_ID_LENGTH;
/**
* Type-safe wrapper for a string that uniquely identifies a transport plugin.
*/
public class TransportId {
/** The maximum length of transport identifier in UTF-8 bytes. */
public static int MAX_TRANSPORT_ID_LENGTH = 10;
private final String id;
public TransportId(String id) {
@@ -21,8 +22,7 @@ public class TransportId {
@Override
public boolean equals(Object o) {
if (o instanceof TransportId) return id.equals(((TransportId) o).id);
return false;
return o instanceof TransportId && id.equals(((TransportId) o).id);
}
@Override

2
briar-api/src/org/briarproject/api/db/DatabaseComponent.java
View File

@@ -1,12 +1,12 @@
package org.briarproject.api.db;
import org.briarproject.api.Settings;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorId;
import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.api.settings.Settings;
import org.briarproject.api.sync.Ack;
import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.Group;

9
briar-api/src/org/briarproject/api/event/LocalTransportsUpdatedEvent.java
View File

@@ -1,9 +0,0 @@
package org.briarproject.api.event;
/**
* An event that is broadcast when the local transport properties are
* updated.
*/
public class LocalTransportsUpdatedEvent extends Event {
}

28
briar-api/src/org/briarproject/api/event/RemoteTransportsUpdatedEvent.java
View File

@@ -1,28 +0,0 @@
package org.briarproject.api.event;
import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
/**
* An event that is broadcast when a contact's remote transport properties
* are updated.
*/
public class RemoteTransportsUpdatedEvent extends Event {
private final ContactId contactId;
private final TransportId transportId;
public RemoteTransportsUpdatedEvent(ContactId contactId,
TransportId transportId) {
this.contactId = contactId;
this.transportId = transportId;
}
public ContactId getContactId() {
return contactId;
}
public TransportId getTransportId() {
return transportId;
}
}

2
briar-api/src/org/briarproject/api/invitation/InvitationTaskFactory.java
View File

@@ -7,5 +7,5 @@ public interface InvitationTaskFactory {
/** Creates a task using the given pseudonym and invitation codes. */
InvitationTask createTask(AuthorId localAuthorId, int localCode,
int remoteCode, boolean reuseConnection);
int remoteCode);
}

4
briar-api/src/org/briarproject/api/plugins/PluginCallback.java
View File

@@ -1,8 +1,8 @@
package org.briarproject.api.plugins;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.Settings;
import org.briarproject.api.properties.TransportProperties;
import org.briarproject.api.settings.Settings;
import java.util.Map;

4
briar-api/src/org/briarproject/api/TransportProperties.java → briar-api/src/org/briarproject/api/properties/TransportProperties.java
View File

@@ -1,4 +1,6 @@
package org.briarproject.api;
package org.briarproject.api.properties;
import org.briarproject.api.StringMap;
import java.util.Map;

8
briar-api/src/org/briarproject/api/TransportPropertyConstants.java → briar-api/src/org/briarproject/api/properties/TransportPropertyConstants.java
View File

@@ -1,13 +1,7 @@
package org.briarproject.api;
package org.briarproject.api.properties;
public interface TransportPropertyConstants {
/**
* The maximum length of a string that uniquely identifies a transport
* plugin.
*/
int MAX_TRANSPORT_ID_LENGTH = 10;
/** The maximum number of properties per transport. */
int MAX_PROPERTIES_PER_TRANSPORT = 100;

10
briar-api/src/org/briarproject/api/property/TransportPropertyManager.java → briar-api/src/org/briarproject/api/properties/TransportPropertyManager.java
View File

@@ -1,7 +1,6 @@
package org.briarproject.api.property;
package org.briarproject.api.properties;
import org.briarproject.api.TransportId;
import org.briarproject.api.TransportProperties;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.db.DbException;
@@ -26,11 +25,4 @@ public interface TransportPropertyManager {
*/
void mergeLocalProperties(TransportId t, TransportProperties p)
throws DbException;
/**
* Sets the remote transport properties for the given contact, replacing
* any existing properties.
*/
void setRemoteProperties(ContactId c,
Map<TransportId, TransportProperties> p) throws DbException;
}

4
briar-api/src/org/briarproject/api/Settings.java → briar-api/src/org/briarproject/api/settings/Settings.java
View File

@@ -1,4 +1,6 @@
package org.briarproject.api;
package org.briarproject.api.settings;
import org.briarproject.api.StringMap;
public class Settings extends StringMap {

1
briar-api/src/org/briarproject/api/settings/SettingsManager.java
View File

@@ -1,6 +1,5 @@
package org.briarproject.api.settings;
import org.briarproject.api.Settings;
import org.briarproject.api.db.DbException;
public interface SettingsManager {

6
briar-api/src/org/briarproject/api/transport/KeyManager.java
View File

@@ -4,8 +4,6 @@ import org.briarproject.api.TransportId;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.crypto.SecretKey;
import java.util.Collection;
/**
* Responsible for managing transport keys and recognising the pseudo-random
* tags of incoming streams.
@@ -18,8 +16,8 @@ public interface KeyManager {
* {@link StreamContext StreamContexts} for the contact can be created
* after this method has returned.
*/
void addContact(ContactId c, Collection<TransportId> transports,
SecretKey master, long timestamp, boolean alice);
void addContact(ContactId c, SecretKey master, long timestamp,
boolean alice);
/**
* Returns a {@link StreamContext} for sending a stream to the given