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

SLIP classes don't need to depend on SLTP classes.

Browse Source
This commit is contained in:
akwizgran
2012-12-15 05:07:03 +00:00
parent 3e2e7286fe
commit 28af51b156
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-core/src/net/sf/briar/reliability/ReliabilityLayerImpl.java
View File

@@ -45,7 +45,7 @@ class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {
SlipEncoder encoder = new SlipEncoder(this); SlipEncoder encoder = new SlipEncoder(this);
final Sender sender = new Sender(clock, encoder); final Sender sender = new Sender(clock, encoder);
receiver = new Receiver(clock, sender); receiver = new Receiver(clock, sender);
decoder = new SlipDecoder(receiver); decoder = new SlipDecoder(receiver, Data.MAX_LENGTH);
inputStream = new ReceiverInputStream(receiver); inputStream = new ReceiverInputStream(receiver);
outputStream = new SenderOutputStream(sender); outputStream = new SenderOutputStream(sender);
running = true; running = true;
@@ -97,12 +97,12 @@ class ReliabilityLayerImpl implements ReliabilityLayer, WriteHandler {
return outputStream; return outputStream;
} }
// The transport calls this method to pass data up to the SLIP decoder // The lower layer calls this method to pass data up to the SLIP decoder
public void handleRead(byte[] b) throws IOException { public void handleRead(byte[] b) throws IOException {
if(running) decoder.handleRead(b); if(running) decoder.handleRead(b);
} }
// The SLIP encoder calls this method to pass data down to the transport // The SLIP encoder calls this method to pass data down to the lower layer
public void handleWrite(byte[] b) { public void handleWrite(byte[] b) {
if(running && b.length > 0) writes.add(b); if(running && b.length > 0) writes.add(b);
} }

5
briar-core/src/net/sf/briar/reliability/SlipDecoder.java
View File

@@ -11,13 +11,14 @@ class SlipDecoder implements ReadHandler {
private static final byte TEND = (byte) 220, TESC = (byte) 221; private static final byte TEND = (byte) 220, TESC = (byte) 221;
private final ReadHandler readHandler; private final ReadHandler readHandler;
private final byte[] buf;
private byte[] buf = new byte[Data.MAX_LENGTH];
private int decodedLength = 0; private int decodedLength = 0;
private boolean escape = false; private boolean escape = false;
SlipDecoder(ReadHandler readHandler) { SlipDecoder(ReadHandler readHandler, int maxDecodedLength) {
this.readHandler = readHandler; this.readHandler = readHandler;
buf = new byte[maxDecodedLength];
} }
public void handleRead(byte[] b) throws IOException { public void handleRead(byte[] b) throws IOException {

1
briar-core/src/net/sf/briar/reliability/SlipEncoder.java
View File

@@ -17,7 +17,6 @@ class SlipEncoder implements WriteHandler {
} }
public void handleWrite(byte[] b) throws IOException { public void handleWrite(byte[] b) throws IOException {
if(b.length > Data.MAX_LENGTH) throw new IllegalArgumentException();
int encodedLength = b.length + 2; int encodedLength = b.length + 2;
for(int i = 0; i < b.length; i++) for(int i = 0; i < b.length; i++)
if(b[i] == END || b[i] == ESC) encodedLength++; if(b[i] == END || b[i] == ESC) encodedLength++;