Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29: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();
}
}