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

Retrieve the set of unseen connection numbers from a connection

Browse Source 
window.
This commit is contained in:
akwizgran
2011-08-11 13:58:11 +01:00
parent ac4521152f
commit 0e6638bad6
3 changed files with 69 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/net/sf/briar/api/transport/ConnectionWindow.java
View File

@@ -1,5 +1,7 @@
package net.sf.briar.api.transport; package net.sf.briar.api.transport;
import java.util.Collection;
public interface ConnectionWindow { public interface ConnectionWindow {
long getCentre(); long getCentre();
@@ -9,4 +11,6 @@ public interface ConnectionWindow {
boolean isSeen(long connectionNumber); boolean isSeen(long connectionNumber);
void setSeen(long connectionNumber); void setSeen(long connectionNumber);
Collection<Long> getUnseenConnectionNumbers();
} }

30
components/net/sf/briar/transport/ConnectionWindowImpl.java
View File

@@ -1,5 +1,8 @@
package net.sf.briar.transport; package net.sf.briar.transport;
import java.util.ArrayList;
import java.util.Collection;
import net.sf.briar.api.transport.ConnectionWindow; import net.sf.briar.api.transport.ConnectionWindow;
class ConnectionWindowImpl implements ConnectionWindow { class ConnectionWindowImpl implements ConnectionWindow {
@@ -28,6 +31,15 @@ class ConnectionWindowImpl implements ConnectionWindow {
return (bitmap & mask) != 0; return (bitmap & mask) != 0;
} }
private int getOffset(long connectionNumber) {
if(connectionNumber < 0L) throw new IllegalArgumentException();
if(connectionNumber > MAX_32_BIT_UNSIGNED)
throw new IllegalArgumentException();
int offset = (int) (connectionNumber - centre) + 16;
if(offset < 0 || offset > 31) throw new IllegalArgumentException();
return offset;
}
public void setSeen(long connectionNumber) { public void setSeen(long connectionNumber) {
int offset = getOffset(connectionNumber); int offset = getOffset(connectionNumber);
int mask = 0x80000000 >>> offset; int mask = 0x80000000 >>> offset;
@@ -40,12 +52,16 @@ class ConnectionWindowImpl implements ConnectionWindow {
} }
} }
private int getOffset(long connectionNumber) { public Collection<Long> getUnseenConnectionNumbers() {
if(connectionNumber < 0L) throw new IllegalArgumentException(); Collection<Long> unseen = new ArrayList<Long>();
if(connectionNumber > MAX_32_BIT_UNSIGNED) for(int i = 0; i < 32; i++) {
throw new IllegalArgumentException(); int mask = 0x80000000 >>> i;
int offset = (int) (connectionNumber - centre) + 16; if((bitmap & mask) == 0) {
if(offset < 0 || offset > 31) throw new IllegalArgumentException(); long c = centre - 16 + i;
return offset; if(c >= 0L && c <= MAX_32_BIT_UNSIGNED) unseen.add(c);
}
}
assert unseen.contains(centre) || centre == MAX_32_BIT_UNSIGNED + 1;
return unseen;
} }
} }

43
test/net/sf/briar/transport/ConnectionWindowImplTest.java
View File

@@ -1,5 +1,7 @@
package net.sf.briar.transport; package net.sf.briar.transport;
import java.util.Collection;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.junit.Test; import org.junit.Test;
@@ -71,7 +73,7 @@ public class ConnectionWindowImplTest extends TestCase {
} }
@Test @Test
public void testCannotSetSameValueTwice() { public void testCannotSetSeenTwice() {
ConnectionWindowImpl w = new ConnectionWindowImpl(0L, 0); ConnectionWindowImpl w = new ConnectionWindowImpl(0L, 0);
w.setSeen(15); w.setSeen(15);
try { try {
@@ -79,4 +81,43 @@ public class ConnectionWindowImplTest extends TestCase {
fail(); fail();
} catch(IllegalArgumentException expected) {} } catch(IllegalArgumentException expected) {}
} }
@Test
public void testGetUnseenConnectionNumbers() {
ConnectionWindowImpl w = new ConnectionWindowImpl(0L, 0);
// Centre is 0; window should cover 0 to 15, inclusive, with none seen
Collection<Long> unseen = w.getUnseenConnectionNumbers();
assertEquals(16, unseen.size());
for(int i = 0; i < 16; i++) {
assertTrue(unseen.contains(Long.valueOf(i)));
assertFalse(w.isSeen(i));
}
w.setSeen(3);
w.setSeen(4);
// Centre is 5; window should cover 0 to 20, inclusive, with two seen
unseen = w.getUnseenConnectionNumbers();
assertEquals(19, unseen.size());
for(int i = 0; i < 21; i++) {
if(i == 3 || i == 4) {
assertFalse(unseen.contains(Long.valueOf(i)));
assertTrue(w.isSeen(i));
} else {
assertTrue(unseen.contains(Long.valueOf(i)));
assertFalse(w.isSeen(i));
}
}
w.setSeen(19);
// Centre is 20; window should cover 4 to 35, inclusive, with two seen
unseen = w.getUnseenConnectionNumbers();
assertEquals(30, unseen.size());
for(int i = 4; i < 36; i++) {
if(i == 4 || i == 19) {
assertFalse(unseen.contains(Long.valueOf(i)));
assertTrue(w.isSeen(i));
} else {
assertTrue(unseen.contains(Long.valueOf(i)));
assertFalse(w.isSeen(i));
}
}
}
} }