torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson
2020-10-07 08:26:04 -04:00
parent a49373844c ad7ffa5240
commit 701a1936fa
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mainloop/connection.c
+6 -1
View File
@@ -383,8 +383,12 @@ or_connection_new(int type, int socket_family)
connection_or_set_canonical(or_conn, 0);
if (type == CONN_TYPE_EXT_OR)
if (type == CONN_TYPE_EXT_OR) {
/* If we aren't told an address for this connection, we should
* presume it isn't local, and should be rate-limited. */
TO_CONN(or_conn)->always_rate_limit_as_remote = 1;
connection_or_set_ext_or_identifier(or_conn);
}
return or_conn;
}
@@ -3152,6 +3156,7 @@ connection_is_rate_limited(const connection_t *conn)
if (conn->linked)
return 0; /* Internal connection */
else if (! options->CountPrivateBandwidth &&
! conn->always_rate_limit_as_remote &&
(tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */
tor_addr_family(&conn->addr) == AF_UNIX || /* no address */
tor_addr_is_internal(&conn->addr, 0)))