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

Tests and bugfixes for IncomingReliabilityLayerImpl.

Browse Source
This commit is contained in:
akwizgran
2012-01-23 17:06:57 +00:00
parent 9f1e3dea21
commit ffe3bafce4
4 changed files with 105 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/net/sf/briar/transport/ConnectionReaderImpl.java
View File

@@ -19,6 +19,7 @@ class ConnectionReaderImpl extends InputStream implements ConnectionReader {
ConnectionReaderImpl(IncomingReliabilityLayer in, boolean tolerateErrors) {
this.in = in;
this.tolerateErrors = tolerateErrors;
frame = new Frame(in.getMaxFrameLength());
}
public InputStream getInputStream() {

12
components/net/sf/briar/transport/IncomingReliabilityLayerImpl.java
View File

@@ -5,12 +5,13 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.ListIterator;
/** A reliability layer that reorders out-of-order frames. */
class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
private final IncomingAuthenticationLayer in;
private final int maxFrameLength;
private final FrameWindow window;
private final LinkedList<Frame> frames;
private final LinkedList<Frame> frames; // Ordered by frame number
private final ArrayList<Frame> freeFrames;
private long nextFrameNumber = 0L;
@@ -38,6 +39,8 @@ class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
// If the frame is in order, return it
long frameNumber = f.getFrameNumber();
if(frameNumber == nextFrameNumber) {
if(!window.remove(nextFrameNumber))
throw new IllegalStateException();
nextFrameNumber++;
return f;
}
@@ -60,8 +63,8 @@ class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
}
next = frames.peek();
}
assert next != null && next.getFrameNumber() == nextFrameNumber;
frames.poll();
if(!window.remove(nextFrameNumber)) throw new IllegalStateException();
nextFrameNumber++;
return next;
}
@@ -69,4 +72,9 @@ class IncomingReliabilityLayerImpl implements IncomingReliabilityLayer {
public int getMaxFrameLength() {
return maxFrameLength;
}
// Only for testing
public int getFreeFramesCount() {
return freeFrames.size();
}
}

1
test/build.xml
View File

@@ -59,6 +59,7 @@
<test name='net.sf.briar.transport.FrameWindowImplTest'/>
<test name='net.sf.briar.transport.IncomingEncryptionLayerImplTest'/>
<test name='net.sf.briar.transport.IncomingErrorCorrectionLayerImplTest'/>
<test name='net.sf.briar.transport.IncomingReliabilityLayerImplTest'/>
<test name='net.sf.briar.transport.OutgoingEncryptionLayerImplTest'/>
<test name='net.sf.briar.transport.SegmentedIncomingEncryptionLayerTest'/>
<test name='net.sf.briar.transport.SegmentedOutgoingEncryptionLayerTest'/>

93
test/net/sf/briar/transport/IncomingReliabilityLayerImplTest.java Normal file
View File

@@ -0,0 +1,93 @@
package net.sf.briar.transport;
import static net.sf.briar.api.transport.TransportConstants.FRAME_HEADER_LENGTH;
import static net.sf.briar.api.transport.TransportConstants.FRAME_WINDOW_SIZE;
import static net.sf.briar.api.transport.TransportConstants.MAC_LENGTH;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.sf.briar.BriarTestCase;
import net.sf.briar.api.transport.ConnectionReader;
import org.junit.Test;
public class IncomingReliabilityLayerImplTest extends BriarTestCase {
@Test
public void testNoReordering() throws Exception {
List<Integer> frameNumbers = new ArrayList<Integer>();
// Receive FRAME_WINDOW_SIZE * 2 frames in the correct order
for(int i = 0; i < FRAME_WINDOW_SIZE * 2; i++) frameNumbers.add(i);
IncomingAuthenticationLayer authentication =
new TestIncomingAuthenticationLayer(frameNumbers);
IncomingReliabilityLayerImpl reliability =
new IncomingReliabilityLayerImpl(authentication);
ConnectionReader reader = new ConnectionReaderImpl(reliability, false);
InputStream in = reader.getInputStream();
for(int i = 0; i < FRAME_WINDOW_SIZE * 2; i++) {
for(int j = 0; j < 100; j++) assertEquals(i, in.read());
}
assertEquals(-1, in.read());
// No free frames should be cached
assertEquals(0, reliability.getFreeFramesCount());
}
@Test
public void testReordering() throws Exception {
List<Integer> frameNumbers = new ArrayList<Integer>();
// Receive the first FRAME_WINDOW_SIZE frames in a random order
for(int i = 0; i < FRAME_WINDOW_SIZE; i++) frameNumbers.add(i);
Collections.shuffle(frameNumbers);
// Receive the next FRAME_WINDOW_SIZE frames in the correct order
for(int i = FRAME_WINDOW_SIZE; i < FRAME_WINDOW_SIZE * 2; i++) {
frameNumbers.add(i);
}
// The reliability layer should reorder the frames
IncomingAuthenticationLayer authentication =
new TestIncomingAuthenticationLayer(frameNumbers);
IncomingReliabilityLayerImpl reliability =
new IncomingReliabilityLayerImpl(authentication);
ConnectionReader reader = new ConnectionReaderImpl(reliability, false);
InputStream in = reader.getInputStream();
for(int i = 0; i < FRAME_WINDOW_SIZE * 2; i++) {
for(int j = 0; j < 100; j++) assertEquals(i, in.read());
}
assertEquals(-1, in.read());
// Fewer than FRAME_WINDOW_SIZE free frames should be cached
assertTrue(reliability.getFreeFramesCount() < 32);
}
private static class TestIncomingAuthenticationLayer
implements IncomingAuthenticationLayer {
private final List<Integer> frameNumbers;
private int index;
private TestIncomingAuthenticationLayer(List<Integer> frameNumbers) {
this.frameNumbers = frameNumbers;
index = 0;
}
public boolean readFrame(Frame f, FrameWindow window) {
if(index >= frameNumbers.size()) return false;
int frameNumber = frameNumbers.get(index);
assertTrue(window.contains(frameNumber));
index++;
byte[] buf = f.getBuffer();
HeaderEncoder.encodeHeader(buf, frameNumber, 100, 0);
for(int i = 0; i < 100; i++) {
buf[FRAME_HEADER_LENGTH + i] = (byte) frameNumber;
}
f.setLength(FRAME_HEADER_LENGTH + 100 + MAC_LENGTH);
return true;
}
public int getMaxFrameLength() {
return FRAME_HEADER_LENGTH + 100 + MAC_LENGTH;
}
}
}