Commit 1ad83d74 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Send an initial "Starting" bootstrap status event, so we have a 

state to start out in.


svn:r15326
parent c1939246

ChangeLog

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ Changes in version 0.2.1.2-alpha - 2008-??-?? 
      proposal 138.

    - In directory authorities' approved-routers files, allow

      fingerprints with or without space.

    - Add a "GETINFO /status/bootstrap-phase" controller option, so the

      controller can query our current bootstrap state in case it attaches

      partway through and wants to catch up.

    - Send an initial "Starting" bootstrap status event, so we have a

      state to start out in.



  o Bugfixes:

    - Asking for a conditional consensus at .../consensus/<fingerprints>

doc/spec/proposals/137-bootstrap-phases.txt

+2 −3
Original line number Diff line number Diff line
@@ -55,11 +55,10 @@ Status: Open 
  the same order. Some phases might also be skipped (not reported) if the

  associated bootstrap step is already complete.



  Phase 0:

  Phase 1:

  tag=starting summary="starting"



  Tor starts out in this phase. It doesn't actually send a status event

  to say so.

  Tor starts out in this phase.



  Phase 5:

  tag=conn_dir summary="Connecting to directory mirror"

src/or/main.c

+3 −0
Original line number Diff line number Diff line
@@ -1407,6 +1407,9 @@ do_main_loop(void) 
  stats_prev_global_read_bucket = global_read_bucket;

  stats_prev_global_write_bucket = global_write_bucket;



  /* initialize the bootstrap status events to know we're starting up */

  control_event_bootstrap(BOOTSTRAP_STATUS_STARTING, 0);



  if (trusted_dirs_reload_certs())

    return -1;

  if (router_reload_v2_networkstatus()) {

src/or/or.h

+1 −1
Original line number Diff line number Diff line
@@ -3054,7 +3054,7 @@ void enable_control_logging(void); 
/** Enum describing various stages of bootstrapping, for use with controller

 * bootstrap status events. The values range from 0 to 100. */

typedef enum {

  BOOTSTRAP_STATUS_STARTING=0,

  BOOTSTRAP_STATUS_STARTING=1,

  BOOTSTRAP_STATUS_CONN_DIR=5,

  BOOTSTRAP_STATUS_HANDSHAKE=-1,

  BOOTSTRAP_STATUS_HANDSHAKE_DIR=10,