diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-05-09 16:33:04 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-05-09 16:33:04 +0000 |
| commit | b384c5a18d7567d0bce7d6c14b820c61843ee987 (patch) | |
| tree | df9f2eb9ca01360f962b1079bd276e878b5f6d07 /src/or/connection_or.c | |
| parent | d18528a2abb1b8b5af3d8e538ae07318ab479fa5 (diff) | |
| download | tor-b384c5a18d7567d0bce7d6c14b820c61843ee987.tar.gz tor-b384c5a18d7567d0bce7d6c14b820c61843ee987.zip | |
bugfix: do directory_send_command only after we've established a socket
also many comments, cleaning, etc
svn:r1823
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 85afb01505..3c1b22e540 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -122,7 +122,7 @@ connection_or_init_conn_from_router(connection_t *conn, routerinfo_t *router) { * state to 'connecting' and return. If connect to router succeeds, call * connection_tls_start_handshake() on it. * - * This function is called from router_retry_connections() , for + * This function is called from router_retry_connections(), for * ORs connecting to ORs, and circuit_establish_circuit(), for * OPs connecting to ORs. * @@ -193,7 +193,7 @@ int connection_tls_start_handshake(connection_t *conn, int receiving) { return 0; } -/* Move forward with ths tls handshake. If it finishes, hand +/* Move forward with the tls handshake. If it finishes, hand * conn to connection_tls_finish_handshake(). * * Return -1 if conn is broken, else return 0. @@ -221,9 +221,9 @@ int connection_tls_continue_handshake(connection_t *conn) { * * Make sure we are happy with the person we just handshaked with: * If it's an OP (that is, it has no certificate), make sure I'm an OR. - * If it's an OR (is has a certificate), make sure it has a recognized - * nickname, its cert is signed by the identity key of that nickname; - * if I initiated the connection, make sure it's the right guy, and if + * If it's an OR (it has a certificate), make sure it has a recognized + * nickname, and its cert is signed by the identity key of that nickname. + * If I initiated the connection, make sure it's the right guy; and if * he initiated the connection, make sure he's not already connected. * * If he initiated the conn, also initialize conn from the information |