[or-cvs] r10330: karsten got confused by private_connection, so try calling i (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-05-25 14:25:33 -0400 (Fri, 25 May 2007)
New Revision: 10330

Modified:
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/or.h
Log:
karsten got confused by private_connection, so try calling
it anonymized_connection instead.


Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-05-25 18:22:43 UTC (rev 10329)
+++ tor/trunk/src/or/directory.c	2007-05-25 18:25:33 UTC (rev 10330)
@@ -297,7 +297,7 @@
 void
 directory_initiate_command_routerstatus(routerstatus_t *status,
                                         uint8_t purpose,
-                                        int private_connection,
+                                        int anonymized_connection,
                                         const char *resource,
                                         const char *payload,
                                         size_t payload_len)
@@ -317,7 +317,7 @@
                              status->or_port, status->dir_port,
                              status->version_supports_begindir,
                              status->identity_digest,
-                             purpose, private_connection, resource,
+                             purpose, anonymized_connection, resource,
                              payload, payload_len);
 }
 
@@ -437,13 +437,13 @@
                            uint16_t or_port, uint16_t dir_port,
                            int supports_begindir,
                            const char *digest, uint8_t purpose,
-                           int private_connection, const char *resource,
+                           int anonymized_connection, const char *resource,
                            const char *payload, size_t payload_len)
 {
   dir_connection_t *conn;
   or_options_t *options = get_options();
   int want_to_tunnel = options->TunnelDirConns && supports_begindir &&
-                       !private_connection && or_port &&
+                       !anonymized_connection && or_port &&
                        fascist_firewall_allows_address_or(addr, or_port);
 
   tor_assert(address);
@@ -451,8 +451,8 @@
   tor_assert(dir_port);
   tor_assert(digest);
 
-  log_debug(LD_DIR, "private %d, want_to_tunnel %d.",
-            private_connection, want_to_tunnel);
+  log_debug(LD_DIR, "anonymized %d, want_to_tunnel %d.",
+            anonymized_connection, want_to_tunnel);
 
   switch (purpose) {
     case DIR_PURPOSE_FETCH_DIR:
@@ -497,7 +497,7 @@
   /* give it an initial state */
   conn->_base.state = DIR_CONN_STATE_CONNECTING;
 
-  if (!private_connection && !want_to_tunnel) {
+  if (!anonymized_connection && !want_to_tunnel) {
     /* then we want to connect directly */
 
     conn->dirconn_direct = 1;
@@ -534,7 +534,7 @@
     linked_conn =
       connection_ap_make_bridge(conn->_base.address, conn->_base.port,
                                 digest,
-                                private_connection ?
+                                anonymized_connection ?
                                   SOCKS_COMMAND_CONNECT :
                                   SOCKS_COMMAND_CONNECT_DIR);
     if (!linked_conn) {

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-05-25 18:22:43 UTC (rev 10329)
+++ tor/trunk/src/or/or.h	2007-05-25 18:25:33 UTC (rev 10330)
@@ -2572,7 +2572,7 @@
                                   int retry_if_no_servers);
 void directory_initiate_command_routerstatus(routerstatus_t *status,
                                              uint8_t purpose,
-                                             int private_connection,
+                                             int anonymized_connection,
                                              const char *resource,
                                              const char *payload,
                                              size_t payload_len);
@@ -2589,7 +2589,8 @@
                                 uint16_t or_port, uint16_t dir_port,
                                 int supports_begindir,
                                 const char *digest, uint8_t purpose,
-                                int private_connection, const char *resource,
+                                int anonymized_connection,
+                                const char *resource,
                                 const char *payload, size_t payload_len);
 
 int dir_split_resource_into_fingerprints(const char *resource,