From d3062a992d6c596a898a959a01de82d14678bddf Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 6 Dec 2012 16:05:57 +0000
Subject: [PATCH] Increased connection timeout to 2 minutes, more logging.
---
briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java | 2 +-
briar-core/src/net/sf/briar/plugins/modem/Receiver.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java b/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java
index 1cf99edf10..f389b7dfa2 100644
--- a/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java
+++ b/briar-core/src/net/sf/briar/plugins/modem/ModemImpl.java
@@ -27,7 +27,7 @@ class ModemImpl implements Modem, WriteHandler, SerialPortEventListener {
256000, 128000, 115200, 57600, 38400, 19200, 14400, 9600, 4800, 1200
};
private static final int OK_TIMEOUT = 5 * 1000; // Milliseconds
- private static final int CONNECT_TIMEOUT = 60 * 1000; // Milliseconds
+ private static final int CONNECT_TIMEOUT = 2 * 60 * 1000; // Milliseconds
private final Executor executor;
private final Callback callback;
diff --git a/briar-core/src/net/sf/briar/plugins/modem/Receiver.java b/briar-core/src/net/sf/briar/plugins/modem/Receiver.java
index fa58ec2917..44f117ce38 100644
--- a/briar-core/src/net/sf/briar/plugins/modem/Receiver.java
+++ b/briar-core/src/net/sf/briar/plugins/modem/Receiver.java
@@ -76,7 +76,8 @@ class Receiver implements ReadHandler {
sender.handleAck(b);
break;
default:
- if(LOG.isLoggable(INFO)) LOG.info("Ignoring unknown frame type");
+ if(LOG.isLoggable(INFO))
+ LOG.info("Ignoring unknown frame type: " + b[0]);
return;
}
}
--
GitLab