[tor-commits] [tor/master] Fix a bogus warning

[nickm at torproject.org]

commit c1ac0695d5bc64b555c345e4be87b18bab3ae56b
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Wed Sep 14 00:05:03 2011 -0700

    Fix a bogus warning
---
 changes/dont-warn-about-rfc1918-socksport-addrs |    7 +++++++
 src/or/config.c                                 |    5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changes/dont-warn-about-rfc1918-socksport-addrs b/changes/dont-warn-about-rfc1918-socksport-addrs
new file mode 100644
index 0000000..9482599
--- /dev/null
+++ b/changes/dont-warn-about-rfc1918-socksport-addrs
@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+
+    - Don't warn users that they are exposing a client port to the
+      Internet if they have specified an RFC1918 address.  Previously,
+      we would warn if the user had specified any non-loopback
+      address.  Bugfix on 0.2.3.3-alpha.  Fixes bug 4018; reported by Tas.
+
diff --git a/src/or/config.c b/src/or/config.c
index bc77b3a..51cab81 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4912,12 +4912,13 @@ port_cfg_free(port_cfg_t *port)
   tor_free(port);
 }
 
-/** Warn for every port in <b>ports</b> that is not on a loopback address. */
+/** Warn for every port in <b>ports</b> that is on a publicly routable
+ * address. */
 static void
 warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname)
 {
   SMARTLIST_FOREACH_BEGIN(ports, const port_cfg_t *, port) {
-    if (!tor_addr_is_loopback(&port->addr)) {
+    if (!tor_addr_is_internal(&port->addr, 1)) {
       log_warn(LD_CONFIG, "You specified a public address for %sPort. "
                "Other people on the Internet might find your computer and "
                "use it as an open proxy. Please don't allow this unless you "