nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 8024: Check for null/closed channel before probing.

Browse Source
This commit is contained in:
Mike Perry 2013-01-22 21:03:28 -08:00
parent b810d322bf
commit a78542f0c3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/bug7802
View File

@ -8,3 +8,4 @@
- Remove a source of rounding error during path bias count scaling. - Remove a source of rounding error during path bias count scaling.
- Don't count cannibalized circuits as used for path bias until we - Don't count cannibalized circuits as used for path bias until we
actually try to use them. actually try to use them.
- Fix circuit_package_relay_cell warning message about n_chan==NULL.

10
src/or/circuitbuild.c
View File

@ -1727,6 +1727,16 @@ pathbias_send_usable_probe(circuit_t *circ)
return -1; return -1;
} }
/* Can't probe if the channel isn't open */
if (circ->n_chan == NULL ||
(circ->n_chan->state != CHANNEL_STATE_OPEN
&& circ->n_chan->state != CHANNEL_STATE_MAINT)) {
log_info(LD_CIRC,
"Skipping pathbias probe for circuit %d: Channel is not open.",
ocirc->global_identifier);
return -1;
}
circuit_change_purpose(circ, CIRCUIT_PURPOSE_PATH_BIAS_TESTING); circuit_change_purpose(circ, CIRCUIT_PURPOSE_PATH_BIAS_TESTING);
/* Update timestamp for when circuit_expire_building() should kill us */ /* Update timestamp for when circuit_expire_building() should kill us */