July 2018 - tor-commits - lists.torproject.org

[tor/master] Partially revert "Use tor_addr_from_getsockname() in several places"
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit dfdf32404cd93671646481f6f3c129591a6901d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 16:11:02 2018 -0400 Partially revert "Use tor_addr_from_getsockname() in several places" This reverts part of commit 6ed384b827dce21ea3a44b587, in order to fix bug 26568. Bugfix on 0.3.4.1-alpha. --- changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug26568 b/changes/bug26568 new file mode 100644 index 000000000..0c4c05d04 --- /dev/null +++ b/changes/bug26568 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - Report the port correctly when a port is configured to bind to "auto". + Fixes bug 26568; bugfix on 0.3.4.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 5185b45b1..7283a8104 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1260,12 +1260,15 @@ connection_listener_new(const struct sockaddr *listensockaddr, gotPort = usePort; } else { tor_addr_t addr2; - if (tor_addr_from_getsockname(&addr2, s)<0) { + struct sockaddr_storage ss; + socklen_t ss_len=sizeof(ss); + if (getsockname(s, (struct sockaddr*)&ss, &ss_len)<0) { log_warn(LD_NET, "getsockname() couldn't learn address for %s: %s", conn_type_to_string(type), tor_socket_strerror(tor_socket_errno(s))); gotPort = 0; } + tor_addr_from_sockaddr(&addr2, (struct sockaddr*)&ss, &gotPort); } #ifdef HAVE_SYS_UN_H /*

1 0

[tor/release-0.3.4] Partially revert "Use tor_addr_from_getsockname() in several places"
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit dfdf32404cd93671646481f6f3c129591a6901d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 16:11:02 2018 -0400 Partially revert "Use tor_addr_from_getsockname() in several places" This reverts part of commit 6ed384b827dce21ea3a44b587, in order to fix bug 26568. Bugfix on 0.3.4.1-alpha. --- changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug26568 b/changes/bug26568 new file mode 100644 index 000000000..0c4c05d04 --- /dev/null +++ b/changes/bug26568 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - Report the port correctly when a port is configured to bind to "auto". + Fixes bug 26568; bugfix on 0.3.4.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 5185b45b1..7283a8104 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1260,12 +1260,15 @@ connection_listener_new(const struct sockaddr *listensockaddr, gotPort = usePort; } else { tor_addr_t addr2; - if (tor_addr_from_getsockname(&addr2, s)<0) { + struct sockaddr_storage ss; + socklen_t ss_len=sizeof(ss); + if (getsockname(s, (struct sockaddr*)&ss, &ss_len)<0) { log_warn(LD_NET, "getsockname() couldn't learn address for %s: %s", conn_type_to_string(type), tor_socket_strerror(tor_socket_errno(s))); gotPort = 0; } + tor_addr_from_sockaddr(&addr2, (struct sockaddr*)&ss, &gotPort); } #ifdef HAVE_SYS_UN_H /*

1 0

[tor/master] Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 32d9d69350f7fac564f4f4a245c57edd2e5c309a Merge: d38e47495 dfdf32404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 13:16:37 2018 -0400 Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4 changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 2878dad9dbc1e07f608fa3acddc76261e4d76648 Merge: df9858285 32d9d6935 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 13:31:26 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 32d9d69350f7fac564f4f4a245c57edd2e5c309a Merge: d38e47495 dfdf32404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 13:16:37 2018 -0400 Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4 changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 5b0820702a213226d2cce47dae1da5e72a16bc82 Merge: 9b060547c 32d9d6935 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 13:31:18 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Partially revert "Use tor_addr_from_getsockname() in several places"
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit dfdf32404cd93671646481f6f3c129591a6901d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 2 16:11:02 2018 -0400 Partially revert "Use tor_addr_from_getsockname() in several places" This reverts part of commit 6ed384b827dce21ea3a44b587, in order to fix bug 26568. Bugfix on 0.3.4.1-alpha. --- changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug26568 b/changes/bug26568 new file mode 100644 index 000000000..0c4c05d04 --- /dev/null +++ b/changes/bug26568 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - Report the port correctly when a port is configured to bind to "auto". + Fixes bug 26568; bugfix on 0.3.4.1-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 5185b45b1..7283a8104 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1260,12 +1260,15 @@ connection_listener_new(const struct sockaddr *listensockaddr, gotPort = usePort; } else { tor_addr_t addr2; - if (tor_addr_from_getsockname(&addr2, s)<0) { + struct sockaddr_storage ss; + socklen_t ss_len=sizeof(ss); + if (getsockname(s, (struct sockaddr*)&ss, &ss_len)<0) { log_warn(LD_NET, "getsockname() couldn't learn address for %s: %s", conn_type_to_string(type), tor_socket_strerror(tor_socket_errno(s))); gotPort = 0; } + tor_addr_from_sockaddr(&addr2, (struct sockaddr*)&ss, &gotPort); } #ifdef HAVE_SYS_UN_H /*

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 32d9d69350f7fac564f4f4a245c57edd2e5c309a Merge: d38e47495 dfdf32404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 13:16:37 2018 -0400 Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4 changes/bug26568 | 3 +++ src/or/connection.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[tor/master] Retire some unused (or nearly unused) macros.
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit cf0b07c2e5284325fb89f2c8ee3ad99f5ed02195 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 10:31:19 2018 -0400 Retire some unused (or nearly unused) macros. --- src/lib/cc/compat_compiler.h | 3 --- src/lib/net/nettypes.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index c1621724d..a043ae809 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -189,14 +189,11 @@ #endif #define U64_PRINTF_ARG(a) ((uint64_t)a) -#define U64_SCANF_ARG(a) (a) #define U64_LITERAL(n) UINT64_C(n) #define I64_PRINTF_ARG(a) ((int64_t)a) -#define I64_SCANF_ARG(a) (a) #define I64_LITERAL(n) INT64_C(n) #define U64_FORMAT "%"PRIu64 #define I64_FORMAT "%"PRId64 -#define INTPTR_T_FORMAT "%"PRIuPTR /** Macro: yield a pointer to the field at position <b>off</b> within the * structure <b>st</b>. Example: diff --git a/src/lib/net/nettypes.h b/src/lib/net/nettypes.h index 9bae70d5f..f21237436 100644 --- a/src/lib/net/nettypes.h +++ b/src/lib/net/nettypes.h @@ -23,7 +23,7 @@ typedef int socklen_t; * any inadvertent checks for the socket being <= 0 or > 0 will probably * still work. */ #define tor_socket_t intptr_t -#define TOR_SOCKET_T_FORMAT INTPTR_T_FORMAT +#define TOR_SOCKET_T_FORMAT "%"PRIuPTR #define SOCKET_OK(s) ((SOCKET)(s) != INVALID_SOCKET) #define TOR_INVALID_SOCKET INVALID_SOCKET #else /* !(defined(_WIN32)) */

1 0

[tor/master] Use the standard SHRT_MAX name.
by nickm＠torproject.org 03 Jul '18

03 Jul '18

commit 4638be5312f527e4769317b2b222faa52bbe0093 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 3 10:28:10 2018 -0400 Use the standard SHRT_MAX name. --- src/lib/cc/torint.h | 4 ---- src/or/addressmap.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/cc/torint.h b/src/lib/cc/torint.h index e633722ba..91db25833 100644 --- a/src/lib/cc/torint.h +++ b/src/lib/cc/torint.h @@ -95,10 +95,6 @@ typedef int32_t ssize_t; #endif /* (SIZEOF_SIZE_T == 4) || ... */ #endif /* !defined(SIZE_MAX) */ -#ifndef SHORT_MAX -#define SHORT_MAX SHRT_MAX -#endif - #ifdef _WIN32 # ifdef _WIN64 # define TOR_PRIuSZ PRIu64 diff --git a/src/or/addressmap.c b/src/or/addressmap.c index a0df5c986..805d21ae7 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -642,7 +642,7 @@ client_dns_incr_failures(const char *address) ent->expires = time(NULL) + MAX_DNS_ENTRY_AGE; strmap_set(addressmap,address,ent); } - if (ent->num_resolve_failures < SHORT_MAX) + if (ent->num_resolve_failures < SHRT_MAX) ++ent->num_resolve_failures; /* don't overflow */ log_info(LD_APP, "Address %s now has %d resolve failures.", safe_str_client(address), @@ -1153,4 +1153,3 @@ addressmap_get_mappings(smartlist_t *sl, time_t min_expires, iter = strmap_iter_next(addressmap,iter); } } -

1 0