[or-cvs] r12047: Report our IP address in our vote if it turns out that our h (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-19 12:28:13 -0400 (Fri, 19 Oct 2007)
New Revision: 12047

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/dirserv.c
Log:
 r15957 at catbus:  nickm | 2007-10-19 12:22:18 -0400
 Report our IP address in our vote if it turns out that our hostname isn't a fqdn.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15957] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-19 16:28:10 UTC (rev 12046)
+++ tor/trunk/ChangeLog	2007-10-19 16:28:13 UTC (rev 12047)
@@ -52,6 +52,9 @@
     - Treat missing v3 keys or certificates as an error when running as a
       v3 directory authority.
 
+    - If an authority doesn't have a qualified hostname, just put its address
+      in the 
+
   o Minor bugfixes (v3 directory protocol)
     - Delete unverified-consensus when the real consensus is set.
     - Consider retrying a consensus networkstatus fetch immediately after one

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-10-19 16:28:10 UTC (rev 12046)
+++ tor/trunk/src/or/dirserv.c	2007-10-19 16:28:13 UTC (rev 12047)
@@ -1875,6 +1875,10 @@
     log_warn(LD_NET, "Couldn't resolve my hostname");
     return NULL;
   }
+  if (!strchr(hostname, '.')) {
+    tor_free(hostname);
+    hostname = tor_dup_addr(addr);
+  }
   if (crypto_pk_get_digest(private_key, signing_key_digest)<0) {
     log_err(LD_BUG, "Error computing signing key digest");
     return NULL;