From 5ea0cce2bfcd572aaeb371217839d94097d5fe01 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 14 May 2014 15:21:49 +0100 Subject: [PATCH] Tell Tor to shut down when control socket is closed; more Tor logging. Patched jtorctl to pass more information about circuit events to the controller to help us debug connection problems. --- briar-android/libs/jtorctl-briar.jar | Bin 15913 -> 16143 bytes .../briarproject/plugins/tor/TorPlugin.java | 22 +++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/briar-android/libs/jtorctl-briar.jar b/briar-android/libs/jtorctl-briar.jar index e9c8d84e09b0a38572dd2ba3691123a72e80b1b9..a3bd4a68828e317ee79279e334f42b28e76efaff 100644 GIT binary patch delta 7804 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 diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java index be89d867e..02d8d9c11 100644 --- a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java +++ b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java @@ -61,7 +61,7 @@ class TorPlugin implements DuplexPlugin, EventHandler { static final TransportId ID = new TransportId("tor"); private static final String[] EVENTS = { - "CIRC", "STREAM", "ORCONN", "NOTICE", "WARN", "ERR" + "CIRC", "ORCONN", "NOTICE", "WARN", "ERR" }; private static final int SOCKS_PORT = 59050, CONTROL_PORT = 59051; private static final int COOKIE_TIMEOUT = 3000; // Milliseconds @@ -210,6 +210,8 @@ class TorPlugin implements DuplexPlugin, EventHandler { // Open a control connection and authenticate using the cookie file controlConnection = new TorControlConnection(controlSocket); controlConnection.authenticate(read(cookieFile)); + // Tell Tor to exit when the control connection is closed + controlConnection.takeOwnership(); // Register to receive events from the Tor process controlConnection.setEventHandler(this); controlConnection.setEvents(Arrays.asList(EVENTS)); @@ -632,10 +634,14 @@ class TorPlugin implements DuplexPlugin, EventHandler { throw new UnsupportedOperationException(); } - public void circuitStatus(String status, String id, String path) { + public void circuitStatus(String status, String id, String path, + String flags, String purpose, String hsState) { if(LOG.isLoggable(INFO)) { - if(!"EXTENDED".equals(status)) - LOG.info("Circuit " + id + " " + status); + String msg = "Circuit " + id + " " + status; + if(flags.length() > 0) msg += ", flags: " + flags; + if(purpose.length() > 0) msg += ", purpose: " + purpose; + if(hsState.length() > 0) msg += ", state: " + hsState; + LOG.info(msg); } if("BUILT".equals(status) && firstCircuit.getAndSet(false)) { LOG.info("First circuit built"); @@ -643,9 +649,7 @@ class TorPlugin implements DuplexPlugin, EventHandler { } } - public void streamStatus(String status, String id, String target) { - if(LOG.isLoggable(INFO)) LOG.info("Stream " + id + " " + status); - } + public void streamStatus(String status, String id, String target) {} public void orConnStatus(String status, String orName) { if(LOG.isLoggable(INFO)) LOG.info("OR connection " + status); @@ -659,7 +663,9 @@ class TorPlugin implements DuplexPlugin, EventHandler { if(LOG.isLoggable(INFO)) LOG.info(severity + " " + msg); } - public void unrecognized(String type, String msg) {} + public void unrecognized(String type, String msg) { + if(LOG.isLoggable(INFO)) LOG.info(type + " " + msg); + } private static class WriteObserver extends FileObserver {