[or-cvs] Rename ManageConnections to LeaveStreamsUnattached. Appare...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv6198/src/or

Modified Files:
	config.c connection_edge.c or.h 
Log Message:
Rename ManageConnections to LeaveStreamsUnattached.  Apparently, there was a missing "TorShould" that was mistaken for an "IWantTo".

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- config.c	22 Mar 2005 19:01:46 -0000	1.326
+++ config.c	27 Mar 2005 06:25:33 -0000	1.327
@@ -174,7 +174,7 @@
   VAR("SysLog",              LINELIST_S, OldLogOptions,      NULL),
   OBSOLETE("TrafficShaping"),
   VAR("User",                STRING,   User,                 NULL),
-  VAR("__ManageConnections", BOOL,     ManageConnections,    "1"),
+  VAR("__LeaveStreamsUnattached", BOOL,LeaveStreamsUnattached, "0"),
   { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
 };
 #undef VAR

Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- connection_edge.c	27 Mar 2005 04:55:12 -0000	1.308
+++ connection_edge.c	27 Mar 2005 06:25:33 -0000	1.309
@@ -385,7 +385,7 @@
 {
   control_event_stream_status(conn, STREAM_EVENT_FAILED_RETRIABLE);
   conn->timestamp_lastread = time(NULL);
-  if (get_options()->ManageConnections) {
+  if (! get_options()->LeaveStreamsUnattached) {
     conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
     circuit_detach_stream(circ,conn);
     return connection_ap_handshake_attach_circuit(conn);
@@ -939,7 +939,7 @@
       rep_hist_note_used_port(socks->port, time(NULL)); /* help predict this next time */
       control_event_stream_status(conn, STREAM_EVENT_NEW);
     }
-    if (get_options()->ManageConnections) {
+    if (! get_options()->LeaveStreamsUnattached) {
       conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
       return connection_ap_handshake_attach_circuit(conn);
     } else {

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -d -r1.574 -r1.575
--- or.h	27 Mar 2005 04:55:12 -0000	1.574
+++ or.h	27 Mar 2005 06:25:33 -0000	1.575
@@ -1063,9 +1063,9 @@
                                 * the control system. */
   int CookieAuthentication; /**< Boolean: do we enable cookie-based auth for
                              * the control system? */
-  int ManageConnections; /**< Boolean: Does Tor attach new connections to
-                          * circuits itself (1), or does it let the controller
-                          * deal? (0) */
+  int LeaveStreamsUnattached; /**< Boolean: Does Tor attach new streams to
+                          * circuits itself (0), or does it expect a controller
+                          * to cope? (1) */
   int ShutdownWaitLength; /**< When we get a SIGINT and we're a server, how
                            * long do we wait before exiting? */
 } or_options_t;