r15957@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.

svn:r12047

diff --git a/ChangeLog b/ChangeLog
index 48d2485126b6c00ac2455924a06bcb4c93ddfcda..0cb96550de9f29567832646d29ea6bff01b1fbef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,9 @@ Changes in version 0.2.0.9-alpha - 2007-10-??
     - 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

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 4ed163e4310b2e4313ab7a89aa28c1c01e84d657..e773714eac5dc7ecbd60630e18fdc512fc480cdf 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1875,6 +1875,10 @@ generate_networkstatus_vote_obj(crypto_pk_env_t *private_key,
     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;