Commit d76f8457 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/119' into maint-0.4.4

parents 2b968446 9316ca9f

changes/bug34086

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (onion service v3):

    - Remove a BUG() warning that could trigger in certain unlikely edge-cases.

      Fixes bug 34086; bugfix on 0.3.2.1-alpha.

src/feature/hs/hs_client.c

+10 −4
Original line number Diff line number Diff line
@@ -778,12 +778,18 @@ client_rendezvous_circ_has_opened(origin_circuit_t *circ) 
   * the v3 rendezvous protocol */

  if (rp_ei) {

    const node_t *rp_node = node_get_by_id(rp_ei->identity_digest);

    if (rp_node) {

      if (BUG(!node_supports_v3_rendezvous_point(rp_node))) {

    if (rp_node && !node_supports_v3_rendezvous_point(rp_node)) {

      /* Even tho we checked that this node supported v3 when we created the

         rendezvous circuit, there is a chance that we might think it does

         not support v3 anymore. This might happen if we got a new consensus

         in the meanwhile, where the relay is still listed but its listed

         descriptor digest has changed and hence we can't access its 'ri' or

         'md'. */

      log_info(LD_REND, "Rendezvous node %s did not support v3 after circuit "

               "has opened.", safe_str_client(extend_info_describe(rp_ei)));

      return;

    }

  }

  }



  log_info(LD_REND, "Rendezvous circuit has opened to %s.",

           safe_str_client(extend_info_describe(rp_ei)));