[or-cvs] Finish making new (v1) controller logic and multiplexing lo...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/control/java/net/freehaven/tor/control/examples
In directory moria:/tmp/cvs-serv21811/java/net/freehaven/tor/control/examples

Modified Files:
	DebuggingEventHandler.java Main.java 
Log Message:
Finish making new (v1) controller logic and multiplexing logic work in Python and Java controllers. Try out example code a bit.

Index: DebuggingEventHandler.java
===================================================================
RCS file: /home/or/cvsroot/control/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DebuggingEventHandler.java	23 Jun 2005 21:36:06 -0000	1.2
+++ DebuggingEventHandler.java	24 Jun 2005 18:03:27 -0000	1.3
@@ -41,4 +41,5 @@
         out.println("unrecognized event ["+type+"] "+msg.trim());
     }
 
-}
\ No newline at end of file
+}
+

Index: Main.java
===================================================================
RCS file: /home/or/cvsroot/control/java/net/freehaven/tor/control/examples/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Main.java	23 Jun 2005 21:36:06 -0000	1.2
+++ Main.java	24 Jun 2005 18:03:27 -0000	1.3
@@ -49,8 +49,8 @@
     private static TorControlConnection getConnection(String[] args,
                                                       boolean daemon)
         throws IOException {
-        TorControlConnection conn =
-            new TorControlConnection(new java.net.Socket("127.0.0.1", 9100));
+        TorControlConnection conn = TorControlConnection.getConnection(
+                                    new java.net.Socket("127.0.0.1", 9100));
         Thread th = conn.launchThread(daemon);
         conn.authenticate(new byte[0]);
         return conn;
@@ -84,18 +84,20 @@
         // Usage: get-config key key key
         TorControlConnection conn = getConnection(args);
         Map m = conn.getConf(Arrays.asList(args).subList(1,args.length));
-        for (int i = 1; i < args.length; ++i) {
-            System.out.println("KEY: "+args[i]);
-            System.out.println("VAL: "+m.get(args[i]));
+        for (Iterator i = m.entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry e = (Map.Entry) i.next();
+            System.out.println("KEY: "+e.getKey());
+            System.out.println("VAL: "+e.getValue());
         }
     }
 
     public static void getInfo(String[] args) throws IOException {
         TorControlConnection conn = getConnection(args);
         Map m = conn.getInfo(Arrays.asList(args).subList(1,args.length));
-        for (int i = 1; i < args.length; ++i) {
-            System.out.println("KEY: "+args[i]);
-            System.out.println("VAL: "+m.get(args[i]));
+        for (Iterator i = m.entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry e = (Map.Entry) i.next();
+            System.out.println("KEY: "+e.getKey());
+            System.out.println("VAL: "+e.getValue());
         }
     }
 
@@ -145,16 +147,17 @@
 
         PasswordDigest pwd = PasswordDigest.generateDigest();
         java.net.Socket s = new java.net.Socket("127.0.0.1", 9100);
-        TorControlConnection conn = new TorControlConnection(s);
+        TorControlConnection conn = TorControlConnection.getConnection(s);
         conn.launchThread(true);
         conn.authenticate(new byte[0]);
 
         conn.setConf("HashedControlPassword", pwd.getHashedPassword());
 
-        conn =
-            new TorControlConnection(new java.net.Socket("127.0.0.1", 9100));
+        conn = TorControlConnection.getConnection(
+                                    new java.net.Socket("127.0.0.1", 9100));
         conn.launchThread(true);
         conn.authenticate(pwd.getSecret());
     }
 
-}
\ No newline at end of file
+}
+