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

Use new client helper methods for transport properties.

Browse Source
This commit is contained in:
akwizgran
2018-04-29 17:21:38 +01:00
parent c3e4742bfe
commit 30bfa91fc4
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java
View File

@@ -37,9 +37,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
@@ -47,7 +45,6 @@ import javax.inject.Inject;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.api.contact.RecordTypes.CONTACT_INFO; import static org.briarproject.bramble.api.contact.RecordTypes.CONTACT_INFO;
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH; import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
import static org.briarproject.bramble.api.plugin.TransportId.MAX_TRANSPORT_ID_LENGTH;
import static org.briarproject.bramble.util.ValidationUtils.checkLength; import static org.briarproject.bramble.util.ValidationUtils.checkLength;
import static org.briarproject.bramble.util.ValidationUtils.checkSize; import static org.briarproject.bramble.util.ValidationUtils.checkSize;
@@ -256,9 +253,7 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
Map<TransportId, TransportProperties> properties, byte[] signature, Map<TransportId, TransportProperties> properties, byte[] signature,
long timestamp) throws IOException { long timestamp) throws IOException {
BdfList authorList = clientHelper.toList(author); BdfList authorList = clientHelper.toList(author);
BdfDictionary props = new BdfDictionary(); BdfDictionary props = clientHelper.toDictionary(properties);
for (Entry<TransportId, TransportProperties> e : properties.entrySet())
props.put(e.getKey().getString(), new BdfDictionary(e.getValue()));
BdfList payload = BdfList.of(authorList, props, signature, timestamp); BdfList payload = BdfList.of(authorList, props, signature, timestamp);
recordWriter.writeRecord(new Record(PROTOCOL_VERSION, CONTACT_INFO, recordWriter.writeRecord(new Record(PROTOCOL_VERSION, CONTACT_INFO,
clientHelper.toByteArray(payload))); clientHelper.toByteArray(payload)));
@@ -279,7 +274,7 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
Author author = clientHelper.parseAndValidateAuthor(payload.getList(0)); Author author = clientHelper.parseAndValidateAuthor(payload.getList(0));
BdfDictionary props = payload.getDictionary(1); BdfDictionary props = payload.getDictionary(1);
Map<TransportId, TransportProperties> properties = Map<TransportId, TransportProperties> properties =
parseTransportProperties(props); clientHelper.parseAndValidateTransportPropertiesMap(props);
byte[] signature = payload.getRaw(2); byte[] signature = payload.getRaw(2);
checkLength(signature, 1, MAX_SIGNATURE_LENGTH); checkLength(signature, 1, MAX_SIGNATURE_LENGTH);
long timestamp = payload.getLong(3); long timestamp = payload.getLong(3);
@@ -287,19 +282,6 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
return new ContactInfo(author, properties, signature, timestamp); return new ContactInfo(author, properties, signature, timestamp);
} }
private Map<TransportId, TransportProperties> parseTransportProperties(
BdfDictionary props) throws FormatException {
Map<TransportId, TransportProperties> properties = new HashMap<>();
for (String id : props.keySet()) {
checkLength(id, 1, MAX_TRANSPORT_ID_LENGTH);
BdfDictionary d = props.getDictionary(id);
TransportProperties p =
clientHelper.parseAndValidateTransportProperties(d);
properties.put(new TransportId(id), p);
}
return properties;
}
private ContactId addContact(Author remoteAuthor, long timestamp, private ContactId addContact(Author remoteAuthor, long timestamp,
Map<TransportId, TransportProperties> remoteProperties) Map<TransportId, TransportProperties> remoteProperties)
throws DbException { throws DbException {