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

Removed frame padding code (soon to be obsolete).

Browse Source
This commit is contained in:
akwizgran
2011-12-08 14:35:52 +00:00
parent d9fc8d18d1
commit 1886609bef
4 changed files with 0 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/build.xml
View File

@@ -55,7 +55,6 @@
<test name='net.sf.briar.transport.ConnectionWriterImplTest'/>
<test name='net.sf.briar.transport.ConnectionWriterTest'/>
<test name='net.sf.briar.transport.FrameReadWriteTest'/>
<test name='net.sf.briar.transport.PaddedConnectionWriterTest'/>
<test name='net.sf.briar.transport.batch.BatchConnectionReadWriteTest'/>
<test name='net.sf.briar.util.ByteUtilsTest'/>
<test name='net.sf.briar.util.FileUtilsTest'/>

163
test/net/sf/briar/transport/PaddedConnectionWriterTest.java
View File

@@ -1,163 +0,0 @@
package net.sf.briar.transport;
import static net.sf.briar.api.transport.TransportConstants.MAX_FRAME_LENGTH;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import net.sf.briar.api.transport.ConnectionWriter;
import net.sf.briar.util.ByteUtils;
import org.junit.Test;
public class PaddedConnectionWriterTest extends TransportTest {
public PaddedConnectionWriterTest() throws Exception {
super();
}
@Test
public void testWriteByteDoesNotBlockUntilBufferIsFull() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ConnectionEncrypter e = new NullConnectionEncrypter(out, Long.MAX_VALUE);
ConnectionWriter w = new PaddedConnectionWriter(e, mac, macKey);
final OutputStream out1 = w.getOutputStream();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean finished = new AtomicBoolean(false);
final AtomicBoolean failed = new AtomicBoolean(false);
new Thread() {
@Override
public void run() {
try {
for(int i = 0; i < maxPayloadLength; i++) out1.write(0);
finished.set(true);
} catch(IOException e) {
failed.set(true);
}
latch.countDown();
}
}.start();
// The wait should not time out
assertTrue(latch.await(1, TimeUnit.SECONDS));
assertTrue(finished.get());
assertFalse(failed.get());
// Nothing should have been written
assertEquals(0, out.size());
}
@Test
public void testWriteByteBlocksWhenBufferIsFull() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ConnectionEncrypter e = new NullConnectionEncrypter(out, Long.MAX_VALUE);
PaddedConnectionWriter w = new PaddedConnectionWriter(e, mac, macKey);
final OutputStream out1 = w.getOutputStream();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean finished = new AtomicBoolean(false);
final AtomicBoolean failed = new AtomicBoolean(false);
new Thread() {
@Override
public void run() {
try {
for(int i = 0; i < maxPayloadLength + 1; i++) out1.write(0);
finished.set(true);
} catch(IOException e) {
failed.set(true);
}
latch.countDown();
}
}.start();
// The wait should time out
assertFalse(latch.await(1, TimeUnit.SECONDS));
assertFalse(finished.get());
assertFalse(failed.get());
// Calling writeFullFrame() should allow the writer to proceed
w.writeFullFrame();
assertTrue(latch.await(1, TimeUnit.SECONDS));
assertTrue(finished.get());
assertFalse(failed.get());
// A full frame should have been written
assertEquals(MAX_FRAME_LENGTH, out.size());
}
@Test
public void testWriteArrayDoesNotBlockUntilBufferIsFull() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ConnectionEncrypter e = new NullConnectionEncrypter(out, Long.MAX_VALUE);
ConnectionWriter w = new PaddedConnectionWriter(e, mac, macKey);
final OutputStream out1 = w.getOutputStream();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean finished = new AtomicBoolean(false);
final AtomicBoolean failed = new AtomicBoolean(false);
new Thread() {
@Override
public void run() {
try {
out1.write(new byte[maxPayloadLength]);
finished.set(true);
} catch(IOException e) {
failed.set(true);
}
latch.countDown();
}
}.start();
// The wait should not time out
assertTrue(latch.await(1, TimeUnit.SECONDS));
assertTrue(finished.get());
assertFalse(failed.get());
// Nothing should have been written
assertEquals(0, out.size());
}
@Test
public void testWriteArrayBlocksWhenBufferIsFull() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ConnectionEncrypter e = new NullConnectionEncrypter(out, Long.MAX_VALUE);
PaddedConnectionWriter w = new PaddedConnectionWriter(e, mac, macKey);
final OutputStream out1 = w.getOutputStream();
final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean finished = new AtomicBoolean(false);
final AtomicBoolean failed = new AtomicBoolean(false);
new Thread() {
@Override
public void run() {
try {
out1.write(new byte[maxPayloadLength + 1]);
finished.set(true);
} catch(IOException e) {
failed.set(true);
}
latch.countDown();
}
}.start();
// The wait should time out
assertFalse(latch.await(1, TimeUnit.SECONDS));
assertFalse(finished.get());
assertFalse(failed.get());
// Calling writeFullFrame() should allow the writer to proceed
w.writeFullFrame();
assertTrue(latch.await(1, TimeUnit.SECONDS));
assertTrue(finished.get());
assertFalse(failed.get());
// A full frame should have been written
assertEquals(MAX_FRAME_LENGTH, out.size());
}
@Test
public void testWriteFullFrameInsertsPadding() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ConnectionEncrypter e = new NullConnectionEncrypter(out, Long.MAX_VALUE);
PaddedConnectionWriter w = new PaddedConnectionWriter(e, mac, macKey);
w.getOutputStream().write(0);
w.writeFullFrame();
// A full frame should have been written
assertEquals(MAX_FRAME_LENGTH, out.size());
// The frame should have a payload length of 1 and padding for the rest
byte[] frame = out.toByteArray();
assertEquals(1, ByteUtils.readUint16(frame, 0)); // Payload length
assertEquals(maxPayloadLength - 1, ByteUtils.readUint16(frame, 2));
}
}