Explorar o código

Merge remote-tracking branch 'dgoulet/bug13936_025_v2'

Nick Mathewson %!s(int64=9) %!d(string=hai) anos
pai
achega
eee248bc59
Modificáronse 2 ficheiros con 7 adicións e 1 borrados
  1. 6 0
      changes/bug13936
  2. 1 1
      src/or/circuituse.c

+ 6 - 0
changes/bug13936

@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - Use circuit_has_opened() instead of rend_client_rendcirc_has_opened()
+      when a rendezvous circuit is opened because circuit_has_opened() jobs
+      is to call a specialized function depending on the circuit purpose.
+      Furthermore, a controller event will be triggered here where the
+      former did not.

+ 1 - 1
src/or/circuituse.c

@@ -2012,7 +2012,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
         circ->rend_data = rend_data_dup(ENTRY_TO_EDGE_CONN(conn)->rend_data);
         if (circ->base_.purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND &&
             circ->base_.state == CIRCUIT_STATE_OPEN)
-          rend_client_rendcirc_has_opened(circ);
+          circuit_has_opened(circ);
       }
     }
   } /* endif (!circ) */