[or-cvs] r19260: {tor} If the bridge config line doesn't specify a port, assume 443 (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2009-04-10 20:16:05 -0400 (Fri, 10 Apr 2009)
New Revision: 19260

Modified:
   tor/trunk/ChangeLog
   tor/trunk/ReleaseNotes
   tor/trunk/src/or/config.c
Log:
If the bridge config line doesn't specify a port, assume 443.
This makes bridge lines a bit smaller and easier for users to
understand.

Also, remove a duplicate changelog entry from the past.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2009-04-11 00:12:52 UTC (rev 19259)
+++ tor/trunk/ChangeLog	2009-04-11 00:16:05 UTC (rev 19260)
@@ -1,8 +1,13 @@
-Changes in version 0.2.1.14-??? - 2009-04-??
+Changes in version 0.2.1.14-rc - 2009-04-??
   o Security fixes:
     - Avoid crashing in the presence of certain malformed descriptors.
       Found by lark, and by automated fuzzing.
 
+  o Minor features:
+    - If the bridge config line doesn't specify a port, assume 443.
+      This makes bridge lines a bit smaller and easier for users to
+      understand.
+
   o Minor bugfixes:
     - Avoid trying to print raw memory to the logs when we decide to
       give up on downloading a given relay descriptor. Bugfix on
@@ -936,11 +941,6 @@
       option as an alias for the actually-working --with-openssl-dir
       option. Fix the help documentation to recommend --with-openssl-dir.
       Based on a patch by "Dave". Bugfix on 0.2.0.1-alpha.
-    - Disallow session resumption attempts during the renegotiation
-      stage of the v2 handshake protocol. Clients should never be trying
-      session resumption at this point, but apparently some did, in
-      ways that caused the handshake to fail. Bug found by Geoff Goodell.
-      Bugfix on 0.2.0.20-rc.
     - When using the TransPort option on OpenBSD, and using the User
       option to change UID and drop privileges, make sure to open
       /dev/pf before dropping privileges. Fixes bug 782. Patch from

Modified: tor/trunk/ReleaseNotes
===================================================================
--- tor/trunk/ReleaseNotes	2009-04-11 00:12:52 UTC (rev 19259)
+++ tor/trunk/ReleaseNotes	2009-04-11 00:16:05 UTC (rev 19260)
@@ -252,11 +252,6 @@
       option as an alias for the actually-working --with-openssl-dir
       option. Fix the help documentation to recommend --with-openssl-dir.
       Based on a patch by "Dave". Bugfix on 0.2.0.1-alpha.
-    - Disallow session resumption attempts during the renegotiation
-      stage of the v2 handshake protocol. Clients should never be trying
-      session resumption at this point, but apparently some did, in
-      ways that caused the handshake to fail. Bug found by Geoff Goodell.
-      Bugfix on 0.2.0.20-rc.
     - When using the TransPort option on OpenBSD, and using the User
       option to change UID and drop privileges, make sure to open
       /dev/pf before dropping privileges. Fixes bug 782. Patch from

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2009-04-11 00:12:52 UTC (rev 19259)
+++ tor/trunk/src/or/config.c	2009-04-11 00:16:05 UTC (rev 19260)
@@ -4270,8 +4270,10 @@
     goto err;
   }
   if (!port) {
-    log_warn(LD_CONFIG, "Missing port in Bridge address '%s'",addrport);
-    goto err;
+    log_info(LD_CONFIG,
+             "Bridge address '%s' has no port; using default port 443.",
+             addrport);
+    port = 443;
   }
 
   if (smartlist_len(items)) {