- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/split_entry_conn'
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 0cb01f5c971e497706b209c3fe75aedd089e3c8a Merge: 8aad677 569fe93 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 7 14:13:57 2011 -0400 Merge remote-tracking branch 'public/split_entry_conn' Conflicts: src/or/connection.c src/or/connection_edge.c src/or/connection_edge.h src/or/dnsserv.c Some of these were a little tricky, since they touched code that changed because of the prop171 fixes. src/or/circuitbuild.c | 15 +- src/or/circuituse.c | 99 ++++++----- src/or/circuituse.h | 6 +- src/or/connection.c | 106 +++++++----- src/or/connection.h | 1 + src/or/connection_edge.c | 413 ++++++++++++++++++++++++---------------------- src/or/connection_edge.h | 29 ++-- src/or/control.c | 64 ++++---- src/or/control.h | 2 +- src/or/directory.c | 9 +- src/or/dnsserv.c | 60 ++++--- src/or/dnsserv.h | 4 +- src/or/hibernate.c | 2 +- src/or/main.c | 8 +- src/or/or.h | 104 ++++++++---- src/or/relay.c | 102 +++++++----- src/or/rendclient.c | 34 ++-- 17 files changed, 585 insertions(+), 473 deletions(-) diff --cc src/or/connection.c index 1b227d7,012a3fb..97989c0 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1211,10 -1268,9 +1231,10 @@@ connection_init_accepted_conn(connectio control_event_or_conn_status(TO_OR_CONN(conn), OR_CONN_EVENT_NEW, 0); return connection_tls_start_handshake(TO_OR_CONN(conn), 1); case CONN_TYPE_AP: - TO_EDGE_CONN(conn)->isolation_flags = listener->isolation_flags; - TO_EDGE_CONN(conn)->session_group = listener->session_group; - TO_EDGE_CONN(conn)->nym_epoch = get_signewnym_epoch(); - TO_EDGE_CONN(conn)->socks_request->listener_type = listener->_base.type; + TO_ENTRY_CONN(conn)->isolation_flags = listener->isolation_flags; + TO_ENTRY_CONN(conn)->session_group = listener->session_group; + TO_ENTRY_CONN(conn)->nym_epoch = get_signewnym_epoch(); ++ TO_ENTRY_CONN(conn)->socks_request->listener_type = listener->_base.type; switch (TO_CONN(listener)->type) { case CONN_TYPE_AP_LISTENER: conn->state = AP_CONN_STATE_SOCKS_WAIT; diff --cc src/or/connection_edge.c index 7028764,df4acc4..0d2c10f --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@@ -2441,12 -2455,11 +2454,11 @@@ connection_ap_handshake_send_begin(entr ap_conn->sending_optimistic_data) && connection_ap_supports_optimistic_data(ap_conn)) { log_info(LD_APP, "Sending up to %ld + %ld bytes of queued-up data", - (long)connection_get_inbuf_len(TO_CONN(ap_conn)), - ap_conn->sending_optimistic_data ? - (long)generic_buffer_len(ap_conn->sending_optimistic_data) : - 0); - if (connection_edge_package_raw_inbuf(ap_conn, 1, NULL) < 0) { - connection_mark_for_close(TO_CONN(ap_conn)); - connection_get_inbuf_len(base_conn), ++ (long)connection_get_inbuf_len(base_conn), + ap_conn->sending_optimistic_data ? - generic_buffer_len(ap_conn->sending_optimistic_data) : 0); ++ (long)generic_buffer_len(ap_conn->sending_optimistic_data) : 0); + if (connection_edge_package_raw_inbuf(edge_conn, 1, NULL) < 0) { + connection_mark_for_close(base_conn); } } @@@ -3380,9 -3425,9 +3395,9 @@@ connection_edge_compatible_with_circuit tor_strdup(conn->socks_request->address); } - /* If isolation_values_set, then the circuit is not compatible with - * any new ISO_STREAM stream. */ - if (iso & ISO_STREAM) + if ((iso & ISO_STREAM) && + (circ->associated_isolated_stream_global_id != - TO_CONN(conn)->global_identifier)) ++ ENTRY_TO_CONN(conn)->global_identifier)) return 0; if ((iso & ISO_DESTPORT) && conn->socks_request->port != circ->dest_port) @@@ -3435,21 -3477,17 +3450,21 @@@ connection_edge_update_circuit_isolatio if (!circ->isolation_values_set) { if (dry_run) return -1; + circ->associated_isolated_stream_global_id = - TO_CONN(conn)->global_identifier; ++ ENTRY_TO_CONN(conn)->global_identifier; circ->dest_port = conn->socks_request->port; circ->dest_address = tor_strdup(conn->original_dest_address); - circ->client_proto_type = ENTRY_TO_CONN(conn)->type; + circ->client_proto_type = conn->socks_request->listener_type; circ->client_proto_socksver = conn->socks_request->socks_version; - tor_addr_copy(&circ->client_addr, &TO_CONN(conn)->addr); + tor_addr_copy(&circ->client_addr, &ENTRY_TO_CONN(conn)->addr); circ->session_group = conn->session_group; circ->nym_epoch = conn->nym_epoch; - circ->socks_username = conn->socks_request->username ? - tor_strdup(conn->socks_request->username) : NULL; - circ->socks_password = conn->socks_request->password ? - tor_strdup(conn->socks_request->password) : NULL; + circ->socks_username = sr->username ? + tor_memdup(sr->username, sr->usernamelen) : NULL; + circ->socks_password = sr->password ? + tor_memdup(sr->password, sr->passwordlen) : NULL; + circ->socks_username_len = sr->usernamelen; + circ->socks_password_len = sr->passwordlen; circ->isolation_values_set = 1; return 0; @@@ -3459,15 -3497,13 +3474,15 @@@ mixed |= ISO_DESTPORT; if (strcasecmp(conn->original_dest_address, circ->dest_address)) mixed |= ISO_DESTADDR; - if (strcmp_opt(conn->socks_request->username, circ->socks_username) || - strcmp_opt(conn->socks_request->password, circ->socks_password)) + if (!memeq_opt(sr->username, sr->usernamelen, + circ->socks_username, circ->socks_username_len) || + !memeq_opt(sr->password, sr->passwordlen, + circ->socks_password, circ->socks_password_len)) mixed |= ISO_SOCKSAUTH; - if ((ENTRY_TO_CONN(conn)->type != circ->client_proto_type || + if ((conn->socks_request->listener_type != circ->client_proto_type || conn->socks_request->socks_version != circ->client_proto_socksver)) mixed |= ISO_CLIENTPROTO; - if (!tor_addr_eq(&TO_CONN(conn)->addr, &circ->client_addr)) + if (!tor_addr_eq(&ENTRY_TO_CONN(conn)->addr, &circ->client_addr)) mixed |= ISO_CLIENTADDR; if (conn->session_group != circ->session_group) mixed |= ISO_SESSIONGRP; diff --cc src/or/connection_edge.h index 36aead1,cf60cf4..75a54e8 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@@ -105,9 -105,11 +105,10 @@@ hostname_type_t parse_extended_hostname int get_pf_socket(void); #endif - int connection_edge_compatible_with_circuit(const edge_connection_t *conn, -int connection_edge_streams_are_compatible(const entry_connection_t *a, - const entry_connection_t *b); ++ + int connection_edge_compatible_with_circuit(const entry_connection_t *conn, const origin_circuit_t *circ); - int connection_edge_update_circuit_isolation(const edge_connection_t *conn, + int connection_edge_update_circuit_isolation(const entry_connection_t *conn, origin_circuit_t *circ, int dry_run); void circuit_clear_isolation(origin_circuit_t *circ); diff --cc src/or/dnsserv.c index 19d0427,a54530c..7f51939 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@@ -124,23 -126,22 +126,23 @@@ evdns_server_callback(struct evdns_serv TO_CONN(conn)->address = tor_dup_addr(&tor_addr); if (q->type == EVDNS_TYPE_A) - conn->socks_request->command = SOCKS_COMMAND_RESOLVE; + entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE; else - conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; + entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR; - strlcpy(conn->socks_request->address, q->name, - sizeof(conn->socks_request->address)); + strlcpy(entry_conn->socks_request->address, q->name, + sizeof(entry_conn->socks_request->address)); - conn->socks_request->listener_type = listener->_base.type; - conn->dns_server_request = req; - conn->isolation_flags = listener->isolation_flags; - conn->session_group = listener->session_group; - conn->nym_epoch = get_signewnym_epoch(); ++ entry_conn->socks_request->listener_type = listener->_base.type; + entry_conn->dns_server_request = req; + entry_conn->isolation_flags = listener->isolation_flags; + entry_conn->session_group = listener->session_group; + entry_conn->nym_epoch = get_signewnym_epoch(); - if (connection_add(TO_CONN(conn)) < 0) { + if (connection_add(ENTRY_TO_CONN(entry_conn)) < 0) { log_warn(LD_APP, "Couldn't register dummy connection for DNS request"); evdns_server_request_respond(req, DNS_ERR_SERVERFAILED); - connection_free(TO_CONN(conn)); + connection_free(ENTRY_TO_CONN(entry_conn)); return; } @@@ -183,14 -186,13 +187,14 @@@ dnsserv_launch_request(const char *name conn->is_dns_request = 1; - strlcpy(conn->socks_request->address, name, - sizeof(conn->socks_request->address)); + strlcpy(entry_conn->socks_request->address, name, + sizeof(entry_conn->socks_request->address)); - conn->socks_request->listener_type = CONN_TYPE_CONTROL_LISTENER; - conn->original_dest_address = tor_strdup(name); - conn->session_group = SESSION_GROUP_CONTROL_RESOLVE; - conn->nym_epoch = get_signewnym_epoch(); - conn->isolation_flags = ISO_DEFAULT; ++ entry_conn->socks_request->listener_type = CONN_TYPE_CONTROL_LISTENER; + entry_conn->original_dest_address = tor_strdup(name); + entry_conn->session_group = SESSION_GROUP_CONTROL_RESOLVE; + entry_conn->nym_epoch = get_signewnym_epoch(); + entry_conn->isolation_flags = ISO_DEFAULT; if (connection_add(TO_CONN(conn))<0) { log_warn(LD_APP, "Couldn't register dummy connection for RESOLVE request");

1 0

[arm/master] Moving interpretor actions into functions
by atagar＠torproject.org 07 Sep '11

07 Sep '11

commit 2727cf690f07d7c25f890621c122fd48915d5637 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 1 20:34:29 2011 -0700 Moving interpretor actions into functions Simplifying the handleQuery function by moving each of the interpretor actions into their own 'doX' function. --- src/util/torInterpretor.py | 91 ++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 45 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index 0db95c3..7eaec16 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -217,23 +217,57 @@ class ControlInterpretor: return self.contents + [appendPrompt] else: return self.contents - def writeContents(self, path): + def doWrite(self, arg, outputEntry): """ - Attempts to write the display contents to a given path, raising an IOError - if unsuccessful. - - Arguments: - path - location to write the interpretor content to + Performs the '/write' operation, which attempts to save the backlog to a + given path, defaulting to the last location we write to. """ + if arg: self.writePath = arg outputLines = [] for line in self.contents: outputLines.append("".join([msg for msg, _ in line])) - outputFile = open(path, "w") - outputFile.write("\n".join(outputLines)) - outputFile.close() + try: + outputFile = open(self.writePath, "w") + outputFile.write("\n".join(outputLines)) + outputFile.close() + outputEntry.append(("Interpretor backlog written to: %s" % self.writePath, OUTPUT_FORMAT)) + except IOError, exc: + outputEntry.append(("Unable to write to '%s': %s" % (self.writePath, exc), ERROR_FORMAT)) + + def doFind(self, arg, outputEntry): + """ + Performs the '/find' operation, which lists output from the backlog which + matches the given regex. Results are deduplicated and matches are bolded. + """ + + argMatcher = None + + if not arg: + outputEntry.append(("Nothing to match against", ERROR_FORMAT)) + else: + try: argMatcher = re.compile("(%s)" % arg) + except: outputEntry.append(("Unable to compile regex '%s'" % arg, ERROR_FORMAT)) + + if argMatcher: + printedLines = [] + + for line in self.contents: + lineText = "".join([msg for msg, _ in line]) + + # skip if this was user input or a duplicate + if lineText.startswith(PROMPT[0]) or lineText in printedLines: + continue + + match = argMatcher.search(lineText) + if match: + # outputs the matching line, with the match itself bolded + outputEntry.append((lineText[:match.start()], OUTPUT_FORMAT)) + outputEntry.append((match.group(), (OUTPUT_FORMAT + (Attr.BOLD, )))) + outputEntry.append((lineText[match.end():] + "\n", OUTPUT_FORMAT)) + printedLines.append(lineText) def handleQuery(self, input): """ @@ -271,42 +305,9 @@ class ControlInterpretor: # interpretor command inputEntry.append((input, INPUT_INTERPRETOR_FORMAT)) - if cmd == "/quit": - raise InterpretorClosed() - elif cmd == "/write": - if arg: self.writePath = arg - - try: - self.writeContents(self.writePath) - outputEntry.append(("Interpretor backlog written to: %s" % self.writePath, OUTPUT_FORMAT)) - except IOError, exc: - outputEntry.append(("Unable to write to '%s': %s" % (self.writePath, exc), ERROR_FORMAT)) - elif cmd == "/find": - argMatcher = None - - if not arg: - outputEntry.append(("Nothing to match against", ERROR_FORMAT)) - else: - try: argMatcher = re.compile("(%s)" % arg) - except: outputEntry.append(("Unable to compile regex '%s'" % arg, ERROR_FORMAT)) - - if argMatcher: - printedLines = [] - - for line in self.contents: - lineText = "".join([msg for msg, _ in line]) - - # skip if this was user input or a duplicate - if lineText.startswith(PROMPT[0]) or lineText in printedLines: - continue - - match = argMatcher.search(lineText) - if match: - # outputs the matching line, with the match itself bolded - outputEntry.append((lineText[:match.start()], OUTPUT_FORMAT)) - outputEntry.append((match.group(), (OUTPUT_FORMAT + (Attr.BOLD, )))) - outputEntry.append((lineText[match.end():] + "\n", OUTPUT_FORMAT)) - printedLines.append(lineText) + if cmd == "/quit": raise InterpretorClosed() + elif cmd == "/write": self.doWrite(arg, outputEntry) + elif cmd == "/find": self.doFind(arg, outputEntry) else: outputEntry.append(("Not yet implemented...", ERROR_FORMAT)) # TODO: implement

1 0

[arm/master] Util for fingerprint -> (ip address, or port) maps
by atagar＠torproject.org 07 Sep '11

07 Sep '11

commit 6734eaff90dfc1f0fd57544755de1632381fcdee Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 3 14:16:56 2011 -0700 Util for fingerprint -> (ip address, or port) maps Moving lookup functionality for the address/or port of relays from the connection panel into the utils. This is a generally useful bit of information, and needed for the interpretor panel. --- src/cli/connections/circEntry.py | 31 ++------------------------- src/util/torTools.py | 41 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/src/cli/connections/circEntry.py b/src/cli/connections/circEntry.py index 7bf21db..25966df 100644 --- a/src/cli/connections/circEntry.py +++ b/src/cli/connections/circEntry.py @@ -13,32 +13,6 @@ import curses from cli.connections import entries, connEntry from util import torTools, uiTools -# cached fingerprint -> (IP Address, ORPort) results -RELAY_INFO = {} - -def getRelayInfo(fingerprint): - """ - Provides the (IP Address, ORPort) tuple for the given relay. If the lookup - fails then this returns ("192.168.0.1", "0"). - - Arguments: - fingerprint - relay to look up - """ - - if not fingerprint in RELAY_INFO: - conn = torTools.getConn() - failureResult = ("192.168.0.1", "0") - - nsEntry = conn.getConsensusEntry(fingerprint) - if not nsEntry: return failureResult - - nsLineComp = nsEntry.split("\n")[0].split(" ") - if len(nsLineComp) < 8: return failureResult - - RELAY_INFO[fingerprint] = (nsLineComp[6], nsLineComp[7]) - - return RELAY_INFO[fingerprint] - class CircEntry(connEntry.ConnectionEntry): def __init__(self, circuitID, status, purpose, path): connEntry.ConnectionEntry.__init__(self, "127.0.0.1", "0", "127.0.0.1", "0") @@ -72,14 +46,15 @@ class CircEntry(connEntry.ConnectionEntry): self.status = status self.lines = [self.lines[0]] + conn = torTools.getConn() if status == "BUILT" and not self.lines[0].isBuilt: - exitIp, exitORPort = getRelayInfo(path[-1]) + exitIp, exitORPort = conn.getRelayAddress(path[-1], ("192.168.0.1", "0")) self.lines[0].setExit(exitIp, exitORPort, path[-1]) for i in range(len(path)): relayFingerprint = path[i] - relayIp, relayOrPort = getRelayInfo(relayFingerprint) + relayIp, relayOrPort = conn.getRelayAddress(relayFingerprint, ("192.168.0.1", "0")) if i == len(path) - 1: if status == "BUILT": placementType = "Exit" diff --git a/src/util/torTools.py b/src/util/torTools.py index 5c1b1ad..adc175a 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -389,6 +389,7 @@ class Controller(TorCtl.PostEventListener): self._fingerprintsAttachedCache = None # cache of relays we're connected to self._nicknameLookupCache = {} # lookup cache with fingerprint -> nickname mappings self._nicknameToFpLookupCache = {} # lookup cache with nickname -> fingerprint mappings + self._addressLookupCache = {} # lookup cache with fingerprint -> (ip address, or port) mappings self._consensusLookupCache = {} # lookup cache with network status entries self._descriptorLookupCache = {} # lookup cache with relay descriptors self._isReset = False # internal flag for tracking resets @@ -462,6 +463,7 @@ class Controller(TorCtl.PostEventListener): self._fingerprintsAttachedCache = None self._nicknameLookupCache = {} self._nicknameToFpLookupCache = {} + self._addressLookupCache = {} self._consensusLookupCache = {} self._descriptorLookupCache = {} @@ -1248,6 +1250,44 @@ class Controller(TorCtl.PostEventListener): return result + def getRelayAddress(self, relayFingerprint, default = None): + """ + Provides the (IP Address, ORPort) tuple for a given relay. If the lookup + fails then this returns the default. + + Arguments: + relayFingerprint - fingerprint of the relay + """ + + self.connLock.acquire() + + result = None + if self.isAlive(): + # query the address if it isn't yet cached + if not relayFingerprint in self._addressLookupCache: + if relayFingerprint == self.getInfo("fingerprint"): + # this is us, simply check the config + myAddress = self.getInfo("address") + myOrPort = self.getOption("ORPort") + + if myAddress and myOrPort: + self._addressLookupCache[relayFingerprint] = (myAddress, myOrPort) + else: + # check the consensus for the relay + nsEntry = self.getConsensusEntry(relayFingerprint) + + if nsEntry: + nsLineComp = nsEntry.split("\n")[0].split(" ") + + if len(nsLineComp) >= 8: + self._addressLookupCache[relayFingerprint] = (nsLineComp[6], nsLineComp[7]) + + result = self._addressLookupCache.get(relayFingerprint, default) + + self.connLock.release() + + return result + def getNicknameFingerprint(self, relayNickname): """ Provides the fingerprint associated with the given relay. This provides @@ -1590,6 +1630,7 @@ class Controller(TorCtl.PostEventListener): self._fingerprintsAttachedCache = None self._nicknameLookupCache = {} self._nicknameToFpLookupCache = {} + self._addressLookupCache = {} self._consensusLookupCache = {} if self._fingerprintMappings != None:

1 0

[arm/master] Exposing ip -> (port, fp) mappings in tor util
by atagar＠torproject.org 07 Sep '11

07 Sep '11

commit 5ef37f23c8ae7270a1ed773487208ce7f81007e1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Sep 7 10:00:29 2011 -0700 Exposing ip -> (port, fp) mappings in tor util Providing the cached relay locale mappings in the torTools util. This is generally useful information and gonna be needed to query the locales of all exits. --- src/util/torTools.py | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index adc175a..8567158 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1288,6 +1288,36 @@ class Controller(TorCtl.PostEventListener): return result + def getAllRelayAddresses(self, default = {}): + """ + Provides a mapping of... + Relay IP Address -> [(ORPort, Fingerprint)...] + + for all relays currently in the cached consensus. + + Arguments: + default - value returned if the query fails + """ + + self.connLock.acquire() + + result = default + + if self.isAlive(): + # check both if the cached mappings are unset or blank + if not self._fingerprintMappings: + self._fingerprintMappings = self._getFingerprintMappings() + + # Make a shallow copy of the results. This doesn't protect the internal + # listings, but good enough for the moment. + # TODO: change the [(port, fingerprint)...] lists to tuples? + if self._fingerprintMappings != {}: + result = dict(self._fingerprintMappings) + + self.connLock.release() + + return result + def getNicknameFingerprint(self, relayNickname): """ Provides the fingerprint associated with the given relay. This provides

1 0

[tor/master] Die if tor_vasprintf fails in connection_printf_to_buf
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 8aad677bb7542376b053ecd12a0c6943e8cfa3c0 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 15:16:25 2011 -0700 Die if tor_vasprintf fails in connection_printf_to_buf tor_asprintf already asserts if it fails. --- changes/bug3428b | 9 +++++++++ src/or/control.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug3428b b/changes/bug3428b new file mode 100644 index 0000000..2cdd688 --- /dev/null +++ b/changes/bug3428b @@ -0,0 +1,9 @@ + o Minor bugfixes: + - Abort if tor_vasprintf fails in connection_printf_to_buf (a + utility function used in the control-port code). This shouldn't + ever happen unless Tor is completely out of memory, but if it + had happened and Tor somehow recovered from it, Tor could have + sent a log message to a control port in the middle of a reply to + a controller command. Fixes part of bug 3428. + + diff --git a/src/or/control.c b/src/or/control.c index 853f4c4..513e968 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -503,8 +503,8 @@ connection_printf_to_buf(control_connection_t *conn, const char *format, ...) va_end(ap); if (len < 0) { - log_warn(LD_BUG, "Unable to format string for controller."); - return; + log_err(LD_BUG, "Unable to format string for controller."); + tor_assert(0); } connection_write_to_buf(buf, (size_t)len, TO_CONN(conn));

1 0

[tor/master] Look for correct "ar" to cross-compile
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 5f9cdee8afd3fb0db835c19993fae476e0f00033 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 2 11:51:49 2011 -0400 Look for correct "ar" to cross-compile For some reason, autoconf doesn't by default have an "AC_PROG_AR" for this -- possibly it's assumed that any "ar" you have will work everyplace. Fixes bug 3909; found by sid77. This fixes a build issue first present in fdbdb4dc1500, but the bug (of not using a correct ar) has been in every Tor version ever: it just didn't matter until then. --- changes/bug3909 | 3 +++ configure.in | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug3909 b/changes/bug3909 new file mode 100644 index 0000000..0b4b292 --- /dev/null +++ b/changes/bug3909 @@ -0,0 +1,3 @@ + o Build fixes: + - Search for a platform-specific version of "ar" when cross-compiling. + Should fix builds on iOS. Found by Marco Bonetti. diff --git a/configure.in b/configure.in index 4e84298..52ea094 100644 --- a/configure.in +++ b/configure.in @@ -118,6 +118,12 @@ if test "$enable_local_appdata" = "yes"; then [Defined if we default to host local appdata paths on Windows]) fi +dnl check for the correct "ar" when cross-compiling +AN_MAKEVAR([AR], [AC_PROG_AR]) +AN_PROGRAM([ar], [AC_PROG_AR]) +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])]) +AC_PROG_AR + AC_PROG_CC AC_PROG_CPP AC_PROG_MAKE_SET

1 0

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

07 Sep '11

commit b70a0a43750f6aabe800a83bcd7fdd6a5a14911b Merge: 947012e 5f9cdee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 7 12:11:35 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: configure.in Conflict was between two pieces of configure.in logic added to the same place. Trivial. changes/bug3909 | 3 +++ configure.in | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --cc configure.in index f3640cb,52ea094..824547c --- a/configure.in +++ b/configure.in @@@ -145,9 -118,12 +145,15 @@@ if test "$enable_local_appdata" = "yes" [Defined if we default to host local appdata paths on Windows]) fi +AC_ARG_ENABLE(bufferevents, + AS_HELP_STRING(--enable-bufferevents, use Libevent's buffered IO.)) + + dnl check for the correct "ar" when cross-compiling + AN_MAKEVAR([AR], [AC_PROG_AR]) + AN_PROGRAM([ar], [AC_PROG_AR]) + AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])]) + AC_PROG_AR + AC_PROG_CC AC_PROG_CPP AC_PROG_MAKE_SET

1 0

[tor/maint-0.2.2] Look for correct "ar" to cross-compile
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 5f9cdee8afd3fb0db835c19993fae476e0f00033 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 2 11:51:49 2011 -0400 Look for correct "ar" to cross-compile For some reason, autoconf doesn't by default have an "AC_PROG_AR" for this -- possibly it's assumed that any "ar" you have will work everyplace. Fixes bug 3909; found by sid77. This fixes a build issue first present in fdbdb4dc1500, but the bug (of not using a correct ar) has been in every Tor version ever: it just didn't matter until then. --- changes/bug3909 | 3 +++ configure.in | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug3909 b/changes/bug3909 new file mode 100644 index 0000000..0b4b292 --- /dev/null +++ b/changes/bug3909 @@ -0,0 +1,3 @@ + o Build fixes: + - Search for a platform-specific version of "ar" when cross-compiling. + Should fix builds on iOS. Found by Marco Bonetti. diff --git a/configure.in b/configure.in index 4e84298..52ea094 100644 --- a/configure.in +++ b/configure.in @@ -118,6 +118,12 @@ if test "$enable_local_appdata" = "yes"; then [Defined if we default to host local appdata paths on Windows]) fi +dnl check for the correct "ar" when cross-compiling +AN_MAKEVAR([AR], [AC_PROG_AR]) +AN_PROGRAM([ar], [AC_PROG_AR]) +AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])]) +AC_PROG_AR + AC_PROG_CC AC_PROG_CPP AC_PROG_MAKE_SET

1 0

[tor/master] Make FetchUselessDescriptors fetch all desc types
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 3b02a959b32c1664a2a62b36badda343cca1bc6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 29 11:18:06 2011 -0400 Make FetchUselessDescriptors fetch all desc types Previously, if you were set up to use microdescriptors, and you weren't a cache, you'd never fetch router descriptors (except for bridges). Now FetchUselessDescriptors causes descriptors and mirodescs to get cached. Also, FetchUselessDescriptors changes the behavior of "UseMicrodescriptors auto" to be off, since there's no point in saying "UseMicrodescriptors 1" when you have full descriptors too. Fix for bug 3851; bugfix on 0.2.3.1-alpha. --- changes/bug3851 | 4 ++++ src/or/microdesc.c | 9 +++++++-- src/or/networkstatus.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/bug3851 b/changes/bug3851 new file mode 100644 index 0000000..91572f0 --- /dev/null +++ b/changes/bug3851 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Make 'FetchUselessDescriptors' cause all descriptor types and + all consensus types get fetched. Fixes bug 3851; bugfix on + 0.2.3.1-alpha. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 627fad5..510b2f4 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -698,8 +698,9 @@ we_use_microdescriptors_for_circuits(const or_options_t *options) int ret = options->UseMicrodescriptors; if (ret == -1) { /* UseMicrodescriptors is "auto"; we need to decide: */ - /* So we decide that we'll use microdescriptors iff we are not a server */ - ret = ! server_mode(options); + /* So we decide that we'll use microdescriptors iff we are not a server, + * and we're not autofetching everything. */ + ret = !server_mode(options) && !options->FetchUselessDescriptors; } return ret; } @@ -710,6 +711,8 @@ we_fetch_microdescriptors(const or_options_t *options) { if (directory_caches_dir_info(options)) return 1; + if (options->FetchUselessDescriptors) + return 1; return we_use_microdescriptors_for_circuits(options); } @@ -719,6 +722,8 @@ we_fetch_router_descriptors(const or_options_t *options) { if (directory_caches_dir_info(options)) return 1; + if (options->FetchUselessDescriptors) + return 1; return ! we_use_microdescriptors_for_circuits(options); } diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 868c2a2..398f041 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1187,6 +1187,10 @@ we_want_to_fetch_flavor(const or_options_t *options, int flavor) * it ourselves. */ return 1; } + if (options->FetchUselessDescriptors) { + /* In order to get all descriptors, we need to fetch all consensuses. */ + return 1; + } /* Otherwise, we want the flavor only if we want to use it to build * circuits. */ return flavor == usable_consensus_flavor();

1 0

[tor/master] Merge remote-tracking branch 'public/bug3851'
by nickm＠torproject.org 07 Sep '11

07 Sep '11

commit 947012e153e76ceb8015ea426a895f21b63cd677 Merge: 9ef2cd7 3b02a95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 7 11:22:24 2011 -0400 Merge remote-tracking branch 'public/bug3851' changes/bug3851 | 4 ++++ src/or/microdesc.c | 9 +++++++-- src/or/networkstatus.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-)

1 0