Commit d0ed7cbf authored by Robert Ransom's avatar Robert Ransom
Browse files

List service address in CIRC events for HS-related circs

parent c7d01b05

changes/feature2411

+4 −3
Changes for changes/feature2411: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ 
      controllers in CIRC events and in replies to 'GETINFO

      circuit-status'.  Implements part of ticket 2411.



    - Report the current state of a hidden-service-related circuit to

      controllers in CIRC events and in replies to 'GETINFO

      circuit-status'.  Implements part of ticket 2411.

    - Report the hidden service address and current state of a

      hidden-service-related circuit to controllers in CIRC events and

      in replies to 'GETINFO circuit-status'.  Implements part of

      ticket 2411.

src/or/control.c

+9 −0
Changes for src/or/control.c: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1842,6 +1842,15 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) 
    }

  }



  if (circ->rend_data != NULL) {

    char *rend_query_arg = NULL;



    tor_asprintf(&rend_query_arg, "REND_QUERY=%s",

                 circ->rend_data->onion_address);



    smartlist_add(descparts, rend_query_arg);

  }



  rv = smartlist_join_strings(descparts, " ", 0, NULL);



  SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp));