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

Removed redundant frame number from header.

Browse Source
This commit is contained in:
akwizgran
2011-09-01 11:11:31 +01:00
parent 928ae6288f
commit 472dff3d61
7 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/net/sf/briar/transport/ConnectionReaderImplTest.java
View File

@@ -22,7 +22,7 @@ public class ConnectionReaderImplTest extends TransportTest {
public void testLengthZero() throws Exception {
int payloadLength = 0;
byte[] frame = new byte[headerLength + payloadLength + macLength];
writeHeader(frame, 0L, payloadLength, 0);
writeHeader(frame, payloadLength, 0);
// Calculate the MAC
mac.update(frame, 0, headerLength + payloadLength);
mac.doFinal(frame, headerLength + payloadLength);
@@ -40,7 +40,7 @@ public class ConnectionReaderImplTest extends TransportTest {
public void testLengthOne() throws Exception {
int payloadLength = 1;
byte[] frame = new byte[headerLength + payloadLength + macLength];
writeHeader(frame, 0L, payloadLength, 0);
writeHeader(frame, payloadLength, 0);
// Calculate the MAC
mac.update(frame, 0, headerLength + payloadLength);
mac.doFinal(frame, headerLength + payloadLength);
@@ -57,12 +57,12 @@ public class ConnectionReaderImplTest extends TransportTest {
public void testMaxLength() throws Exception {
// First frame: max payload length
byte[] frame = new byte[MAX_FRAME_LENGTH];
writeHeader(frame, 0L, maxPayloadLength, 0);
writeHeader(frame, maxPayloadLength, 0);
mac.update(frame, 0, headerLength + maxPayloadLength);
mac.doFinal(frame, headerLength + maxPayloadLength);
// Second frame: max payload length plus one
byte[] frame1 = new byte[MAX_FRAME_LENGTH + 1];
writeHeader(frame1, 1L, maxPayloadLength + 1, 0);
writeHeader(frame1, maxPayloadLength + 1, 0);
mac.update(frame1, 0, headerLength + maxPayloadLength + 1);
mac.doFinal(frame1, headerLength + maxPayloadLength + 1);
// Concatenate the frames
@@ -88,12 +88,12 @@ public class ConnectionReaderImplTest extends TransportTest {
int paddingLength = 10;
// First frame: max payload length, including padding
byte[] frame = new byte[MAX_FRAME_LENGTH];
writeHeader(frame, 0L, maxPayloadLength - paddingLength, paddingLength);
writeHeader(frame, maxPayloadLength - paddingLength, paddingLength);
mac.update(frame, 0, headerLength + maxPayloadLength);
mac.doFinal(frame, headerLength + maxPayloadLength);
// Second frame: max payload length plus one, including padding
byte[] frame1 = new byte[MAX_FRAME_LENGTH + 1];
writeHeader(frame1, 1L, maxPayloadLength + 1 - paddingLength,
writeHeader(frame1, maxPayloadLength + 1 - paddingLength,
paddingLength);
mac.update(frame1, 0, headerLength + maxPayloadLength + 1);
mac.doFinal(frame1, headerLength + maxPayloadLength + 1);
@@ -118,15 +118,15 @@ public class ConnectionReaderImplTest extends TransportTest {
@Test
public void testMultipleFrames() throws Exception {
// First frame: 123-byte payload
byte[] frame = new byte[8 + 123 + mac.getMacLength()];
writeHeader(frame, 0L, 123, 0);
mac.update(frame, 0, 8 + 123);
mac.doFinal(frame, 8 + 123);
byte[] frame = new byte[headerLength + 123 + mac.getMacLength()];
writeHeader(frame, 123, 0);
mac.update(frame, 0, headerLength + 123);
mac.doFinal(frame, headerLength + 123);
// Second frame: 1234-byte payload
byte[] frame1 = new byte[8 + 1234 + mac.getMacLength()];
writeHeader(frame1, 1L, 1234, 0);
mac.update(frame1, 0, 8 + 1234);
mac.doFinal(frame1, 8 + 1234);
byte[] frame1 = new byte[headerLength + 1234 + mac.getMacLength()];
writeHeader(frame1, 1234, 0);
mac.update(frame1, 0, headerLength + 1234);
mac.doFinal(frame1, headerLength + 1234);
// Concatenate the frames
ByteArrayOutputStream out = new ByteArrayOutputStream();
out.write(frame);
@@ -147,7 +147,7 @@ public class ConnectionReaderImplTest extends TransportTest {
public void testCorruptPayload() throws Exception {
int payloadLength = 8;
byte[] frame = new byte[headerLength + payloadLength + macLength];
writeHeader(frame, 0L, payloadLength, 0);
writeHeader(frame, payloadLength, 0);
// Calculate the MAC
mac.update(frame, 0, headerLength + payloadLength);
mac.doFinal(frame, headerLength + payloadLength);
@@ -167,7 +167,7 @@ public class ConnectionReaderImplTest extends TransportTest {
public void testCorruptMac() throws Exception {
int payloadLength = 8;
byte[] frame = new byte[headerLength + payloadLength + macLength];
writeHeader(frame, 0L, payloadLength, 0);
writeHeader(frame, payloadLength, 0);
// Calculate the MAC
mac.update(frame, 0, headerLength + payloadLength);
mac.doFinal(frame, headerLength + payloadLength);

6
test/net/sf/briar/transport/ConnectionWriterImplTest.java
View File

@@ -31,7 +31,7 @@ public class ConnectionWriterImplTest extends TransportTest {
public void testSingleByteFrame() throws Exception {
int payloadLength = 1;
byte[] frame = new byte[headerLength + payloadLength + macLength];
writeHeader(frame, 0L, payloadLength, 0);
writeHeader(frame, payloadLength, 0);
// Calculate the MAC
mac.update(frame, 0, headerLength + payloadLength);
mac.doFinal(frame, headerLength + payloadLength);
@@ -76,12 +76,12 @@ public class ConnectionWriterImplTest extends TransportTest {
public void testMultipleFrames() throws Exception {
// First frame: 123-byte payload
byte[] frame = new byte[headerLength + 123 + macLength];
writeHeader(frame, 0L, 123, 0);
writeHeader(frame, 123, 0);
mac.update(frame, 0, headerLength + 123);
mac.doFinal(frame, headerLength + 123);
// Second frame: 1234-byte payload
byte[] frame1 = new byte[headerLength + 1234 + macLength];
writeHeader(frame1, 1L, 1234, 0);
writeHeader(frame1, 1234, 0);
mac.update(frame1, 0, headerLength + 1234);
mac.doFinal(frame1, headerLength + 1234);
// Concatenate the frames

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

@@ -157,8 +157,7 @@ public class PaddedConnectionWriterTest extends TransportTest {
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(0L, ByteUtils.readUint32(frame, 0)); // Frame number
assertEquals(1, ByteUtils.readUint16(frame, 4)); // Payload length
assertEquals(maxPayloadLength - 1, ByteUtils.readUint16(frame, 6));
assertEquals(1, ByteUtils.readUint16(frame, 0)); // Payload length
assertEquals(maxPayloadLength - 1, ByteUtils.readUint16(frame, 2));
}
}

9
test/net/sf/briar/transport/TransportTest.java
View File

@@ -15,7 +15,7 @@ import junit.framework.TestCase;
public abstract class TransportTest extends TestCase {
protected final Mac mac;
protected final int headerLength = 8, macLength, maxPayloadLength;
protected final int headerLength = 4, macLength, maxPayloadLength;
public TransportTest() throws Exception {
super();
@@ -27,9 +27,8 @@ public abstract class TransportTest extends TestCase {
maxPayloadLength = MAX_FRAME_LENGTH - headerLength - macLength;
}
static void writeHeader(byte[] b, long frame, int payload, int padding) {
ByteUtils.writeUint32(frame, b, 0);
ByteUtils.writeUint16(payload, b, 4);
ByteUtils.writeUint16(padding, b, 6);
static void writeHeader(byte[] b, int payload, int padding) {
ByteUtils.writeUint16(payload, b, 0);
ByteUtils.writeUint16(padding, b, 2);
}
}