From 5ea0cce2bfcd572aaeb371217839d94097d5fe01 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
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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

delta 7627
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
M$c9oP^k?V)0i2LMT>t<8

diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
index be89d867ee..02d8d9c11e 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 {
 
-- 
GitLab