Merge branch 'maint-0.3.3'
This commit is contained in:
commit
d96dc2060a
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfix (channel, client):
|
||||||
|
- Better identify client connection when reporting to the geoip client
|
||||||
|
cache. Fixes bug 24904; bugfix on 0.3.1.7.
|
||||||
|
|
|
@ -1849,8 +1849,8 @@ channel_do_open_actions(channel_t *chan)
|
||||||
circuit_build_times_network_is_live(get_circuit_build_times_mutable());
|
circuit_build_times_network_is_live(get_circuit_build_times_mutable());
|
||||||
router_set_status(chan->identity_digest, 1);
|
router_set_status(chan->identity_digest, 1);
|
||||||
} else {
|
} else {
|
||||||
/* only report it to the geoip module if it's not a known router */
|
/* only report it to the geoip module if it's a client */
|
||||||
if (!connection_or_digest_is_known_relay(chan->identity_digest)) {
|
if (channel_is_client(chan)) {
|
||||||
if (channel_get_addr_if_possible(chan, &remote_addr)) {
|
if (channel_get_addr_if_possible(chan, &remote_addr)) {
|
||||||
char *transport_name = NULL;
|
char *transport_name = NULL;
|
||||||
channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);
|
channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);
|
||||||
|
|
Loading…
Reference in New Issue