浏览代码

log when we finish ssl handshake and move to renegotiation

debug-level since it will be quite common. logged at both client
and server side. this step should help us track what's going on
with people filtering tor connections by our ssl habits.
Roger Dingledine 14 年之前
父节点
当前提交
64bfbcb918
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      src/or/connection_or.c

+ 4 - 1
src/or/connection_or.c

@@ -929,13 +929,16 @@ connection_tls_continue_handshake(or_connection_t *conn)
       if (! tor_tls_used_v1_handshake(conn->tls)) {
       if (! tor_tls_used_v1_handshake(conn->tls)) {
         if (!tor_tls_is_server(conn->tls)) {
         if (!tor_tls_is_server(conn->tls)) {
           if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) {
           if (conn->_base.state == OR_CONN_STATE_TLS_HANDSHAKING) {
-            // log_notice(LD_OR,"Done. state was TLS_HANDSHAKING.");
+            log_debug(LD_OR, "Done with initial SSL handshake (client-side). "
+                             "Requesting renegotiation.");
             conn->_base.state = OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING;
             conn->_base.state = OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING;
             goto again;
             goto again;
           }
           }
           // log_notice(LD_OR,"Done. state was %d.", conn->_base.state);
           // log_notice(LD_OR,"Done. state was %d.", conn->_base.state);
         } else {
         } else {
           /* improved handshake, but not a client. */
           /* improved handshake, but not a client. */
+          log_debug(LD_OR, "Done with initial SSL handshake (server-side). "
+                           "Expecting renegotiation.");
           tor_tls_set_renegotiate_callback(conn->tls,
           tor_tls_set_renegotiate_callback(conn->tls,
                                            connection_or_tls_renegotiated_cb,
                                            connection_or_tls_renegotiated_cb,
                                            conn);
                                            conn);