[or-cvs] r8334: prefer calling it a client rather than an OP (tor/trunk/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2006-09-06 21:00:37 -0400 (Wed, 06 Sep 2006)
New Revision: 8334

Modified:
   tor/trunk/src/or/command.c
   tor/trunk/src/or/relay.c
   tor/trunk/src/or/rendmid.c
   tor/trunk/src/or/router.c
Log:
prefer calling it a client rather than an OP


Modified: tor/trunk/src/or/command.c
===================================================================
--- tor/trunk/src/or/command.c	2006-09-07 00:54:28 UTC (rev 8333)
+++ tor/trunk/src/or/command.c	2006-09-07 01:00:37 UTC (rev 8334)
@@ -266,7 +266,7 @@
 
   if (circ->n_circ_id != cell->circ_id) {
     log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,
-           "got created cell from OPward? Closing.");
+           "got created cell from Tor client? Closing.");
     circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);
     return;
   }

Modified: tor/trunk/src/or/relay.c
===================================================================
--- tor/trunk/src/or/relay.c	2006-09-07 00:54:28 UTC (rev 8333)
+++ tor/trunk/src/or/relay.c	2006-09-07 01:00:37 UTC (rev 8334)
@@ -286,14 +286,14 @@
 
         thishop = thishop->next;
       } while (thishop != cpath && thishop->state == CPATH_STATE_OPEN);
-      log_warn(LD_OR,"in-cell at OP not recognized. Closing.");
+      log_warn(LD_OR,"in-cell at client not recognized. Closing.");
       return -1;
     } else { /* we're in the middle. Just one crypt. */
       if (relay_crypt_one_payload(TO_OR_CIRCUIT(circ)->p_crypto,
                                   cell->payload, 1) < 0)
         return -1;
 //      log_fn(LOG_DEBUG,"Skipping recognized check, because we're not "
-//             "the OP.");
+//             "the client.");
     }
   } else /* cell_direction == CELL_DIRECTION_OUT */ {
     /* we're in the middle. Just one crypt. */
@@ -639,8 +639,8 @@
     E_CASE(EMFILE):
       return END_STREAM_REASON_RESOURCELIMIT;
     default:
-      log_info(LD_EXIT, "Didn't recognize errno %d (%s); telling the OP that "
-               "we are ending a stream for 'misc' reason.",
+      log_info(LD_EXIT, "Didn't recognize errno %d (%s); telling the client "
+               "that we are ending a stream for 'misc' reason.",
                e, tor_socket_strerror(e));
       return END_STREAM_REASON_MISC;
   }

Modified: tor/trunk/src/or/rendmid.c
===================================================================
--- tor/trunk/src/or/rendmid.c	2006-09-07 00:54:28 UTC (rev 8333)
+++ tor/trunk/src/or/rendmid.c	2006-09-07 01:00:37 UTC (rev 8334)
@@ -300,7 +300,7 @@
                                    request+REND_COOKIE_LEN,
                                    request_len-REND_COOKIE_LEN, NULL)) {
     log_warn(LD_GENERAL,
-             "Unable to send RENDEZVOUS2 cell to OP on circuit %d.",
+             "Unable to send RENDEZVOUS2 cell to client on circuit %d.",
              rend_circ->p_circ_id);
     goto err;
   }

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2006-09-07 00:54:28 UTC (rev 8333)
+++ tor/trunk/src/or/router.c	2006-09-07 01:00:37 UTC (rev 8334)
@@ -264,7 +264,7 @@
     if (tor_tls_context_new(get_identity_key(),
                             options->Nickname ? options->Nickname : "client",
                             MAX_SSL_KEY_LIFETIME) < 0) {
-      log_err(LD_GENERAL,"Error creating TLS context for OP.");
+      log_err(LD_GENERAL,"Error creating TLS context for Tor client.");
       return -1;
     }
     return 0;