[tor-commits] [tor/master] Make log message clearer

nickm at torproject.org nickm at torproject.org
Tue Aug 23 13:24:27 UTC 2016


commit 4d2b3164ec922916d01d6772ef86b7041e7c7d78
Author: s7r <s7r at sky-ip.org>
Date:   Mon Aug 15 09:50:10 2016 +0000

    Make log message clearer
    
    Longer and more explicit log message so we don't confuse users with behind NAT with working configurations and state that public IP addresses only should be provided with "Address", won't work with internal addresses.
---
 src/or/router.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index d48bd05..c6bbafb 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1947,8 +1947,13 @@ router_check_descriptor_address_consistency(uint32_t ipv4h_desc_addr)
 
       log_warn(LD_CONFIG, "The configured IPv4 ORPort address %s does not "
                "match the address %s in the descriptor. Please configure "
-               "matching IPv4 addresses for the Address and ORPort options. "
-               "Use NoListen on the ORPort if you are behind a NAT.",
+               "the matching IPv4 addresses for this Tor relay as "
+               "Address <IPv4 address> in the torrc configuration file if "
+               "you have multiple public IP addresses. If you are behind a "
+               "NAT and have the right ports forwarded, you can ignore this "
+               "warning or, to remove it, use 2 ORPort lines with options "
+               "NoListen (for the public IPv4 address line) and NoAdvertise "
+               "(for the internal NAT IPv4 address line).",
                port_addr_str, desc_addr_str);
     }
 
@@ -1969,8 +1974,13 @@ router_check_descriptor_address_consistency(uint32_t ipv4h_desc_addr)
 
       log_warn(LD_CONFIG, "The configured IPv4 DirPort address %s does not "
                "match the address %s in the descriptor. Please configure "
-               "matching IPv4 addresses for the Address and DirPort options. "
-               "Use NoListen on the DirPort if you are behind a NAT.",
+               "the matching IPv4 addresses for this Tor relay as "
+               "Address <IPv4 address> in the torrc configuration file if "
+               "you have multiple public IP addresses. If you are behind a "
+               "NAT and have the right ports forwarded, you can ignore this "
+               "warning or, to remove it, use 2 DirPort lines with options "
+               "NoListen (for the public IPv4 address line) and NoAdvertise "
+               "(for the internal NAT IPv4 address line).",
                port_addr_str, desc_addr_str);
     }
 }





More information about the tor-commits mailing list