diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:16:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 16:16:27 -0400 |
| commit | 0c5a44ed0a790951bdfd319eec734c04eb972a08 (patch) | |
| tree | 89f4945bd65bc06450b95131cfcf04b6da54fd5d /src/or/circuitbuild.c | |
| parent | e232938ec82c8c35b99331995d1aeaca67ba9ec1 (diff) | |
| parent | bffe0d3ccc6b49975eae9173b0c1c465d40d2dbf (diff) | |
| download | tor-0c5a44ed0a790951bdfd319eec734c04eb972a08.tar.gz tor-0c5a44ed0a790951bdfd319eec734c04eb972a08.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b4e79ed746..bd270178c2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2432,6 +2432,13 @@ circuit_extend(cell_t *cell, circuit_t *circ) return -1; } + if (tor_addr_is_internal(&n_addr, 0) && + !get_options()->ExtendAllowPrivateAddresses) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Client asked me to extend to a private address"); + return -1; + } + /* Check if they asked us for 0000..0000. We support using * an empty fingerprint for the first hop (e.g. for a bridge relay), * but we don't want to let people send us extend cells for empty |