May 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.1] Check fetched rendezvous descriptors' service IDs
by nickm＠torproject.org 16 May '11

16 May '11

commit 7571e9f1cb81927c5bd47190409a30c7f23ea4a1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Apr 27 13:37:08 2011 -0700 Check fetched rendezvous descriptors' service IDs --- changes/check-fetched-rend-desc-service-id | 7 +++++++ src/or/directory.c | 5 +++-- src/or/or.h | 3 ++- src/or/rendcommon.c | 22 +++++++++++++++++++++- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/changes/check-fetched-rend-desc-service-id b/changes/check-fetched-rend-desc-service-id new file mode 100644 index 0000000..2f37c30 --- /dev/null +++ b/changes/check-fetched-rend-desc-service-id @@ -0,0 +1,7 @@ + o Security fixes: + - When fetching a hidden service descriptor, check that it is for + the hidden service we were trying to connect to, in order to + stop a directory from pre-seeding a client with a descriptor for + a hidden service that they didn't want. Bugfix on 0.0.6. + + diff --git a/src/or/directory.c b/src/or/directory.c index 01f3375..9f9b2c1 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1909,7 +1909,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) (int)body_len, status_code, escaped(reason)); switch (status_code) { case 200: - if (rend_cache_store(body, body_len, 0) < -1) { + if (rend_cache_store(body, body_len, 0, + conn->rend_data->onion_address) < -1) { log_warn(LD_REND,"Failed to parse rendezvous descriptor."); /* Any pending rendezvous attempts will notice when * connection_about_to_close_connection() @@ -3114,7 +3115,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, !strcmpstart(url,"/tor/rendezvous/publish")) { /* rendezvous descriptor post */ log_info(LD_REND, "Handling rendezvous descriptor post."); - if (rend_cache_store(body, body_len, 1) < 0) { + if (rend_cache_store(body, body_len, 1, NULL) < 0) { log_fn(LOG_PROTOCOL_WARN, LD_DIRSERV, "Rejected rend descriptor (length %d) from %s.", (int)body_len, conn->_base.address); diff --git a/src/or/or.h b/src/or/or.h index 897ad32..976ba9f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4146,7 +4146,8 @@ int rend_cache_lookup_desc(const char *query, int version, const char **desc, int rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **entry_out); int rend_cache_lookup_v2_desc_as_dir(const char *query, const char **desc); -int rend_cache_store(const char *desc, size_t desc_len, int published); +int rend_cache_store(const char *desc, size_t desc_len, int published, + const char *service_id); int rend_cache_store_v2_desc_as_client(const char *desc, const rend_data_t *rend_query); int rend_cache_store_v2_desc_as_dir(const char *desc); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index c83573b..8727a70 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1047,9 +1047,14 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc) * * The published flag tells us if we store the descriptor * in our role as directory (1) or if we cache it as client (0). + * + * If service_id is non-NULL and the descriptor is not for that + * service ID, reject it. service_id must be specified if and + * only if published is 0 (we fetched this descriptor). */ int -rend_cache_store(const char *desc, size_t desc_len, int published) +rend_cache_store(const char *desc, size_t desc_len, int published, + const char *service_id) { rend_cache_entry_t *e; rend_service_descriptor_t *parsed; @@ -1068,6 +1073,12 @@ rend_cache_store(const char *desc, size_t desc_len, int published) rend_service_descriptor_free(parsed); return -2; } + if ((service_id != NULL) && strcmp(query, service_id)) { + log_warn(LD_REND, "Received service descriptor for service ID %s; " + "expected descriptor for service ID %s.", + query, safe_str(service_id)); + return -2; + } now = time(NULL); if (parsed->timestamp < now-REND_CACHE_MAX_AGE-REND_CACHE_MAX_SKEW) { log_fn(LOG_PROTOCOL_WARN, LD_REND, @@ -1253,6 +1264,8 @@ rend_cache_store_v2_desc_as_dir(const char *desc) * If we have an older descriptor with the same ID, replace it. * If we have any v0 descriptor with the same ID, reject this one in order * to not get confused with having both versions for the same service. + * If the descriptor's service ID does not match + * rend_query-\>onion_address, reject it. * Return -2 if it's malformed or otherwise rejected; return -1 if we * already have a v0 descriptor here; return 0 if it's the same or older * than one we've already got; return 1 if it's novel. @@ -1303,6 +1316,13 @@ rend_cache_store_v2_desc_as_client(const char *desc, retval = -2; goto err; } + if (strcmp(rend_query->onion_address, service_id)) { + log_warn(LD_REND, "Received service descriptor for service ID %s; " + "expected descriptor for service ID %s.", + service_id, safe_str(rend_query->onion_address)); + retval = -2; + goto err; + } /* Decode/decrypt introduction points. */ if (intro_content) { if (rend_query->auth_type != REND_NO_AUTH &&

1 0

[tor/maint-0.2.1] Require that certain public keys have public exponent 65537
by nickm＠torproject.org 16 May '11

16 May '11

commit 987190c2bc1dc7b64f0f4acf98f6a84609c9d50c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 28 14:35:03 2011 -0700 Require that certain public keys have public exponent 65537 --- changes/check-public-key-exponents | 5 +++++ src/or/routerparse.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/changes/check-public-key-exponents b/changes/check-public-key-exponents new file mode 100644 index 0000000..a8d0067 --- /dev/null +++ b/changes/check-public-key-exponents @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Require that introduction point keys and onion keys have public + exponent 65537. Bugfix on 0.2.0.10-alpha. + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7ff0e2c..ceef054 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1326,6 +1326,11 @@ router_parse_entry_from_string(const char *s, const char *end, goto err; tok = find_by_keyword(tokens, K_ONION_KEY); + if (!crypto_pk_check_key_public_exponent(tok->key)) { + log_warn(LD_DIR, + "Relay's onion key had invalid exponent."); + goto err; + } router->onion_pkey = tok->key; tok->key = NULL; /* Prevent free */ @@ -3971,10 +3976,22 @@ rend_parse_introduction_points(rend_service_descriptor_t *parsed, } /* Parse onion key. */ tok = find_by_keyword(tokens, R_IPO_ONION_KEY); + if (!crypto_pk_check_key_public_exponent(tok->key)) { + log_warn(LD_REND, + "Introduction point's onion key had invalid exponent."); + rend_intro_point_free(intro); + goto err; + } info->onion_key = tok->key; tok->key = NULL; /* Prevent free */ /* Parse service key. */ tok = find_by_keyword(tokens, R_IPO_SERVICE_KEY); + if (!crypto_pk_check_key_public_exponent(tok->key)) { + log_warn(LD_REND, + "Introduction point key had invalid exponent."); + rend_intro_point_free(intro); + goto err; + } intro->intro_key = tok->key; tok->key = NULL; /* Prevent free */ /* Add extend info to list of introduction points. */

1 0

[tor/maint-0.2.1] Add crypto_pk_check_key_public_exponent function
by nickm＠torproject.org 16 May '11

16 May '11

commit d2629f78a000486f8f994ba0ab75ceeaee67fc55 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Apr 28 12:13:03 2011 -0700 Add crypto_pk_check_key_public_exponent function --- src/common/crypto.c | 12 ++++++++++++ src/common/crypto.h | 1 + 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index f3268fe..6761fd7 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -656,6 +656,18 @@ crypto_pk_key_is_private(const crypto_pk_env_t *key) return PRIVATE_KEY_OK(key); } +/** Return true iff env contains a public key whose public exponent + * equals 65537. + */ +int +crypto_pk_check_key_public_exponent(crypto_pk_env_t *env) +{ + tor_assert(env); + tor_assert(env->key); + + return BN_is_word(env->key->e, 65537); +} + /** Compare the public-key components of a and b. Return -1 if a\<b, 0 * if a==b, and 1 if a\>b. */ diff --git a/src/common/crypto.h b/src/common/crypto.h index 576c03d..0fcd067 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -92,6 +92,7 @@ size_t crypto_pk_keysize(crypto_pk_env_t *env); crypto_pk_env_t *crypto_pk_dup_key(crypto_pk_env_t *orig); crypto_pk_env_t *crypto_pk_copy_full(crypto_pk_env_t *orig); int crypto_pk_key_is_private(const crypto_pk_env_t *key); +int crypto_pk_check_key_public_exponent(crypto_pk_env_t *env); int crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to, size_t tolen, const char *from, size_t fromlen, int padding);

1 0

[tor/master] Increase the length of the buffer in smartlist_string_num_isin().
by nickm＠torproject.org 16 May '11

16 May '11

commit 83fe07d3f26aff703230305c9ff529592af32d4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 22:13:53 2011 -0400 Increase the length of the buffer in smartlist_string_num_isin(). This was harmless, since we only used this for checking for lists of port values, but it's the principle of the thing. Fixes 3175; bugfix on 0.1.0.1-rc --- changes/bug3175 | 7 +++++++ src/common/container.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3175 b/changes/bug3175 new file mode 100644 index 0000000..3360fbc --- /dev/null +++ b/changes/bug3175 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Resolve an untriggerable issue in smartlist_string_num_isin(), + where if the function had ever in the future been used to check + for the presence of a too-large number, it would have given an + incorrect result. (Fortunately, we only used it for 16-bit + values.) Fixes bug 3175; bugfix on Tor 0.1.0.1-rc. + diff --git a/src/common/container.c b/src/common/container.c index ca49cbb..da44b7f 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -210,7 +210,7 @@ smartlist_string_isin_case(const smartlist_t *sl, const char *element) int smartlist_string_num_isin(const smartlist_t *sl, int num) { - char buf[16]; + char buf[32]; /* long enough for 64-bit int, and then some. */ tor_snprintf(buf,sizeof(buf),"%d", num); return smartlist_string_isin(sl, buf); }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 16 May '11

16 May '11

commit e423447f53f3a1b3b72cea3e52f345143e847d48 Merge: de8e0ef 919bf6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 11:12:22 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/connection.c changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --cc src/or/connection.c index 17411e0,5054909..50acec3 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1411,7 -1378,9 +1421,9 @@@ connection_connect(connection_t *conn, log_debug(LD_NET, "Connecting to %s:%u.", escaped_safe_str_client(address), port); + make_socket_reuseable(s); + - if (connect(s, dest_addr, dest_addr_len) < 0) { + if (connect(s, dest_addr, (socklen_t)dest_addr_len) < 0) { int e = tor_socket_errno(s); if (!ERRNO_IS_CONN_EINPROGRESS(e)) { /* yuck. kill it. */

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 16 May '11

16 May '11

commit de8e0ef0bd03607f444c967d8c3d74aa8abee4b8 Merge: 4ac8ff9 83fe07d Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 22:15:06 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3175 | 7 +++++++ src/common/container.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug2850' into maint-0.2.2
by nickm＠torproject.org 16 May '11

16 May '11

commit 919bf6ff3cfb1387f3f9ecf9ce97d8e95e330a05 Merge: 83fe07d aba7bb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 11:10:17 2011 -0400 Merge remote-tracking branch 'public/bug2850' into maint-0.2.2 Fixed a trivial conflict where this and the ControlSocketGroupWritable code both added different functions to the same part of connection.c. Conflicts: src/or/connection.c changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --cc src/or/connection.c index b7d6fe4,e90e13f..5054909 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -853,43 -851,25 +853,62 @@@ warn_too_many_conns(void } } +#ifdef HAVE_SYS_UN_H +/** Check whether we should be willing to open an AF_UNIX socket in + * path. Return 0 if we should go ahead and -1 if we shouldn't. */ +static int +check_location_for_unix_socket(or_options_t *options, const char *path) +{ + int r = -1; + char *p = tor_strdup(path); + cpd_check_t flags = CPD_CHECK_MODE_ONLY; + if (get_parent_directory(p)<0) + goto done; + + if (options->ControlSocketsGroupWritable) + flags |= CPD_GROUP_OK; + + if (check_private_dir(p, flags) < 0) { + char *escpath, *escdir; + escpath = esc_for_log(path); + escdir = esc_for_log(p); + log_warn(LD_GENERAL, "Before Tor can create a control socket in %s, the " + "directory %s needs to exist, and to be accessible only by the " + "user%s account that is running Tor. (On some Unix systems, " + "anybody who can list a socket can conect to it, so Tor is " + "being careful.)", escpath, escdir, + options->ControlSocketsGroupWritable ? " and group" : ""); + tor_free(escpath); + tor_free(escdir); + goto done; + } + + r = 0; + done: + tor_free(p); + return r; +} +#endif + + /** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ + static void + make_socket_reuseable(int sock) + { + #ifdef MS_WINDOWS + (void) sock; + #else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); + #endif + } + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@@ -912,11 -891,7 +931,8 @@@ connection_create_listener(const struc } if (listensockaddr->sa_family == AF_INET) { + tor_addr_t addr; int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); - #ifndef MS_WINDOWS - int one=1; - #endif if (is_tcp) start_reading = 1;

1 0

[tor/master] Set SO_REUSEADDR on all sockets, not just listeners
by nickm＠torproject.org 16 May '11

16 May '11

commit aba7bb705a69697ade1cff24e6693db2cb87236a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 22:22:20 2011 -0400 Set SO_REUSEADDR on all sockets, not just listeners See bug 2850 for rationale: it appears that on some busy exits, the OS decides that every single port is now unusable because they have been all used too recently. --- changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/changes/bug2850 b/changes/bug2850 new file mode 100644 index 0000000..77ccbfa --- /dev/null +++ b/changes/bug2850 @@ -0,0 +1,5 @@ + - Minor features + o Set SO_REUSEADDR on all sockets, not just listeners. This should + help busy exit nodes avoid running out of useable ports just because + all the ports have been used in the near past. Resolves issue 2850. + diff --git a/src/or/connection.c b/src/or/connection.c index 6e7bbd5..e90e13f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -851,6 +851,25 @@ warn_too_many_conns(void) } } +/** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ +static void +make_socket_reuseable(int sock) +{ +#ifdef MS_WINDOWS + (void) sock; +#else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); +#endif +} + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@ -873,9 +892,6 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, if (listensockaddr->sa_family == AF_INET) { int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); -#ifndef MS_WINDOWS - int one=1; -#endif if (is_tcp) start_reading = 1; @@ -893,14 +909,7 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, goto err; } -#ifndef MS_WINDOWS - /* REUSEADDR on normal places means you can rebind to the port - * right after somebody else has let it go. But REUSEADDR on win32 - * means you can bind to the port _even when somebody else - * already has it bound_. So, don't do that on Win32. */ - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*) &one, - (socklen_t)sizeof(one)); -#endif + make_socket_reuseable(s); if (bind(s,listensockaddr,socklen) < 0) { const char *helpfulhint = ""; @@ -1088,6 +1097,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) "Connection accepted on socket %d (child of fd %d).", news,conn->s); + make_socket_reuseable(news); set_socket_nonblocking(news); if (options->ConstrainedSockets) @@ -1297,6 +1307,8 @@ connection_connect(connection_t *conn, const char *address, log_debug(LD_NET, "Connecting to %s:%u.", escaped_safe_str_client(address), port); + make_socket_reuseable(s); + if (connect(s, dest_addr, dest_addr_len) < 0) { int e = tor_socket_errno(s); if (!ERRNO_IS_CONN_EINPROGRESS(e)) {

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/bug2850' into maint-0.2.2
by nickm＠torproject.org 16 May '11

16 May '11

commit 919bf6ff3cfb1387f3f9ecf9ce97d8e95e330a05 Merge: 83fe07d aba7bb7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 11:10:17 2011 -0400 Merge remote-tracking branch 'public/bug2850' into maint-0.2.2 Fixed a trivial conflict where this and the ControlSocketGroupWritable code both added different functions to the same part of connection.c. Conflicts: src/or/connection.c changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --cc src/or/connection.c index b7d6fe4,e90e13f..5054909 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -853,43 -851,25 +853,62 @@@ warn_too_many_conns(void } } +#ifdef HAVE_SYS_UN_H +/** Check whether we should be willing to open an AF_UNIX socket in + * path. Return 0 if we should go ahead and -1 if we shouldn't. */ +static int +check_location_for_unix_socket(or_options_t *options, const char *path) +{ + int r = -1; + char *p = tor_strdup(path); + cpd_check_t flags = CPD_CHECK_MODE_ONLY; + if (get_parent_directory(p)<0) + goto done; + + if (options->ControlSocketsGroupWritable) + flags |= CPD_GROUP_OK; + + if (check_private_dir(p, flags) < 0) { + char *escpath, *escdir; + escpath = esc_for_log(path); + escdir = esc_for_log(p); + log_warn(LD_GENERAL, "Before Tor can create a control socket in %s, the " + "directory %s needs to exist, and to be accessible only by the " + "user%s account that is running Tor. (On some Unix systems, " + "anybody who can list a socket can conect to it, so Tor is " + "being careful.)", escpath, escdir, + options->ControlSocketsGroupWritable ? " and group" : ""); + tor_free(escpath); + tor_free(escdir); + goto done; + } + + r = 0; + done: + tor_free(p); + return r; +} +#endif + + /** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ + static void + make_socket_reuseable(int sock) + { + #ifdef MS_WINDOWS + (void) sock; + #else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); + #endif + } + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@@ -912,11 -891,7 +931,8 @@@ connection_create_listener(const struc } if (listensockaddr->sa_family == AF_INET) { + tor_addr_t addr; int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); - #ifndef MS_WINDOWS - int one=1; - #endif if (is_tcp) start_reading = 1;

1 0

[tor/maint-0.2.2] Set SO_REUSEADDR on all sockets, not just listeners
by nickm＠torproject.org 16 May '11

16 May '11

commit aba7bb705a69697ade1cff24e6693db2cb87236a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 22:22:20 2011 -0400 Set SO_REUSEADDR on all sockets, not just listeners See bug 2850 for rationale: it appears that on some busy exits, the OS decides that every single port is now unusable because they have been all used too recently. --- changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/changes/bug2850 b/changes/bug2850 new file mode 100644 index 0000000..77ccbfa --- /dev/null +++ b/changes/bug2850 @@ -0,0 +1,5 @@ + - Minor features + o Set SO_REUSEADDR on all sockets, not just listeners. This should + help busy exit nodes avoid running out of useable ports just because + all the ports have been used in the near past. Resolves issue 2850. + diff --git a/src/or/connection.c b/src/or/connection.c index 6e7bbd5..e90e13f 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -851,6 +851,25 @@ warn_too_many_conns(void) } } +/** Tell the TCP stack that it shouldn't wait for a long time after + * sock has closed before reusing its port. */ +static void +make_socket_reuseable(int sock) +{ +#ifdef MS_WINDOWS + (void) sock; +#else + int one=1; + + /* REUSEADDR on normal places means you can rebind to the port + * right after somebody else has let it go. But REUSEADDR on win32 + * means you can bind to the port _even when somebody else + * already has it bound_. So, don't do that on Win32. */ + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one, + (socklen_t)sizeof(one)); +#endif +} + /** Bind a new non-blocking socket listening to the socket described * by listensockaddr. * @@ -873,9 +892,6 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, if (listensockaddr->sa_family == AF_INET) { int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); -#ifndef MS_WINDOWS - int one=1; -#endif if (is_tcp) start_reading = 1; @@ -893,14 +909,7 @@ connection_create_listener(struct sockaddr *listensockaddr, socklen_t socklen, goto err; } -#ifndef MS_WINDOWS - /* REUSEADDR on normal places means you can rebind to the port - * right after somebody else has let it go. But REUSEADDR on win32 - * means you can bind to the port _even when somebody else - * already has it bound_. So, don't do that on Win32. */ - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*) &one, - (socklen_t)sizeof(one)); -#endif + make_socket_reuseable(s); if (bind(s,listensockaddr,socklen) < 0) { const char *helpfulhint = ""; @@ -1088,6 +1097,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) "Connection accepted on socket %d (child of fd %d).", news,conn->s); + make_socket_reuseable(news); set_socket_nonblocking(news); if (options->ConstrainedSockets) @@ -1297,6 +1307,8 @@ connection_connect(connection_t *conn, const char *address, log_debug(LD_NET, "Connecting to %s:%u.", escaped_safe_str_client(address), port); + make_socket_reuseable(s); + if (connect(s, dest_addr, dest_addr_len) < 0) { int e = tor_socket_errno(s); if (!ERRNO_IS_CONN_EINPROGRESS(e)) {

1 0