Merge remote-tracking branch 'origin/maint-0.2.3'

2024-11-20 18:22:09 +01:00 · 2012-06-27 23:45:59 -04:00 · 2012-06-27 23:45:59 -04:00 · e12eba55b2
commit e12eba55b2
parent 86197dfd4f 23f2e37ff7
22 changed files with 77 additions and 70 deletions
--- a/59
+++ b/59
@ -1,3 +1,62 @@
+Changes in version 0.2.3.18-rc - 2012-06-28
+
+  o Major bugfixes:
+    - Make our linker option detection code more robust against linkers
+      such as on FreeBSD 8, where a bad combination of options completes
+      successfully but makes an unrunnable binary. Fixes bug 6173;
+      bugfix on 0.2.3.17-beta.
+
+  o Minor bugfixes (on 0.2.2.x and earlier):
+    - Avoid a false positive in the util/threads unit test by increasing
+      the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha.
+    - Replace "Sending publish request" log messages with "Launching
+      upload", so that they no longer confusingly imply that we're
+      sending somtheing to a directory we might not even be connected
+      to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha.
+    - When checking for requested signatures on the latest consensus
+      before serving it to a client, make sure to check the right
+      consensus flavor. Bugfix on 0.2.2.6-alpha.
+    - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN.
+      Fixes bug 5932; bugfix on 0.2.2.7-alpha.
+
+  o Minor bugfixes (on 0.2.3.x):
+    - Downgrade a message about cleaning the microdescriptor cache to
+      "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha.
+    - Improve log message issued when a managed proxy fails to
+      launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.
+    - Don't do DNS lookups when parsing corrupted managed proxy protocol
+      messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha.
+    - Avoid a warning caused by using strcspn() from glibc with clang 3.0.
+      Bugfix on 0.2.3.13-alpha.
+    - Make format_helper_exit_status() avoid unnecessary space padding and
+      stop confusing log_from_pipe(). Fixes ticket 5557.
+    - Make sure to set *socket_error in all error cases in
+      connection_connect(), so it can't produce a warning about errno
+      being zero from errno_to_orconn_end_reason(). Resolves ticket 6028.
+    - Remove non-bug log messages about running with circuit timeout
+      learning enabled from LD_BUG. Fixes bug 6169; bugfix on
+      0.2.3.17-beta.
+    - Disable a spurious warning about reading on a marked and flushing
+      connection. We shouldn't be doing that, but apparently we
+      sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta.
+    - Fix a bug that stopped AllowDotExit from working on addresses
+      that had an entry in the DNS cache. Fixes bug 6211; bugfix on
+      0.2.3.17-beta.
+    - Log a BUG message at INFO if we have a networkstatus with a missing
+      entry for some microdescriptor.
+
+  o Code simplification, refactoring, unit tests:
+    - Move tor_gettimeofday_cached() into compat_libevent.c, and use
+      Libevent's notion of cached time when possible.
+    - Remove duplicate code for invoking getrlimit() from control.c.
+    - Add a unit test for the environment_variable_names_equal function.
+
+  o Documentation:
+    - Document the --defaults-torrc option, and the new (in 0.2.3)
+      semantics for overriding, extending, and clearing lists of
+      options. Closes bug 4748.
+
+
 Changes in version 0.2.3.17-beta - 2012-06-15
  Tor 0.2.3.17-beta enables compiler and linker hardening by default,
  gets our TLS handshake back on track for being able to blend in with
--- a/changes/bug3311
+++ b/changes/bug3311
@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Replace "Sending publish request" log messages with "Launching
-      upload", so that they no longer confusingly imply that we're
-      sending somtheing to a directory we might not even be connected
-      to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha.
--- a/changes/bug4748
+++ b/changes/bug4748
@ -1,4 +0,0 @@
-  o Documentation:
-    - Document the --defaults-torrc option, and the new (in 0.2.3)
-      semantics for overriding, extending, and clearing lists of
-      options. Closes bug 4748.
--- a/changes/bug5099
+++ b/changes/bug5099
@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Improve log message issued when a managed proxy fails to
-      launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.
--- a/changes/bug5557
+++ b/changes/bug5557
@ -1,3 +0,0 @@
-  o Minor bugfixes
-    - Make format_helper_exit_status() avoid unnecessary space padding and
-      stop confusing log_from_pipe().  Fixes ticket 5557.
--- a/changes/bug5932
+++ b/changes/bug5932
@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN.
-      Fixes bug 5932; bugfix on 0.2.2.7-alpha.
--- a/changes/bug6028
+++ b/changes/bug6028
@ -1,4 +0,0 @@
- o Minor bugfixes:
-   - Make sure to set *socket_error in all error cases in
-     connection_connect(), so it can't produce a warning about errno being
-     zero from errno_to_orconn_end_reason().  Resolves ticket 6028.
--- a/changes/bug6169
+++ b/changes/bug6169
@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Remove a non-bug log messages about running with circuit timeout
-      learning enabled from LD_BUG. Fixes bug 6169; bugfix on
-      0.2.3.17-beta.
--- a/changes/bug6173
+++ b/changes/bug6173
@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Make our linker option detection code more robust against linkers
-      where a bad combination of options completes successfully but
-      makes an unrunnable binary. Fixes bug 6173; bugfix on 0.2.3.17-beta.
-
--- a/changes/bug6203
+++ b/changes/bug6203
@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Disable a spurious warning about reading on a marked and flushing
-      connection. We shouldn't be doing that, but apparently we
-      sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta.
-
--- a/changes/bug6211
+++ b/changes/bug6211
@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix a bug that stopped AllowDotExit from working on addresses
-      that had an entry in the DNS cache. Fixes bug 6211; bugfix on
-      0.2.3.17-beta.
--- a/changes/bug6226
+++ b/changes/bug6226
@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Don't do DNS lookups when parsing corrupted managed proxy
-      protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha.
--- a/changes/bug6227
+++ b/changes/bug6227
@ -1,3 +0,0 @@
-  o Minor bugfixes (unit tests):
-    - Avoid a false positive in the util/threads unit test by increasing
-      the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha.
--- a/changes/bug6238
+++ b/changes/bug6238
@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Downgrade a message about cleaning the microdescriptor cache to
-      "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha.
--- a/changes/bug6244
+++ b/changes/bug6244
@ -0,0 +1,4 @@
+  o Major bugfixes:
+    - Allow wildcarded mapaddress targets to be specified on the controlport.
+      Partial fix for bug 6244; bugfix on 0.2.3.9-alpha.
+
--- a/changes/check_correct_flav_sigs
+++ b/changes/check_correct_flav_sigs
@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When checking for requested signatures on the latest consensus before
-      serving it to a client, make sure to check the right consensus flavor.
-      Bugfix on 0.2.2.6-alpha.
--- a/changes/clang_strcspn
+++ b/changes/clang_strcspn
@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Avoid a warning caused by using strcspn from glibc with clang 3.0.
-      Bugfix on 0.2.3.13-alpha.
--- a/changes/descriptor_limit
+++ b/changes/descriptor_limit
@ -1,2 +0,0 @@
-  o Code simplification and refactoring:
-    - Remove duplicate code for invoking getrlimit() from control.c.
--- a/changes/envvar_test
+++ b/changes/envvar_test
@ -1,2 +0,0 @@
-  o New unit tests:
-    - Add a unit test for the environment_variable_names_equal function.
--- a/changes/log_bad_md_entry
+++ b/changes/log_bad_md_entry
@ -1,3 +0,0 @@
-  o Minor features (debugging):
-    - Log a BUG message at INFO if we have a networkstatus with a missing
-      entry for some microdescriptor.
--- a/changes/move_cached_gtod
+++ b/changes/move_cached_gtod
@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Move tor_gettimeofday_cached() into compat_libevent.c, and use
-      Libevent's notion of cached time when possible.
--- a/src/or/control.c
+++ b/src/or/control.c
@ -1313,6 +1313,17 @@ handle_control_takeownership(control_connection_t *conn, uint32_t len,
  return 0;
 }

+/** Return true iff <b>addr</b> is unusable as a mapaddress target because of
+ * containing funny characters. */
+static int
+address_is_invalid_mapaddress_target(const char *addr)
+{
+  if (!strcmpstart(addr, "*."))
+    return address_is_invalid_destination(addr+2, 1);
+  else
+    return address_is_invalid_destination(addr, 1);
+}
+
 /** Called when we get a MAPADDRESS command; try to bind all listed addresses,
 * and report success or failure. */
 static int
@ -1331,14 +1342,13 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len,
  reply = smartlist_new();
  smartlist_split_string(lines, body, " ",
                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  SMARTLIST_FOREACH(lines, char *, line,
-  {
+  SMARTLIST_FOREACH_BEGIN(lines, char *, line) {
    tor_strlower(line);
    smartlist_split_string(elts, line, "=", 0, 2);
    if (smartlist_len(elts) == 2) {
      const char *from = smartlist_get(elts,0);
      const char *to = smartlist_get(elts,1);
-      if (address_is_invalid_destination(to, 1)) {
+      if (address_is_invalid_mapaddress_target(to)) {
        smartlist_add_asprintf(reply,
                     "512-syntax error: invalid address '%s'", to);
        log_warn(LD_CONTROL,
@ -1370,7 +1380,7 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len,
    }
    SMARTLIST_FOREACH(elts, char *, cp, tor_free(cp));
    smartlist_clear(elts);
-  });
+  } SMARTLIST_FOREACH_END(line);
  SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp));
  smartlist_free(lines);
  smartlist_free(elts);