- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'asn-mytor/bug4531'
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit 14127f226d0e80201e8feac1ce0b8482ae701007 Merge: 26053bd 0cfdd88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 20 14:40:16 2011 -0500 Merge remote-tracking branch 'asn-mytor/bug4531' src/or/connection_or.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/master] Don't call tor_tls_set_logged_address till after checking conn->tls.
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit 0cfdd88adb6fcd6f75d0e571ed2cc9ae3e559ded Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Dec 20 19:17:58 2011 +0100 Don't call tor_tls_set_logged_address till after checking conn->tls. Fixes bug 4531. --- src/or/connection_or.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index cbe678d..7609138 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1099,12 +1099,13 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING; tor_assert(!conn->tls); conn->tls = tor_tls_new(conn->_base.s, receiving); - tor_tls_set_logged_address(conn->tls, // XXX client and relay? - escaped_safe_str(conn->_base.address)); if (!conn->tls) { log_warn(LD_BUG,"tor_tls_new failed. Closing."); return -1; } + tor_tls_set_logged_address(conn->tls, // XXX client and relay? + escaped_safe_str(conn->_base.address)); + #ifdef USE_BUFFEREVENTS if (connection_type_uses_bufferevent(TO_CONN(conn))) { const int filtering = get_options()->_UseFilteringSSLBufferevents;

1 0

[tor/master] duplicate changelog entry for 4531
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit d7531b2adc6d09e33f9a4a3accc4cf3fe28284d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 20 14:51:34 2011 -0500 duplicate changelog entry for 4531 --- changes/bug4531_take2 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug4531_take2 b/changes/bug4531_take2 new file mode 100644 index 0000000..fd4f5f0 --- /dev/null +++ b/changes/bug4531_take2 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix null-pointer access that could occur if TLS allocation failed. + Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". This was + erroneously listed as fixed in 0.2.3.9-alpha, but the fix had + accidentally been reverted.

1 0

[tor/master] Server transports should be instructed to bind on INADDR_ANY by default.
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit 539cb627f71b476eb325ae6fff829b1f360ada00 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Dec 18 13:21:58 2011 +0100 Server transports should be instructed to bind on INADDR_ANY by default. --- src/or/config.c | 30 +++++++++++++++++++----------- src/or/config.h | 2 +- src/or/transports.c | 7 ++++++- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 073b44d..521f760 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6828,21 +6828,29 @@ get_transport_bindaddr(const char *line, const char *transport) return NULL; } -/** Return a static string containing the address:port a proxy - * transport should bind on. */ -const char * +/** Return a string containing the address:port that a proxy transport + * should bind on. The string is stored on the heap and must be freed + * by the caller of this function. */ +char * get_bindaddr_for_transport(const char *transport) { - static const char default_addrport[] = "127.0.0.1:0"; - const char *bindaddr = NULL; + char *default_addrport = NULL; + const char *stored_bindaddr = NULL; config_line_t *line = get_transport_in_state_by_name(transport); - if (!line) - return default_addrport; - - bindaddr = get_transport_bindaddr(line->value, transport); - - return bindaddr ? bindaddr : default_addrport; + if (!line) /* Found no references in state for this transport. */ + goto no_bindaddr_found; + + stored_bindaddr = get_transport_bindaddr(line->value, transport); + if (stored_bindaddr) /* found stored bindaddr in state file. */ + return tor_strdup(stored_bindaddr); + + no_bindaddr_found: + /** If we didn't find references for this pluggable transport in the + state file, we should instruct the pluggable transport proxy to + listen on INADDR_ANY on a random ephemeral port. */ + tor_asprintf(&default_addrport, "%s:%s", fmt_addr32(INADDR_ANY), "0"); + return default_addrport; } /** Save transport listening on addr:port to diff --git a/src/or/config.h b/src/or/config.h index 2d94192..88258c1 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -77,7 +77,7 @@ int options_need_geoip_info(const or_options_t *options, void save_transport_to_state(const char *transport_name, const tor_addr_t *addr, uint16_t port); -const char *get_bindaddr_for_transport(const char *transport); +char *get_bindaddr_for_transport(const char *transport); int getinfo_helper_config(control_connection_t *conn, const char *question, char **answer, diff --git a/src/or/transports.c b/src/or/transports.c index 06bc039..1041502 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -920,13 +920,18 @@ static char * get_bindaddr_for_proxy(const managed_proxy_t *mp) { char *bindaddr = NULL; + char *bindaddr_tmp = NULL; smartlist_t *string_tmp = smartlist_create(); tor_assert(mp->is_server); SMARTLIST_FOREACH_BEGIN(mp->transports_to_launch, char *, t) { - tor_asprintf(&bindaddr, "%s-%s", t, get_bindaddr_for_transport(t)); + bindaddr_tmp = get_bindaddr_for_transport(t); + + tor_asprintf(&bindaddr, "%s-%s", t, bindaddr_tmp); smartlist_add(string_tmp, bindaddr); + + tor_free(bindaddr_tmp); } SMARTLIST_FOREACH_END(t); bindaddr = smartlist_join_strings(string_tmp, ",", 0, NULL);

1 0

[tor/master] Merge remote-tracking branch 'asn-mytor/bug4725_take2'
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit 26053bd7c90b2bd8e72bc836c48434c8d6de633f Merge: ba1766b 539cb62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 20 14:28:31 2011 -0500 Merge remote-tracking branch 'asn-mytor/bug4725_take2' src/or/config.c | 30 +++++++++++++++++++----------- src/or/config.h | 2 +- src/or/transports.c | 7 ++++++- 3 files changed, 26 insertions(+), 13 deletions(-)

1 0

[stem/master] Transparently allowing multiple PROTOCOLINFO calls
by atagar＠torproject.org 20 Dec '11

20 Dec '11

commit b4ca09871c7650ad6469c3b998ebc174605f4a7d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 20 09:41:29 2011 -0800 Transparently allowing multiple PROTOCOLINFO calls Tor hangs up on the socket for multiple reasons prior to authentication. One of them is if multiple PROTOCOLINFO queries are made. This is annoying and does not make sense to controller callers, so transparently re-establishing those socket connections. --- stem/connection.py | 14 ++++++++++---- test/integ/connection/protocolinfo.py | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index ddfed89..39be31d 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -521,9 +521,6 @@ def get_protocolinfo(control_socket): Issues a PROTOCOLINFO query to a control socket, getting information about the tor process running on it. - Tor hangs up on sockets after receiving a PROTOCOLINFO query if it isn't next - followed by authentication. - Arguments: control_socket (stem.socket.ControlSocket) - connected tor control socket @@ -538,6 +535,15 @@ def get_protocolinfo(control_socket): control_socket.send("PROTOCOLINFO 1") protocolinfo_response = control_socket.recv() + + # Tor hangs up on sockets after receiving a PROTOCOLINFO query if it isn't + # next followed by authentication. Transparently reconnect if that happens. + + if str(protocolinfo_response) == "Authentication required.": + control_socket.connect() + control_socket.send("PROTOCOLINFO 1") + protocolinfo_response = control_socket.recv() + ProtocolInfoResponse.convert(protocolinfo_response) # attempt ot expand relative cookie paths via the control port or socket file @@ -640,7 +646,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): # sanity check that we're a PROTOCOLINFO response if not list(self)[0].startswith("PROTOCOLINFO"): - msg = "Message is not a PROTOCOLINFO response" + msg = "Message is not a PROTOCOLINFO response (%s)" % self raise stem.socket.ProtocolError(msg) for line in self: diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index dfc1c01..e37f63b 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -118,6 +118,27 @@ class TestProtocolInfo(unittest.TestCase): # we don't have a control socket self.assertRaises(stem.socket.SocketError, stem.socket.ControlSocketFile, test.runner.CONTROL_SOCKET_PATH) + def test_multiple_protocolinfo_calls(self): + """ + Tests making repeated PROTOCOLINFO queries. This use case is interesting + because tor will shut down the socket and stem should transparently + re-establish it. + """ + + runner = test.runner.get_runner() + connection_type = runner.get_connection_type() + + if connection_type == test.runner.TorConnection.NONE: + self.skipTest("(no connection)") + + control_socket = runner.get_tor_socket(False) + + for i in range(5): + protocolinfo_response = stem.connection.get_protocolinfo(control_socket) + self.assert_protocolinfo_attr(protocolinfo_response, connection_type) + + control_socket.close() + def assert_protocolinfo_attr(self, protocolinfo_response, connection_type): """ Makes assertions that the protocolinfo response's attributes match those of

1 0

[stem/master] Integ test for general auth example
by atagar＠torproject.org 20 Dec '11

20 Dec '11

commit 1483606df372bebbd5c2b6707f777bfb898f21b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 20 09:18:16 2011 -0800 Integ test for general auth example Testing to make sure that the example in the authenticate() function's pydoc works. --- test/integ/connection/authentication.py | 55 +++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 6 deletions(-) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 3d7d199..bfcf8e0 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -1,6 +1,6 @@ """ Integration tests for authenticating to the control socket via -stem.connection.authenticate_* functions. +stem.connection.authenticate* functions. """ import os @@ -9,6 +9,7 @@ import functools import test.runner import stem.connection +import stem.socket # Responses given by tor for various authentication failures. These may change # in the future and if they do then this test should be updated. @@ -35,6 +36,41 @@ class TestAuthenticate(unittest.TestCase): if connection_type == test.runner.TorConnection.NONE: self.skipTest("(no connection)") + def test_authenticate_general_example(self): + """ + Tests the authenticate function with something like its pydoc example. + """ + + connection_type = test.runner.get_runner().get_connection_type() + connection_options = test.runner.CONNECTION_OPTS[connection_type] + + try: + control_socket = stem.socket.ControlPort(control_port = test.runner.CONTROL_PORT) + except stem.socket.SocketError: + # assert that we didn't have a socket to connect to + self.assertFalse(test.runner.OPT_PORT in connection_options) + return + + try: + # this authenticate call should work for everything but password-only auth + stem.connection.authenticate(control_socket) + self._exercise_socket(control_socket) + except stem.connection.IncorrectSocketType: + self.fail() + except stem.connection.MissingPassword: + self.assertTrue(test.runner.OPT_PASSWORD in connection_options) + controller_password = test.runner.CONTROL_PASSWORD + + try: + stem.connection.authenticate_password(control_socket, controller_password) + self._exercise_socket(control_socket) + except stem.connection.PasswordAuthFailed: + self.fail() + except stem.connection.AuthenticationFailure, exc: + self.fail() + finally: + control_socket.close() + def test_authenticate_none(self): """ Tests the authenticate_none function. @@ -265,8 +301,7 @@ class TestAuthenticate(unittest.TestCase): stem.connection.AuthenticationFailure if the authentication fails """ - runner = test.runner.get_runner() - control_socket = runner.get_tor_socket(False) + control_socket = test.runner.get_runner().get_tor_socket(False) auth_function = self._get_auth_function(control_socket, auth_type, *auth_args) # run the authentication, re-raising if there's a problem @@ -277,9 +312,17 @@ class TestAuthenticate(unittest.TestCase): control_socket.close() raise exc - # issues a 'GETINFO config-file' query to confirm that we can use the socket + self._exercise_socket(control_socket) + control_socket.close() + + def _exercise_socket(self, control_socket): + """ + Checks that we can now use the socket by issuing a 'GETINFO config-file' + query. + """ + + torrc_path = test.runner.get_runner().get_torrc_path() control_socket.send("GETINFO config-file") config_file_response = control_socket.recv() - self.assertEquals("config-file=%s\nOK" % runner.get_torrc_path(), str(config_file_response)) - control_socket.close() + self.assertEquals("config-file=%s\nOK" % torrc_path, str(config_file_response))

1 0

[stem/master] Basic verification integ test for general auth
by atagar＠torproject.org 20 Dec '11

20 Dec '11

commit 6d30fe9c9ca67a167b0085306ee5590a26f61d4b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 20 10:01:02 2011 -0800 Basic verification integ test for general auth Simple test that checks that the general authentication function can authenticate to all of our tor instances. --- run_tests.py | 4 ++-- test/integ/connection/authentication.py | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 206de76..ddea103 100755 --- a/run_tests.py +++ b/run_tests.py @@ -42,8 +42,8 @@ UNIT_TESTS = (("stem.socket.ControlMessage", test.unit.socket.control_message.Te ) INTEG_TESTS = (("stem.socket.ControlMessage", test.integ.socket.control_message.TestControlMessage), - ("stem.connection.authenticate_*", test.integ.connection.authentication.TestAuthenticate), - ("stem.connection.ProtocolInfoResponse", test.integ.connection.protocolinfo.TestProtocolInfo), + ("stem.connection.authenticate", test.integ.connection.authentication.TestAuthenticate), + ("stem.connection.get_protocolinfo", test.integ.connection.protocolinfo.TestProtocolInfo), ("stem.util.conf", test.integ.util.conf.TestConf), ("stem.util.system", test.integ.util.system.TestSystem), ) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index bfcf8e0..282a377 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -36,6 +36,16 @@ class TestAuthenticate(unittest.TestCase): if connection_type == test.runner.TorConnection.NONE: self.skipTest("(no connection)") + def test_authenticate_general(self): + """ + Tests that the authenticate function can authenticate to our socket. + """ + + control_socket = test.runner.get_runner().get_tor_socket(False) + stem.connection.authenticate(control_socket, test.runner.CONTROL_PASSWORD) + self._exercise_socket(control_socket) + control_socket.close() + def test_authenticate_general_example(self): """ Tests the authenticate function with something like its pydoc example. @@ -66,7 +76,7 @@ class TestAuthenticate(unittest.TestCase): self._exercise_socket(control_socket) except stem.connection.PasswordAuthFailed: self.fail() - except stem.connection.AuthenticationFailure, exc: + except stem.connection.AuthenticationFailure: self.fail() finally: control_socket.close()

1 0

[tor/master] Extract function to determine how many intros an intro point has handled
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit 46783eb6d7f6668ccfad6c4c44021e606cccdbcb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Dec 13 03:36:48 2011 -0800 Extract function to determine how many intros an intro point has handled --- src/or/rendservice.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 177f3bf..0f22cdf 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -28,6 +28,7 @@ static origin_circuit_t *find_intro_circuit(rend_intro_point_t *intro, const char *pk_digest); static rend_intro_point_t *find_intro_point(origin_circuit_t *circ); +static int intro_point_accepted_intro_count(rend_intro_point_t *intro); static int intro_point_should_expire_now(rend_intro_point_t *intro, time_t now); @@ -1937,6 +1938,18 @@ upload_service_descriptor(rend_service_t *service) service->desc_is_dirty = 0; } +/** Return the number of INTRODUCE2 cells an intro point has + * received. */ +static int +intro_point_accepted_intro_count(rend_intro_point_t *intro) +{ + if (intro->accepted_intro_rsa_parts == NULL) { + return 0; + } else { + return digestmap_size(intro->accepted_intro_rsa_parts); + } +} + /** Return non-zero iff intro should 'expire' now (i.e. we * should stop publishing it in new descriptors and eventually close * it). */ @@ -1957,8 +1970,7 @@ intro_point_should_expire_now(rend_intro_point_t *intro, return 1; } - if (intro->accepted_intro_rsa_parts != NULL && - digestmap_size(intro->accepted_intro_rsa_parts) >= + if (intro_point_accepted_intro_count(intro) >= INTRO_POINT_LIFETIME_INTRODUCTIONS) { /* This intro point has been used too many times. Expire it now. */ return 1;

1 0

[tor/master] Adjust n_intro_points_wanted when a service's intro points are closed
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit dae000735e75b178cdf27000d316f6504bf61373 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Dec 13 05:00:09 2011 -0800 Adjust n_intro_points_wanted when a service's intro points are closed --- changes/bug3825b | 7 +++ src/or/or.h | 5 ++ src/or/rendservice.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 0 deletions(-) diff --git a/changes/bug3825b b/changes/bug3825b new file mode 100644 index 0000000..08c0c2d --- /dev/null +++ b/changes/bug3825b @@ -0,0 +1,7 @@ + o Major features: + + - Adjust the number of introduction points that a hidden service + will try to maintain based on how long its introduction points + remain in use and how many introductions they handle. Fixes + part of bug 3825. + diff --git a/src/or/or.h b/src/or/or.h index 6ff02ee..63ff5c4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4114,6 +4114,11 @@ typedef struct rend_intro_point_t { * included in the last HS descriptor we generated. */ unsigned int listed_in_last_desc : 1; + /** (Service side only) Flag indicating that + * rend_service_note_removing_intro_point has been called for this + * intro point. */ + unsigned int rend_service_note_removing_intro_point_called : 1; + /** (Service side only) A digestmap recording the INTRODUCE2 cells * this intro point's circuit has received. Each key is the digest * of the RSA-encrypted part of a received INTRODUCE2 cell; each diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0f22cdf..646d423 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -116,6 +116,17 @@ num_rend_services(void) return smartlist_len(rend_service_list); } +/** Return a string identifying service, suitable for use in a + * log message. The result does not need to be freed, but may be + * overwritten by the next call to this function. */ +static const char * +rend_service_describe_for_log(rend_service_t *service) +{ + /* XXX024 Use this function throughout rendservice.c. */ + /* XXX024 Return a more useful description? */ + return safe_str_client(service->service_id); +} + /** Helper: free storage held by a single service authorized client entry. */ static void rend_authorized_client_free(rend_authorized_client_t *client) @@ -915,6 +926,104 @@ clean_accepted_intro_dh_parts(rend_service_t *service, time_t now) } DIGESTMAP_FOREACH_END; } +/** Called when intro will soon be removed from + * service's list of intro points. */ +static void +rend_service_note_removing_intro_point(rend_service_t *service, + rend_intro_point_t *intro) +{ + time_t now = time(NULL); + + /* Don't process an intro point twice here. */ + if (intro->rend_service_note_removing_intro_point_called) { + return; + } else { + intro->rend_service_note_removing_intro_point_called = 1; + } + + /* Update service->n_intro_points_wanted based on how long intro + * lasted and how many introductions it handled. */ + if (intro->time_published == -1) { + /* This intro point was never used. Don't change + * n_intro_points_wanted. */ + } else { + /* We want to increase the number of introduction points service + * operates if intro was heavily used, or decrease the number of + * intro points if intro was lightly used. + * + * We consider an intro point's target 'usage' to be + * INTRO_POINT_LIFETIME_INTRODUCTIONS introductions in + * INTRO_POINT_LIFETIME_MIN_SECONDS seconds. To calculate intro's + * fraction of target usage, we divide the fraction of + * _LIFETIME_INTRODUCTIONS introductions that it has handled by + * the fraction of _LIFETIME_MIN_SECONDS for which it existed. + * + * Then we take the reciprocal of that fraction of desired usage, + * then multiply by a fudge factor of 1.5, to decide how many new + * introduction points should ideally replace intro (which is now + * closed or soon to be closed). In theory, assuming that + * introduction load is distributed equally across all intro + * points and ignoring the fact that different intro points are + * established and closed at different times, that number of intro + * points should bring all of our intro points exactly to our + * target usage. + * + * Then we clamp that number to a number of intro points we might + * be willing to replace this intro point with and turn it into an + * integer. then we clamp it again to the number of new intro + * points we could establish now, then we adjust + * service->n_intro_points_wanted and let rend_services_introduce + * create the new intro points we want (if any). + */ + double fractional_n_intro_points_wanted_to_replace_this_one = + ((((double)now - intro->time_published) / + INTRO_POINT_LIFETIME_MIN_SECONDS) * + ((intro_point_accepted_intro_count(intro)) / + INTRO_POINT_LIFETIME_INTRODUCTIONS)) * 1.5; + unsigned int n_intro_points_wanted_to_replace_this_one; + unsigned int n_intro_points_wanted_now; + unsigned int n_intro_points_really_wanted_now; + int n_intro_points_really_replacing_this_one; + + if (fractional_n_intro_points_wanted_to_replace_this_one > + NUM_INTRO_POINTS_MAX) { + n_intro_points_wanted_to_replace_this_one = NUM_INTRO_POINTS_MAX; + } else if (fractional_n_intro_points_wanted_to_replace_this_one < 0) { + n_intro_points_wanted_to_replace_this_one = 0; + } else { + n_intro_points_wanted_to_replace_this_one = + fractional_n_intro_points_wanted_to_replace_this_one; + } + + n_intro_points_wanted_now = + service->n_intro_points_wanted + + n_intro_points_wanted_to_replace_this_one - 1; + + if (n_intro_points_wanted_now < NUM_INTRO_POINTS_DEFAULT) { + /* XXXX This should be NUM_INTRO_POINTS_MIN instead. Perhaps + * another use of NUM_INTRO_POINTS_DEFAULT should be, too. */ + n_intro_points_really_wanted_now = NUM_INTRO_POINTS_DEFAULT; + } else if (n_intro_points_wanted_now > NUM_INTRO_POINTS_MAX) { + n_intro_points_really_wanted_now = NUM_INTRO_POINTS_MAX; + } else { + n_intro_points_really_wanted_now = n_intro_points_wanted_now; + } + + n_intro_points_really_replacing_this_one = + n_intro_points_really_wanted_now - service->n_intro_points_wanted + 1; + + log_info(LD_REND, "Replacing closing intro point for service %s " + "with %d new intro points (wanted %g replacements); " + "service will now try to have %u intro points", + rend_service_describe_for_log(service), + n_intro_points_really_replacing_this_one, + fractional_n_intro_points_wanted_to_replace_this_one, + n_intro_points_really_wanted_now); + + service->n_intro_points_wanted = n_intro_points_really_wanted_now; + } +} + /****** * Handle cells ******/ @@ -2073,6 +2182,7 @@ rend_services_introduce(void) " (circuit disappeared).", safe_str_client(extend_info_describe(intro->extend_info)), safe_str_client(service->service_id)); + rend_service_note_removing_intro_point(service, intro); if (intro->time_expiring != -1) { log_info(LD_REND, "We were already expiring the intro point; " "no need to mark the HS descriptor as dirty over this."); @@ -2095,6 +2205,8 @@ rend_services_introduce(void) safe_str_client(extend_info_describe(intro->extend_info)), safe_str_client(service->service_id)); + rend_service_note_removing_intro_point(service, intro); + /* The polite (and generally Right) way to expire an intro * point is to establish a new one to replace it, publish a * new descriptor that doesn't list any expiring intro points,

1 0