Merge branch 'maint-0.3.0' into release-0.3.0
This commit is contained in:
commit
5df265ae55
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfixes (hidden service, relay):
|
||||||
|
- Avoid a possible double close of a circuit by the intro point on error
|
||||||
|
of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on
|
||||||
|
0.3.0.1-alpha.
|
|
@ -253,7 +253,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request,
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
|
/* When sending the intro establish ack, on error the circuit can be marked
|
||||||
|
* as closed so avoid a double close. */
|
||||||
|
if (!TO_CIRCUIT(circ)->marked_for_close) {
|
||||||
|
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
|
||||||
|
}
|
||||||
|
|
||||||
done:
|
done:
|
||||||
hs_cell_establish_intro_free(parsed_cell);
|
hs_cell_establish_intro_free(parsed_cell);
|
||||||
|
|
Loading…
Reference in New Issue