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

Merge branch 'bug14950_logs_squashed'

parents 098cbcbb d221b507

src/common/compat.c

+2 −2
Original line number Diff line number Diff line
@@ -1793,7 +1793,7 @@ tor_getpwnam(const char *username) 
  if ((pw = getpwnam(username))) {

    tor_passwd_free(passwd_cached);

    passwd_cached = tor_passwd_dup(pw);

    log_notice(LD_GENERAL, "Caching new entry %s for %s",

    log_info(LD_GENERAL, "Caching new entry %s for %s",

             passwd_cached->pw_name, username);

    return pw;

  }

src/or/circuitbuild.c

+5 −1
Original line number Diff line number Diff line
@@ -960,7 +960,11 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) 
        log_notice(LD_GENERAL,

            "Tor has successfully opened a circuit. "

            "Looks like client functionality is working.");

        control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0);

        if (control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0) == 0) {

          log_notice(LD_GENERAL,

                     "Tor has successfully opened a circuit. "

                     "Looks like client functionality is working.");

        }

        control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED");

        clear_broken_connection_map(1);

        if (server_mode(options) && !check_whether_orport_reachable()) {

src/or/control.c

+9 −3
Original line number Diff line number Diff line
@@ -4971,15 +4971,18 @@ static int bootstrap_problems = 0; 
 *

 * <b>status</b> is the new status, that is, what task we will be doing

 * next. <b>progress</b> is zero if we just started this task, else it

 * represents progress on the task. */

void

 * represents progress on the task.

 *

 * Return true if we logged a message at level NOTICE, and false otherwise.

 */

int

control_event_bootstrap(bootstrap_status_t status, int progress)

{

  const char *tag, *summary;

  char buf[BOOTSTRAP_MSG_LEN];



  if (bootstrap_percent == BOOTSTRAP_STATUS_DONE)

    return; /* already bootstrapped; nothing to be done here. */

    return 0; /* already bootstrapped; nothing to be done here. */



  /* special case for handshaking status, since our TLS handshaking code

   * can't distinguish what the connection is going to be for. */
@@ -5026,7 +5029,10 @@ control_event_bootstrap(bootstrap_status_t status, int progress) 
      /* Remember that we gave a notice at this level. */

      notice_bootstrap_percent = bootstrap_percent;

    }

    return loglevel == LOG_NOTICE;

  }



  return 0;

}



/** Called when Tor has failed to make bootstrapping progress in a way

src/or/control.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ void enable_control_logging(void); 


void monitor_owning_controller_process(const char *process_spec);



void control_event_bootstrap(bootstrap_status_t status, int progress);

int control_event_bootstrap(bootstrap_status_t status, int progress);

MOCK_DECL(void, control_event_bootstrap_problem,(const char *warn,

                                                 int reason,

                                                 or_connection_t *or_conn));

src/or/nodelist.c

+4 −3
Original line number Diff line number Diff line
@@ -1698,10 +1698,11 @@ update_router_have_minimum_dir_info(void) 


  /* If paths have just become available in this update. */

  if (res && !have_min_dir_info) {

    control_event_client_status(LOG_NOTICE, "ENOUGH_DIR_INFO");

    if (control_event_bootstrap(BOOTSTRAP_STATUS_CONN_OR, 0) == 0) {

      log_notice(LD_DIR,

              "We now have enough directory information to build circuits.");

    control_event_client_status(LOG_NOTICE, "ENOUGH_DIR_INFO");

    control_event_bootstrap(BOOTSTRAP_STATUS_CONN_OR, 0);

    }

  }



  /* If paths have just become unavailable in this update. */