From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Jul 2011 17:17:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.3-alpha~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d7beea2ab513c31845abb61d79fb5960b038e4b;p=thirdparty%2Ftor.git

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

1d7beea2ab513c31845abb61d79fb5960b038e4b
diff --cc src/common/address.c
index d0c2d5e15c,7fc7301051..26a59e923e
--- a/src/common/address.c
+++ b/src/common/address.c
@@@ -958,23 -958,12 +958,25 @@@ fmt_addr(const tor_addr_t *addr
  {
    static char buf[TOR_ADDR_BUF_LEN];
    if (!addr) return "<null>";
-   tor_addr_to_str(buf, addr, sizeof(buf), 0);
-   return buf;
+   if (tor_addr_to_str(buf, addr, sizeof(buf), 0))
+     return buf;
+   else
+     return "???";
  }
  
 +/** Like fmt_addr(), but takes <b>addr</b> as a host-order IPv4
 + * addresses. Also not thread-safe, also clobbers its return buffer on
 + * repeated calls. */
 +const char *
 +fmt_addr32(uint32_t addr)
 +{
 +  static char buf[INET_NTOA_BUF_LEN];
 +  struct in_addr in;
 +  in.s_addr = htonl(addr);
 +  tor_inet_ntoa(&in, buf, sizeof(buf));
 +  return buf;
 +}
 +
  /** Convert the string in <b>src</b> to a tor_addr_t <b>addr</b>.  The string
   * may be an IPv4 address, an IPv6 address, or an IPv6 address surrounded by
   * square brackets.