Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Simplified serialisation format: removed compact encodings.

Browse Source
This commit is contained in:
akwizgran
2013-10-11 15:16:16 +01:00
parent 38c1b4eb97
commit e0d313a28c
7 changed files with 70 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
briar-core/src/net/sf/briar/serial/ReaderImpl.java
View File

@@ -250,8 +250,7 @@ class ReaderImpl implements Reader {
public boolean hasString() throws IOException {
if(!hasLookahead) readLookahead(true);
if(eof) return false;
return next == Tag.STRING
|| (next & Tag.SHORT_MASK) == Tag.SHORT_STRING;
return next == Tag.STRING;
}
public String readString() throws IOException {
@@ -261,9 +260,7 @@ class ReaderImpl implements Reader {
public String readString(int maxLength) throws IOException {
if(!hasString()) throw new FormatException();
consumeLookahead();
int length;
if(next == Tag.STRING) length = readLength();
else length = 0xFF & next ^ Tag.SHORT_STRING;
int length = readLength();
if(length > maxLength) throw new FormatException();
if(length == 0) return "";
readIntoBuffer(length);
@@ -289,7 +286,7 @@ class ReaderImpl implements Reader {
public boolean hasBytes() throws IOException {
if(!hasLookahead) readLookahead(true);
if(eof) return false;
return next == Tag.BYTES || (next & Tag.SHORT_MASK) == Tag.SHORT_BYTES;
return next == Tag.BYTES;
}
public byte[] readBytes() throws IOException {
@@ -299,9 +296,7 @@ class ReaderImpl implements Reader {
public byte[] readBytes(int maxLength) throws IOException {
if(!hasBytes()) throw new FormatException();
consumeLookahead();
int length;
if(next == Tag.BYTES) length = readLength();
else length = 0xFF & next ^ Tag.SHORT_BYTES;
int length = readLength();
if(length > maxLength) throw new FormatException();
if(length == 0) return EMPTY_BUFFER;
byte[] b = new byte[length];
@@ -312,29 +307,15 @@ class ReaderImpl implements Reader {
public boolean hasList() throws IOException {
if(!hasLookahead) readLookahead(true);
if(eof) return false;
return next == Tag.LIST
|| (next & Tag.SHORT_MASK) == Tag.SHORT_LIST;
return next == Tag.LIST;
}
public <E> List<E> readList(Class<E> e) throws IOException {
if(!hasList()) throw new FormatException();
consumeLookahead();
if(next == Tag.LIST) {
List<E> list = new ArrayList<E>();
while(!hasEnd()) list.add(readObject(e));
readEnd();
return Collections.unmodifiableList(list);
} else {
int length = 0xFF & next ^ Tag.SHORT_LIST;
return readList(e, length);
}
}
private <E> List<E> readList(Class<E> e, int length) throws IOException {
assert length >= 0;
if(length == 0) return Collections.emptyList();
List<E> list = new ArrayList<E>();
for(int i = 0; i < length; i++) list.add(readObject(e));
while(!hasEnd()) list.add(readObject(e));
readEnd();
return Collections.unmodifiableList(list);
}
@@ -419,36 +400,18 @@ class ReaderImpl implements Reader {
public boolean hasMap() throws IOException {
if(!hasLookahead) readLookahead(true);
if(eof) return false;
return next == Tag.MAP
|| (next & Tag.SHORT_MASK) == Tag.SHORT_MAP;
return next == Tag.MAP;
}
public <K, V> Map<K, V> readMap(Class<K> k, Class<V> v) throws IOException {
if(!hasMap()) throw new FormatException();
consumeLookahead();
if(next == Tag.MAP) {
Map<K, V> m = new HashMap<K, V>();
while(!hasEnd()) {
if(m.put(readObject(k), readObject(v)) != null)
throw new FormatException(); // Duplicate key
}
readEnd();
return Collections.unmodifiableMap(m);
} else {
int size = 0xFF & next ^ Tag.SHORT_MAP;
return readMap(k, v, size);
}
}
private <K, V> Map<K, V> readMap(Class<K> k, Class<V> v, int size)
throws IOException {
assert size >= 0;
if(size == 0) return Collections.emptyMap();
Map<K, V> m = new HashMap<K, V>();
for(int i = 0; i < size; i++) {
while(!hasEnd()) {
if(m.put(readObject(k), readObject(v)) != null)
throw new FormatException(); // Duplicate key
}
readEnd();
return Collections.unmodifiableMap(m);
}
@@ -486,11 +449,7 @@ class ReaderImpl implements Reader {
if(id < 0 || id > 255) throw new IllegalArgumentException();
if(!hasLookahead) readLookahead(true);
if(eof) return false;
if(next == Tag.STRUCT)
return id == (0xFF & nextNext);
else if((next & Tag.SHORT_STRUCT_MASK) == Tag.SHORT_STRUCT)
return id == (0xFF & next ^ Tag.SHORT_STRUCT);
else return false;
return id == (0xFF & nextNext);
}
public void readStructId(int id) throws IOException {

9
briar-core/src/net/sf/briar/serial/Tag.java
View File

@@ -17,13 +17,4 @@ interface Tag {
byte END = (byte) 0xF3; // 1111 0011
byte NULL = (byte) 0xF2; // 1111 0010
byte STRUCT = (byte) 0xF1; // 1111 0001
int SHORT_STRING = 0x80; // 1000 xxxx
int SHORT_BYTES = 0x90; // 1001 xxxx
int SHORT_LIST = 0xA0; // 1010 xxxx
int SHORT_MAP = 0xB0; // 1011 xxxx
int SHORT_STRUCT = 0xC0; // 110x xxxx
int SHORT_MASK = 0xF0; // Match first four bits
int SHORT_STRUCT_MASK = 0xE0; // Match first three bits
}

55
briar-core/src/net/sf/briar/serial/WriterImpl.java
View File

@@ -111,12 +111,8 @@ class WriterImpl implements Writer {
public void writeString(String s) throws IOException {
byte[] b = s.getBytes("UTF-8");
if(b.length < 16) {
write((byte) (Tag.SHORT_STRING | b.length));
} else {
write(Tag.STRING);
writeLength(b.length);
}
write(Tag.STRING);
writeLength(b.length);
write(b);
}
@@ -129,25 +125,15 @@ class WriterImpl implements Writer {
}
public void writeBytes(byte[] b) throws IOException {
if(b.length < 16) {
write((byte) (Tag.SHORT_BYTES | b.length));
} else {
write(Tag.BYTES);
writeLength(b.length);
}
write(Tag.BYTES);
writeLength(b.length);
write(b);
}
public void writeList(Collection<?> c) throws IOException {
int length = c.size();
if(length < 16) {
write((byte) (Tag.SHORT_LIST | length));
for(Object o : c) writeObject(o);
} else {
write(Tag.LIST);
for(Object o : c) writeObject(o);
write(Tag.END);
}
write(Tag.LIST);
for(Object o : c) writeObject(o);
write(Tag.END);
}
private void writeObject(Object o) throws IOException {
@@ -175,21 +161,12 @@ class WriterImpl implements Writer {
}
public void writeMap(Map<?, ?> m) throws IOException {
int length = m.size();
if(length < 16) {
write((byte) (Tag.SHORT_MAP | length));
for(Entry<?, ?> e : m.entrySet()) {
writeObject(e.getKey());
writeObject(e.getValue());
}
} else {
write(Tag.MAP);
for(Entry<?, ?> e : m.entrySet()) {
writeObject(e.getKey());
writeObject(e.getValue());
}
write(Tag.END);
write(Tag.MAP);
for(Entry<?, ?> e : m.entrySet()) {
writeObject(e.getKey());
writeObject(e.getValue());
}
write(Tag.END);
}
public void writeMapStart() throws IOException {
@@ -206,12 +183,8 @@ class WriterImpl implements Writer {
public void writeStructId(int id) throws IOException {
if(id < 0 || id > 255) throw new IllegalArgumentException();
if(id < 32) {
write((byte) (Tag.SHORT_STRUCT | id));
} else {
write(Tag.STRUCT);
write((byte) id);
}
write(Tag.STRUCT);
write((byte) id);
}
private void write(byte b) throws IOException {