jtorctl.patch

diff -Bbur jtorctl/net/freehaven/tor/control/Bytes.java jtorctl-briar/net/freehaven/tor/control/Bytes.java
--- jtorctl/net/freehaven/tor/control/Bytes.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/Bytes.java	2013-05-16 19:56:30.000000000 +0100
@@ -16,46 +16,43 @@
     /** Write the two-byte value in 's' into the byte array 'ba', starting at
      * the index 'pos'. */
     public static void setU16(byte[] ba, int pos, short s) {
-        ba[pos]   = (byte)((s >> 8) & 0xff);
-        ba[pos+1] = (byte)((s     ) & 0xff);
+		ba[pos] = (byte) ((s >> 8) & 0xff);
+		ba[pos + 1] = (byte) (s & 0xff);
     }
 
     /** Write the four-byte value in 'i' into the byte array 'ba', starting at
      * the index 'pos'. */
     public static void setU32(byte[] ba, int pos, int i) {
-        ba[pos]   = (byte)((i >> 24) & 0xff);
-        ba[pos+1] = (byte)((i >> 16) & 0xff);
-        ba[pos+2] = (byte)((i >>  8) & 0xff);
-        ba[pos+3] = (byte)((i      ) & 0xff);
+		ba[pos] = (byte) ((i >> 24) & 0xff);
+		ba[pos + 1] = (byte) ((i >> 16) & 0xff);
+		ba[pos + 2] = (byte) ((i >>  8) & 0xff);
+		ba[pos + 3] = (byte) (i & 0xff);
     }
 
     /** Return the four-byte value starting at index 'pos' within 'ba' */
     public static int getU32(byte[] ba, int pos) {
-        return
-            ((ba[pos  ]&0xff)<<24) |
-            ((ba[pos+1]&0xff)<<16) |
-            ((ba[pos+2]&0xff)<< 8)  |
-            ((ba[pos+3]&0xff));
+		return ((ba[pos] & 0xff) << 24) |
+				((ba[pos + 1] & 0xff) << 16) |
+				((ba[pos + 2] & 0xff) << 8)  |
+				((ba[pos + 3] & 0xff));
     }
 
     public static String getU32S(byte[] ba, int pos) {
-        return String.valueOf( (getU32(ba,pos))&0xffffffffL );
+		return String.valueOf((getU32(ba, pos)) & 0xffffffffL);
     }
 
     /** Return the two-byte value starting at index 'pos' within 'ba' */
     public static int getU16(byte[] ba, int pos) {
-        return
-            ((ba[pos  ]&0xff)<<8) |
-            ((ba[pos+1]&0xff));
+		return ((ba[pos] & 0xff) << 8) |
+				((ba[pos + 1] & 0xff));
     }
 
     /** Return the string starting at position 'pos' of ba and extending
      * until a zero byte or the end of the string. */
     public static String getNulTerminatedStr(byte[] ba, int pos) {
-        int len, maxlen = ba.length-pos;
-        for (len=0; len<maxlen; ++len) {
-            if (ba[pos+len] == 0)
-                break;
+		int len, maxlen = ba.length - pos;
+		for(len = 0; len < maxlen; ++len) {
+			if(ba[pos + len] == 0) break;
         }
         return new String(ba, pos, len);
     }
@@ -64,18 +61,16 @@
      * Read bytes from 'ba' starting at 'pos', dividing them into strings
      * along the character in 'split' and writing them into 'lst'
      */
-    public static void splitStr(List<String> lst, byte[] ba, int pos, byte split) {
-        while (pos < ba.length && ba[pos] != 0) {
+	public static void splitStr(List<String> lst, byte[] ba, int pos,
+			byte split) {
+		while(pos < ba.length && ba[pos] != 0) {
             int len;
-            for (len=0; pos+len < ba.length; ++len) {
-                if (ba[pos+len] == 0 || ba[pos+len] == split)
-                    break;
+			for(len = 0; pos + len < ba.length; ++len) {
+				if(ba[pos + len] == 0 || ba[pos + len] == split) break;
             }
-            if (len>0)
-                lst.add(new String(ba, pos, len));
+			if(len > 0) lst.add(new String(ba, pos, len));
             pos += len;
-            if (ba[pos] == split)
-                ++pos;
+			if(ba[pos] == split) ++pos;
         }
     }
 
@@ -86,11 +81,8 @@
     public static List<String> splitStr(List<String> lst, String str) {
         // split string on spaces, include trailing/leading
         String[] tokenArray = str.split(" ", -1);
-        if (lst == null) {
-            lst = Arrays.asList( tokenArray );
-        } else {
-            lst.addAll( Arrays.asList( tokenArray ) );
-        }
+		if(lst == null) lst = Arrays.asList(tokenArray);
+		else lst.addAll(Arrays.asList(tokenArray));
         return lst;
     }
 
@@ -101,10 +93,10 @@
 
     public static final String hex(byte[] ba) {
         StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < ba.length; ++i) {
-            int b = (ba[i]) & 0xff;
+		for(int i = 0; i < ba.length; ++i) {
+			int b = ba[i] & 0xff;
             buf.append(NYBBLES[b >> 4]);
-            buf.append(NYBBLES[b&0x0f]);
+			buf.append(NYBBLES[b & 0x0f]);
         }
         return buf.toString();
     }
diff -Bbur jtorctl/net/freehaven/tor/control/ConfigEntry.java jtorctl-briar/net/freehaven/tor/control/ConfigEntry.java
--- jtorctl/net/freehaven/tor/control/ConfigEntry.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/ConfigEntry.java	2013-05-16 19:56:30.000000000 +0100
@@ -4,6 +4,11 @@
 
 /** A single key-value pair from Tor's configuration. */
 public class ConfigEntry {
+
+	public final String key;
+	public final String value;
+	public final boolean is_default;
+
     public ConfigEntry(String k, String v) {
         key = k;
         value = v;
@@ -14,7 +20,4 @@
         value = "";
         is_default = true;
     }
-    public final String key;
-    public final String value;
-    public final boolean is_default;
 }
diff -Bbur jtorctl/net/freehaven/tor/control/EventHandler.java jtorctl-briar/net/freehaven/tor/control/EventHandler.java
--- jtorctl/net/freehaven/tor/control/EventHandler.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/EventHandler.java	2013-05-16 19:56:30.000000000 +0100
@@ -9,9 +9,10 @@
  * @see TorControlConnection#setEvents
  */
 public interface EventHandler {
+
     /**
-     * Invoked when a circuit's status has changed.
-     * Possible values for <b>status</b> are:
+	 * Invoked when a circuit's status has changed.  Possible values for
+	 * <b>status</b> are:
      * <ul>
      *   <li>"LAUNCHED" :  circuit ID assigned to new circuit</li>
      *   <li>"BUILT"    :  all hops finished, can now accept streams</li>
@@ -19,7 +20,6 @@
      *   <li>"FAILED"   :  circuit closed (was not built)</li>
      *   <li>"CLOSED"   :  circuit closed (was built)</li>
      *	</ul>
-     * 
      * <b>circID</b> is the alphanumeric identifier of the affected circuit,
      * and <b>path</b> is a comma-separated list of alphanumeric ServerIDs.
      */
@@ -24,9 +24,10 @@
      * and <b>path</b> is a comma-separated list of alphanumeric ServerIDs.
      */
     public void circuitStatus(String status, String circID, String path);
+
     /**
-     * Invoked when a stream's status has changed.
-     * Possible values for <b>status</b> are:
+	 * Invoked when a stream's status has changed.  Possible values for
+	 * <b>status</b> are:
      * <ul>
      *   <li>"NEW"         :  New request to connect</li>
      *   <li>"NEWRESOLVE"  :  New request to resolve an address</li>
@@ -37,7 +38,6 @@
      *   <li>"CLOSED"      :  Stream closed</li>
      *   <li>"DETACHED"    :  Detached from circuit; still retriable.</li>
      *	</ul>
-     *
      * <b>streamID</b> is the alphanumeric identifier of the affected stream,
      * and its <b>target</b> is specified as address:port.
      */
@@ -42,18 +42,21 @@
      * and its <b>target</b> is specified as address:port.
      */
     public void streamStatus(String status, String streamID, String target);
+
     /**
-     * Invoked when the status of a connection to an OR has changed.
-     * Possible values for <b>status</b> are ["LAUNCHED" | "CONNECTED" | "FAILED" | "CLOSED"].
-     * <b>orName</b> is the alphanumeric identifier of the OR affected.
+	 * Invoked when the status of a connection to an OR has changed.  Possible
+	 * values for <b>status</b> are ["LAUNCHED" | "CONNECTED" | "FAILED" |
+	 * "CLOSED"]. <b>orName</b> is the alphanumeric identifier of the OR
+	 * affected.
      */
     public void orConnStatus(String status, String orName);
+
     /**
-     * Invoked once per second. <b>read</b> and <b>written</b> are
-     * the number of bytes read and written, respectively, in
-     * the last second.
+	 * Invoked once per second. <b>read</b> and <b>written</b> are the number
+	 * of bytes read and written, respectively, in the last second.
      */
     public void bandwidthUsed(long read, long written);
+
     /**
      * Invoked whenever Tor learns about new ORs.  The <b>orList</b> object
      * contains the alphanumeric ServerIDs associated with the new ORs.
@@ -59,17 +62,18 @@
      * contains the alphanumeric ServerIDs associated with the new ORs.
      */
     public void newDescriptors(java.util.List<String> orList);
+
     /**
-     * Invoked when Tor logs a message.
-     * <b>severity</b> is one of ["DEBUG" | "INFO" | "NOTICE" | "WARN" | "ERR"],
-     * and <b>msg</b> is the message string.
+	 * Invoked when Tor logs a message.  <b>severity</b> is one of ["DEBUG" |
+	 * "INFO" | "NOTICE" | "WARN" | "ERR"], and <b>msg</b> is the message
+	 * string.
      */
     public void message(String severity, String msg);
+
     /**
-     * Invoked when an unspecified message is received.
-     * <type> is the message type, and <msg> is the message string.
+	 * Invoked when an unspecified message is received.  <type> is the message
+	 * type, and <msg> is the message string.
      */
     public void unrecognized(String type, String msg);
-
 }
 
diff -Bbur jtorctl/net/freehaven/tor/control/examples/DebuggingEventHandler.java jtorctl-briar/net/freehaven/tor/control/examples/DebuggingEventHandler.java
--- jtorctl/net/freehaven/tor/control/examples/DebuggingEventHandler.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/examples/DebuggingEventHandler.java	2013-05-16 19:56:30.000000000 +0100
@@ -3,42 +3,48 @@
 package net.freehaven.tor.control.examples;
 
 import java.io.PrintWriter;
-import java.util.Iterator;
+import java.util.List;
+
 import net.freehaven.tor.control.EventHandler;
 
 public class DebuggingEventHandler implements EventHandler {
 
-    protected PrintWriter out;
+	private final PrintWriter out;
 
-    public DebuggingEventHandler(PrintWriter p) {
-        out = p;
+	public DebuggingEventHandler(PrintWriter out) {
+		this.out = out;
     }
 
     public void circuitStatus(String status, String circID, String path) {
-        out.println("Circuit "+circID+" is now "+status+" (path="+path+")");
+		out.println("Circuit " + circID + " is now " + status +
+				" (path=" + path + ")");
     }
+
     public void streamStatus(String status, String streamID, String target) {
-        out.println("Stream "+streamID+" is now "+status+" (target="+target+")");
+		out.println("Stream " + streamID + " is now " + status +
+				" (target=" + target + ")");
     }
+
     public void orConnStatus(String status, String orName) {
-        out.println("OR connection to "+orName+" is now "+status);
+		out.println("OR connection to " + orName + " is now " + status);
     }
+
     public void bandwidthUsed(long read, long written) {
-        out.println("Bandwidth usage: "+read+" bytes read; "+
-                    written+" bytes written.");
+		out.println("Bandwidth usage: " + read + " bytes read; " +
+				written +" bytes written.");
     }
-    public void newDescriptors(java.util.List<String> orList) {
+
+	public void newDescriptors(List<String> orList) {
         out.println("New descriptors for routers:");
-        for (Iterator<String> i = orList.iterator(); i.hasNext(); )
-            out.println("   "+i.next());
+		for(String or : orList) out.println("   " + or);
     }
+
     public void message(String type, String msg) {
-        out.println("["+type+"] "+msg.trim());
+		out.println("[" + type + "] " + msg.trim());
     }
 
     public void unrecognized(String type, String msg) {
-        out.println("unrecognized event ["+type+"] "+msg.trim());
+		out.println("unrecognized event [" + type + "] " + msg.trim());
     }
-
 }
 
diff -Bbur jtorctl/net/freehaven/tor/control/examples/Main.java jtorctl-briar/net/freehaven/tor/control/examples/Main.java
--- jtorctl/net/freehaven/tor/control/examples/Main.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/examples/Main.java	2013-05-16 19:56:30.000000000 +0100
@@ -2,59 +2,60 @@
 // See LICENSE file for copying information
 package net.freehaven.tor.control.examples;
 
-import net.freehaven.tor.control.*;
-import java.io.PrintWriter;
+import java.io.EOFException;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.Socket;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
-import java.util.Iterator;
+
+import net.freehaven.tor.control.ConfigEntry;
+import net.freehaven.tor.control.PasswordDigest;
+import net.freehaven.tor.control.TorControlCommands;
+import net.freehaven.tor.control.TorControlConnection;
+import net.freehaven.tor.control.TorControlError;
 
 public class Main implements TorControlCommands {
 
     public static void main(String args[]) {
-        if (args.length < 1) {
+		if(args.length < 1) {
             System.err.println("No command given.");
             return;
         }
         try {
-            if (args[0].equals("set-config")) {
+			if(args[0].equals("set-config")) {
                 setConfig(args);
-            } else if (args[0].equals("get-config")) {
+			} else if(args[0].equals("get-config")) {
                 getConfig(args);
-            } else if (args[0].equals("get-info")) {
+			} else if(args[0].equals("get-info")) {
                 getInfo(args);
-            } else if (args[0].equals("listen")) {
+			} else if(args[0].equals("listen")) {
                 listenForEvents(args);
-            } else if (args[0].equals("signal")) {
+			} else if(args[0].equals("signal")) {
                 signal(args);
-            } else if (args[0].equals("auth")) {
+			} else if(args[0].equals("auth")) {
                 authDemo(args);
             } else {
                 System.err.println("Unrecognized command: "+args[0]);
             }
-        } catch (java.io.EOFException ex) {
+		} catch(EOFException ex) {
             System.out.println("Control socket closed by Tor.");
-        } catch (IOException ex) {
-            System.err.println("IO exception when talking to Tor process: "+
+		} catch(TorControlError ex) {
+			System.err.println("Error from Tor process: " +
+					ex + " [" + ex.getErrorMsg() + "]");
+		} catch(IOException ex) {
+			System.err.println("IO exception when talking to Tor process: " +
                                ex);
             ex.printStackTrace(System.err);
-        } catch (TorControlError ex) {
-            System.err.println("Error from Tor process: "+
-                               ex+" ["+ex.getErrorMsg()+"]");
         }
     }
 
     private static TorControlConnection getConnection(String[] args,
-                                                      boolean daemon)
-        throws IOException {
-        TorControlConnection conn = TorControlConnection.getConnection(
-                                    new java.net.Socket("127.0.0.1", 9100));
-        //if (conn instanceof TorControlConnection1) {
-        //    System.err.println("Debugging");
-        //    ((TorControlConnection1)conn).setDebugging(System.err);
-        //}
+			boolean daemon) throws IOException {
+		Socket s = new Socket("127.0.0.1", 9100);
+		TorControlConnection conn = new TorControlConnection(s);
         conn.launchThread(daemon);
         conn.authenticate(new byte[0]);
         return conn;
@@ -71,57 +72,52 @@
         ArrayList<String> lst = new ArrayList<String>();
         int i = 1;
         boolean save = false;
-        if (args[i].equals("-save")) {
+		if(args[i].equals("-save")) {
             save = true;
             ++i;
         }
-        for (; i < args.length; i +=2) {
-            lst.add(args[i]+" "+args[i+1]);
+		for(; i < args.length; i +=2) {
+			lst.add(args[i] + " " + args[i + 1]);
         }
         conn.setConf(lst);
-        if (save) {
-            conn.saveConf();
-        }
+		if(save) conn.saveConf();
     }
 
     public static void getConfig(String[] args) throws IOException {
         // Usage: get-config key key key
         TorControlConnection conn = getConnection(args);
-        List<ConfigEntry> lst = conn.getConf(Arrays.asList(args).subList(1,args.length));
-        for (Iterator<ConfigEntry> i = lst.iterator(); i.hasNext(); ) {
-            ConfigEntry e = i.next();
-            System.out.println("KEY: "+e.key);
-            System.out.println("VAL: "+e.value);
+		List<String> keys = Arrays.asList(args).subList(1, args.length);
+		List<ConfigEntry> lst = conn.getConf(keys);
+		for(ConfigEntry e : lst) {
+			System.out.println("KEY: " + e.key);
+			System.out.println("VAL: " + e.value);
         }
     }
 
     public static void getInfo(String[] args) throws IOException {
         TorControlConnection conn = getConnection(args);
-        Map<String,String> m = conn.getInfo(Arrays.asList(args).subList(1,args.length));
-        for (Iterator<Map.Entry<String, String>> i = m.entrySet().iterator(); i.hasNext(); ) {
-            Map.Entry<String,String> e = i.next();
-            System.out.println("KEY: "+e.getKey());
-            System.out.println("VAL: "+e.getValue());
+		List<String> keys = Arrays.asList(args).subList(1, args.length);
+		Map<String, String> m = conn.getInfo(keys);
+		for(Map.Entry<String, String> e : m.entrySet()) {
+			System.out.println("KEY: " + e.getKey());
+			System.out.println("VAL: " + e.getValue());
         }
     }
 
     public static void listenForEvents(String[] args) throws IOException {
         // Usage: listen [circ|stream|orconn|bw|newdesc|info|notice|warn|error]*
         TorControlConnection conn = getConnection(args, false);
-        ArrayList<String> lst = new ArrayList<String>();
-        for (int i = 1; i < args.length; ++i) {
-            lst.add(args[i]);
-        }
+		List<String> events = Arrays.asList(args).subList(1, args.length);
         conn.setEventHandler(
             new DebuggingEventHandler(new PrintWriter(System.out, true)));
-        conn.setEvents(lst);
+		conn.setEvents(events);
     }
 
     public static void signal(String[] args) throws IOException {
         // Usage signal [reload|shutdown|dump|debug|halt]
         TorControlConnection conn = getConnection(args, false);
         // distinguish shutdown signal from other signals
-        if ("SHUTDOWN".equalsIgnoreCase(args[1])
+		if("SHUTDOWN".equalsIgnoreCase(args[1])
         		|| "HALT".equalsIgnoreCase(args[1])) {
         	conn.shutdownTor(args[1].toUpperCase());
         } else {
@@ -130,17 +126,13 @@
     }
 
     public static void authDemo(String[] args) throws IOException {
-
         PasswordDigest pwd = PasswordDigest.generateDigest();
-        java.net.Socket s = new java.net.Socket("127.0.0.1", 9100);
-        TorControlConnection conn = TorControlConnection.getConnection(s);
+		Socket s = new Socket("127.0.0.1", 9100);
+		TorControlConnection conn = new TorControlConnection(s);
         conn.launchThread(true);
         conn.authenticate(new byte[0]);
-
         conn.setConf("HashedControlPassword", pwd.getHashedPassword());
-
-        conn = TorControlConnection.getConnection(
-                                    new java.net.Socket("127.0.0.1", 9100));
+		conn = new TorControlConnection(new Socket("127.0.0.1", 9100));
         conn.launchThread(true);
         conn.authenticate(pwd.getSecret());
     }
diff -Bbur jtorctl/net/freehaven/tor/control/PasswordDigest.java jtorctl-briar/net/freehaven/tor/control/PasswordDigest.java
--- jtorctl/net/freehaven/tor/control/PasswordDigest.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/PasswordDigest.java	2013-05-16 19:56:30.000000000 +0100
@@ -2,19 +2,20 @@
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
 
+import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.MessageDigest;
 
 /**
- * A hashed digest of a secret password (used to set control connection
+ * A hashed digest of a secret password(used to set control connection
  * security.)
  *
  * For the actual hashing algorithm, see RFC2440's secret-to-key conversion.
  */
 public class PasswordDigest {
 
-    byte[] secret;
-    String hashedKey;
+	private final byte[] secret;
+	private final String hashedKey;
 
     /** Return a new password digest with a random secret and salt. */
     public static PasswordDigest generateDigest() {
@@ -35,17 +36,16 @@
      */
     public PasswordDigest(byte[] secret, byte[] specifier) {
         this.secret = secret.clone();
-        if (specifier == null) {
+		if(specifier == null) {
             specifier = new byte[9];
             SecureRandom rng = new SecureRandom();
             rng.nextBytes(specifier);
             specifier[8] = 96;
         }
-        hashedKey = "16:"+encodeBytes(secretToKey(secret, specifier));
+		hashedKey = "16:" + Bytes.hex(secretToKey(secret, specifier));
     }
 
-    /** Return the secret used to generate this password hash.
-     */
+	/** Return the secret used to generate this password hash. */
     public byte[] getSecret() {
         return secret.clone();
     }
@@ -63,17 +63,17 @@
         MessageDigest d;
         try {
             d = MessageDigest.getInstance("SHA-1");
-        } catch (java.security.NoSuchAlgorithmException ex) {
+		} catch(NoSuchAlgorithmException ex) {
             throw new RuntimeException("Can't run without sha-1.");
         }
-        int c = (specifier[8])&0xff;
-        int count = (16 + (c&15)) << ((c>>4) + EXPBIAS);
+		int c = specifier[8] & 0xff;
+		int count = (16 + (c & 15)) << ((c >> 4) + EXPBIAS);
 
-        byte[] tmp = new byte[8+secret.length];
+		byte[] tmp = new byte[8 + secret.length];
         System.arraycopy(specifier, 0, tmp, 0, 8);
         System.arraycopy(secret, 0, tmp, 8, secret.length);
-        while (count > 0) {
-            if (count >= tmp.length) {
+		while(count > 0) {
+			if(count >= tmp.length) {
                 d.update(tmp);
                 count -= tmp.length;
             } else {
@@ -81,17 +81,9 @@
                 count = 0;
             }
         }
-        byte[] key = new byte[20+9];
+		byte[] key = new byte[20 + 9];
         System.arraycopy(d.digest(), 0, key, 9, 20);
         System.arraycopy(specifier, 0, key, 0, 9);
         return key;
     }
-
-    /** Return a hexadecimal encoding of a byte array. */
-    // XXX There must be a better way to do this in Java.
-    private static final String encodeBytes(byte[] ba) {
-        return Bytes.hex(ba);
-    }
-
 }
-
diff -Bbur jtorctl/net/freehaven/tor/control/TorControlCommands.java jtorctl-briar/net/freehaven/tor/control/TorControlCommands.java
--- jtorctl/net/freehaven/tor/control/TorControlCommands.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/TorControlCommands.java	2013-05-16 19:56:30.000000000 +0100
@@ -119,7 +119,10 @@
     public static final byte OR_CONN_STATUS_CLOSED = 0x03;
 
     public static final String[] OR_CONN_STATUS_NAMES = {
-        "LAUNCHED","CONNECTED","FAILED","CLOSED"
+		"LAUNCHED",
+		"CONNECTED",
+		"FAILED",
+		"CLOSED"
     };
 
     public static final byte SIGNAL_HUP = 0x01;
diff -Bbur jtorctl/net/freehaven/tor/control/TorControlConnection.java jtorctl-briar/net/freehaven/tor/control/TorControlConnection.java
--- jtorctl/net/freehaven/tor/control/TorControlConnection.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/TorControlConnection.java	2013-05-16 19:56:30.000000000 +0100
@@ -2,120 +2,107 @@
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
 
+import java.io.BufferedReader;
 import java.io.IOException;
-import java.net.SocketException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.Socket;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
-import java.util.concurrent.CancellationException;
 
 /** A connection to a running Tor process as specified in control-spec.txt. */
-public class TorControlConnection implements TorControlCommands
-{
+public class TorControlConnection implements TorControlCommands {
 
-    protected EventHandler handler;
+	private final LinkedList<Waiter> waiters;
+	private final BufferedReader input;
+	private final Writer output;
 
-    protected LinkedList<Waiter> waiters;
+	private ControlParseThread thread; // Locking: this
 
-    protected ControlParseThread thread;
+	private volatile EventHandler handler;
+	private volatile PrintWriter debugOutput;
+	private volatile IOException parseThreadException;
 
-    protected java.io.BufferedReader input;
+	private static class Waiter {
     
-    protected java.io.Writer output;
-    
-    protected java.io.PrintWriter debugOutput;
-    
-    static class Waiter {
         List<ReplyLine> response;
-        public synchronized List<ReplyLine> getResponse() {
-            try {
-                while (response == null) {
-                    wait();
-                }
-            } catch (InterruptedException ex) {
-                throw new CancellationException(
-                    "Please don't interrupt library calls.");
-            }
+
+		synchronized List<ReplyLine> getResponse() throws InterruptedException {
+			while(response == null) wait();
             return response;
         }
-        public synchronized void setResponse(List<ReplyLine> response) {
+
+		synchronized void setResponse(List<ReplyLine> response) {
             this.response = response;
             notifyAll();
         }
     }
 
-    static class ReplyLine {
-        public String status;
-        public String msg;
-        public String rest;
+	private static class ReplyLine {
+
+		final String status;
+		final String msg;
+		final String rest;
 
         ReplyLine(String status, String msg, String rest) {
-            this.status = status; this.msg = msg; this.rest = rest;
-        }
+			this.status = status;
+			this.msg = msg;
+			this.rest = rest;
     }
-    
-    public static TorControlConnection getConnection(java.net.Socket sock)
-        throws IOException
-    {
-        return new TorControlConnection(sock);
     }
 
     /** Create a new TorControlConnection to communicate with Tor over
      * a given socket.  After calling this constructor, it is typical to
      * call launchThread and authenticate. */
-    public TorControlConnection(java.net.Socket connection)
-        throws IOException {
-        this(connection.getInputStream(), connection.getOutputStream());
+	public TorControlConnection(Socket s) throws IOException {
+		this(s.getInputStream(), s.getOutputStream());
     }
 
     /** Create a new TorControlConnection to communicate with Tor over
      * an arbitrary pair of data streams.
      */
-    public TorControlConnection(java.io.InputStream i, java.io.OutputStream o) {
-        this(new java.io.InputStreamReader(i),
-             new java.io.OutputStreamWriter(o));
+	public TorControlConnection(InputStream i, OutputStream o) {
+		this(new InputStreamReader(i), new OutputStreamWriter(o));
     }
 
-    public TorControlConnection(java.io.Reader i, java.io.Writer o) {
-        this.output = o;
-        if (i instanceof java.io.BufferedReader)
-            this.input = (java.io.BufferedReader) i;
-        else
-            this.input = new java.io.BufferedReader(i);
-
-        this.waiters = new LinkedList<Waiter>();
+	public TorControlConnection(Reader i, Writer o) {
+		if(i instanceof BufferedReader) input = (BufferedReader) i;
+		else input = new BufferedReader(i);
+		output = o;
+		waiters = new LinkedList<Waiter>();
     }
 
-    protected final void writeEscaped(String s) throws IOException {
+	private void writeEscaped(String s) throws IOException {
         StringTokenizer st = new StringTokenizer(s, "\n");
-        while (st.hasMoreTokens()) {
+		while(st.hasMoreTokens()) {
             String line = st.nextToken();
-            if (line.startsWith("."))
-                line = "."+line;
-            if (line.endsWith("\r"))
-                line += "\n";
-            else
-                line += "\r\n";
-            if (debugOutput != null)
-                debugOutput.print(">> "+line);
+			if(line.startsWith(".")) line = "." + line;
+			if(line.endsWith("\r")) line += "\n";
+			else line += "\r\n";
+			if(debugOutput != null) debugOutput.print(">> " + line);
             output.write(line);
         }
         output.write(".\r\n");
-        if (debugOutput != null)
-            debugOutput.print(">> .\n");
+		if(debugOutput != null) debugOutput.print(">> .\n");
     }
 
-    protected static final String quote(String s) {
+	private static final String quote(String s) {
         StringBuffer sb = new StringBuffer("\"");
-        for (int i = 0; i < s.length(); ++i) {
+		for(int i = 0; i < s.length(); ++i) {
             char c = s.charAt(i);
-            switch (c)
-                {
+			switch (c) {
                 case '\r':
                 case '\n':
                 case '\\':
@@ -128,15 +115,15 @@
         return sb.toString();
     }
 
-    protected final ArrayList<ReplyLine> readReply() throws IOException {
+	private ArrayList<ReplyLine> readReply() throws IOException {
         ArrayList<ReplyLine> reply = new ArrayList<ReplyLine>();
         char c;
         do {
             String line = input.readLine();
-            if (line == null) {
+			if(line == null) {
                 // if line is null, the end of the stream has been reached, i.e.
                 // the connection to Tor has been closed!
-                if (reply.isEmpty()) {
+				if(reply.isEmpty()) {
                         // nothing received so far, can exit cleanly
                         return reply;
                 } 
@@ -144,91 +131,86 @@
                 throw new TorControlSyntaxError("Connection to Tor " +
                      " broke down while receiving reply!");
             }
-            if (debugOutput != null)
-                debugOutput.println("<< "+line);
-            if (line.length() < 4)
-                throw new TorControlSyntaxError("Line (\""+line+"\") too short");
-            String status = line.substring(0,3);
+			if(debugOutput != null) debugOutput.println("<< " + line);
+			if(line.length() < 4) {
+				throw new TorControlSyntaxError("Line (\"" + line +
+						"\") too short");
+			}
+			String status = line.substring(0, 3);
             c = line.charAt(3);
             String msg = line.substring(4);
             String rest = null;
-            if (c == '+') {
+			if(c == '+') {
                 StringBuffer data = new StringBuffer();
-                while (true) {
+				while(true) {
                     line = input.readLine();
-                    if (debugOutput != null)
-                        debugOutput.print("<< "+line);
-                    if (line.equals("."))
-                        break;
-                    else if (line.startsWith("."))
-                        line = line.substring(1);
+					if(debugOutput != null) debugOutput.print("<< " + line);
+					if(line.equals(".")) break;
+					if(line.startsWith(".")) line = line.substring(1);
                     data.append(line).append('\n');
                 }
                 rest = data.toString();
             }
             reply.add(new ReplyLine(status, msg, rest));
-        } while (c != ' ');
-
+		} while(c != ' ');
         return reply;
     }
 
-    protected synchronized List<ReplyLine> sendAndWaitForResponse(String s,String rest)
-        throws IOException {
+	private synchronized List<ReplyLine> sendAndWaitForResponse(String s,
+			String rest) throws IOException {
+		if(parseThreadException != null) throw parseThreadException;
         checkThread();
         Waiter w = new Waiter();
-        if (debugOutput != null)
-            debugOutput.print(">> "+s);
-        synchronized (waiters) {
+		if(debugOutput != null) debugOutput.print(">> " + s);
+		synchronized(waiters) {
             output.write(s);
-            if (rest != null)
-                writeEscaped(rest);
+			if(rest != null) writeEscaped(rest);
             output.flush();
             waiters.addLast(w);
         }
-        List<ReplyLine> lst = w.getResponse();
-        for (Iterator<ReplyLine> i = lst.iterator(); i.hasNext(); ) {
-            ReplyLine c = i.next();
-            if (! c.status.startsWith("2"))
-                throw new TorControlError("Error reply: "+c.msg);
+		List<ReplyLine> lst;
+		try {
+			lst = w.getResponse();
+		} catch(InterruptedException ex) {
+			throw new IOException(ex);
+		}
+		for(ReplyLine line : lst) {
+			if(!line.status.startsWith("2"))
+				throw new TorControlError("Error reply: " + line.msg);
         }
         return lst;
     }
 
     /** Helper: decode a CMD_EVENT command and dispatch it to our
      * EventHandler (if any). */
-    protected void handleEvent(ArrayList<ReplyLine> events) {
-        if (handler == null)
-            return;
-
-        for (Iterator<ReplyLine> i = events.iterator(); i.hasNext(); ) {
-            ReplyLine line = i.next();
+	private void handleEvent(ArrayList<ReplyLine> events) {
+		if(handler == null) return;
+		for(ReplyLine line : events) {
             int idx = line.msg.indexOf(' ');
             String tp = line.msg.substring(0, idx).toUpperCase();
             String rest = line.msg.substring(idx+1);
-            if (tp.equals("CIRC")) {
+			if(tp.equals("CIRC")) {
                 List<String> lst = Bytes.splitStr(null, rest);
-                handler.circuitStatus(lst.get(1),
-                                      lst.get(0),
-                                      lst.get(1).equals("LAUNCHED")
-                                          || lst.size() < 2 ? ""
-                                          : lst.get(2));
-            } else if (tp.equals("STREAM")) {
+				String path;
+				if(lst.get(1).equals("LAUNCHED") || lst.size() < 2) path = "";
+				else path = lst.get(2);
+				handler.circuitStatus(lst.get(1), lst.get(0), path);
+			} else if(tp.equals("STREAM")) {
                 List<String> lst = Bytes.splitStr(null, rest);
-                handler.streamStatus(lst.get(1),
-                                     lst.get(0),
-                                     lst.get(3));
+				handler.streamStatus(lst.get(1), lst.get(0), lst.get(3));
                 // XXXX circID.
-            } else if (tp.equals("ORCONN")) {
+			} else if(tp.equals("ORCONN")) {
                 List<String> lst = Bytes.splitStr(null, rest);
                 handler.orConnStatus(lst.get(1), lst.get(0));
-            } else if (tp.equals("BW")) {
+			} else if(tp.equals("BW")) {
                 List<String> lst = Bytes.splitStr(null, rest);
-                handler.bandwidthUsed(Integer.parseInt(lst.get(0)),
-                                      Integer.parseInt(lst.get(1)));
-            } else if (tp.equals("NEWDESC")) {
+				int read = Integer.parseInt(lst.get(0));
+				int written = Integer.parseInt(lst.get(1));
+				handler.bandwidthUsed(read, written);
+			} else if(tp.equals("NEWDESC")) {
                 List<String> lst = Bytes.splitStr(null, rest);
                 handler.newDescriptors(lst);
-            } else if (tp.equals("DEBUG") ||
+			} else if(tp.equals("DEBUG") ||
                        tp.equals("INFO") ||
                        tp.equals("NOTICE") ||
                        tp.equals("WARN") ||
@@ -240,23 +222,22 @@
         }
     }
 
-
     /** Sets <b>w</b> as the PrintWriter for debugging output, 
     * which writes out all messages passed between Tor and the controller.  
-    * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
-    * by "\<\<"
+	 * Outgoing messages are preceded by "\>\>" and incoming messages are
+	 * preceded by "\<\<"
     */
-    public void setDebugging(java.io.PrintWriter w) {
+	public void setDebugging(PrintWriter w) {
         debugOutput = w;
     }
     
     /** Sets <b>s</b> as the PrintStream for debugging output, 
     * which writes out all messages passed between Tor and the controller.  
-    * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
-    * by "\<\<"
+	 * Outgoing messages are preceded by "\>\>" and incoming messages are
+	 * preceded by "\<\<"
     */
-    public void setDebugging(java.io.PrintStream s) {
-        debugOutput = new java.io.PrintWriter(s, true);
+	public void setDebugging(PrintStream s) {
+		debugOutput = new PrintWriter(s, true);
     }
 
     /** Set the EventHandler object that will be notified of any
@@ -271,52 +252,43 @@
      * This is necessary to handle asynchronous events and synchronous
      * responses that arrive independantly over the same socket.
      */
-    public Thread launchThread(boolean daemon) {
+	public synchronized Thread launchThread(boolean daemon) {
     	ControlParseThread th = new ControlParseThread();
-        if (daemon)
-            th.setDaemon(true);
+		if(daemon) th.setDaemon(true);
         th.start();
-        this.thread = th;
+		thread = th;
         return th;
     }
 
-    protected class ControlParseThread extends Thread {
-    	boolean stopped = false;
+	private class ControlParseThread extends Thread {
+
         @Override
     	public void run() {
             try {
                 react();
-            } catch (SocketException ex) {
-            	if (stopped) // we expected this exception
-                    return;
-                throw new RuntimeException(ex);
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
+			} catch(IOException ex) {
+				parseThreadException = ex;
         }
-        public void stopListening() {
-            this.stopped = true;
         }
     }