summaryrefslogtreecommitdiff
path: root/src/or/hs_circuit.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2017-08-04 22:02:28 +0300
committerNick Mathewson <nickm@torproject.org>2017-08-08 20:29:34 -0400
commitc62da5cf95de0958d28d2dfd8cdc66cf11498ebe (patch)
tree22ee0284768e83db9055da7f38f7be7eb1877dec /src/or/hs_circuit.c
parent4ad4467fa13a0e6333fa0016a63060d5b9dd9715 (diff)
downloadtor-c62da5cf95de0958d28d2dfd8cdc66cf11498ebe.tar.gz
tor-c62da5cf95de0958d28d2dfd8cdc66cf11498ebe.zip
Improve code based on Nick review:
- Fix some more crazy ternary ops. - Fix the order of disaster SRV computation. - Whitespace fixes. - Remove a redundant warn. - Better docs.
Diffstat (limited to 'src/or/hs_circuit.c')
-rw-r--r--src/or/hs_circuit.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c
index 527439599a..faceb731c5 100644
--- a/src/or/hs_circuit.c
+++ b/src/or/hs_circuit.c
@@ -699,8 +699,11 @@ hs_circ_retry_service_rendezvous_point(origin_circuit_t *circ)
circ->hs_service_side_rend_circ_has_been_relaunched = 1;
/* Legacy service don't have an hidden service ident. */
- (circ->hs_ident) ? retry_service_rendezvous_point(circ) :
- rend_service_relaunch_rendezvous(circ);
+ if (circ->hs_ident) {
+ retry_service_rendezvous_point(circ);
+ } else {
+ rend_service_relaunch_rendezvous(circ);
+ }
done:
return;