diff options
| author | Mike Perry <mikeperry-git@fscked.org> | 2009-09-06 20:43:02 -0700 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@fscked.org> | 2009-09-16 15:55:36 -0700 |
| commit | 63be2df84f7d23aa92426d6253ff18840e152254 (patch) | |
| tree | 940fa2ebbda828a482667ee0d043154e7f59810b | |
| parent | 672e2f6908fda52897c9564b756de743692d1d55 (diff) | |
| download | tor-63be2df84f7d23aa92426d6253ff18840e152254.tar.gz tor-63be2df84f7d23aa92426d6253ff18840e152254.zip | |
Fix issues found by arma in review.
| -rw-r--r-- | src/or/circuitbuild.c | 3 | ||||
| -rw-r--r-- | src/or/circuituse.c | 4 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 50faac1702..a140f0ae67 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -306,8 +306,7 @@ circuit_build_times_parse_state(circuit_build_times_t *cbt, int tot_values = 0, N = 0; config_line_t *line; int i; - msg = NULL; /* XXX is this a bug? should be *msg, or we'll seg fault - * if we try to set it */ + *msg = NULL; circuit_build_times_init(cbt); /* We don't support decreasing the table size yet */ diff --git a/src/or/circuituse.c b/src/or/circuituse.c index f6a41665d1..7ca65bcc53 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -858,10 +858,8 @@ circuit_build_failed(origin_circuit_t *circ) break; case CIRCUIT_PURPOSE_C_INTRODUCING: /* at Alice, connecting to intro point */ - circuit_increment_failure_count(); /* Don't increment failure count, since Bob may have picked * the introduction point maliciously */ - /* XXX Mike, you didn't read my comment above! :) -RD */ /* Alice will pick a new intro point when this one dies, if * the stream in question still cares. No need to act here. */ break; @@ -873,10 +871,8 @@ circuit_build_failed(origin_circuit_t *circ) break; case CIRCUIT_PURPOSE_S_CONNECT_REND: /* at Bob, connecting to rend point */ - circuit_increment_failure_count(); /* Don't increment failure count, since Alice may have picked * the rendezvous point maliciously */ - /* XXX Mike, you didn't read my comment above! :) -RD */ log_info(LD_REND, "Couldn't connect to Alice's chosen rend point %s " "(%s hop failed).", diff --git a/src/or/config.c b/src/or/config.c index cd222595b5..7c2623eee9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -409,7 +409,7 @@ static config_var_t _state_vars[] = { V(LastRotatedOnionKey, ISOTIME, NULL), V(LastWritten, ISOTIME, NULL), - V("TotalBuildTimes", UINT, NULL), + V(TotalBuildTimes, UINT, NULL), VAR("CircuitBuildTimeBin", LINELIST_S, BuildtimeHistogram, NULL), VAR("BuildtimeHistogram", LINELIST_V, BuildtimeHistogram, NULL), |