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

Ensure each reliability layer is started and stopped.

Browse Source
This commit is contained in:
akwizgran
2012-12-07 15:40:03 +00:00
parent 19106ae044
commit a6777f1fe1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java
View File

@@ -49,6 +49,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
connected = new AtomicBoolean(false); connected = new AtomicBoolean(false);
line = new byte[MAX_LINE_LENGTH]; line = new byte[MAX_LINE_LENGTH];
reliabilityLayer = new ReliabilityLayer(this); reliabilityLayer = new ReliabilityLayer(this);
reliabilityLayer.start();
} }
public void start() throws IOException { public void start() throws IOException {
@@ -69,7 +70,6 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
} }
if(!foundBaudRate) if(!foundBaudRate)
throw new IOException("Could not find a suitable baud rate"); throw new IOException("Could not find a suitable baud rate");
reliabilityLayer.start();
port.addEventListener(this); port.addEventListener(this);
port.purgePort(PURGE_RXCLEAR | PURGE_TXCLEAR); port.purgePort(PURGE_RXCLEAR | PURGE_TXCLEAR);
port.writeBytes("ATZ\r\n".getBytes("US-ASCII")); // Reset port.writeBytes("ATZ\r\n".getBytes("US-ASCII")); // Reset
@@ -150,6 +150,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
} }
reliabilityLayer.stop(); reliabilityLayer.stop();
reliabilityLayer = new ReliabilityLayer(this); reliabilityLayer = new ReliabilityLayer(this);
reliabilityLayer.start();
connected.set(false); connected.set(false);
offHook.release(); offHook.release();
} }

1
briar-core/src/net/sf/briar/plugins/modem/ReliabilityLayer.java
View File

@@ -70,6 +70,7 @@ class ReliabilityLayer implements ReadHandler, WriteHandler {
} }
void stop() { void stop() {
if(!running) throw new IllegalStateException();
running = false; running = false;
receiver.invalidate(); receiver.invalidate();
writes.add(new byte[0]); // Poison pill writes.add(new byte[0]); // Poison pill