Change Natd into NATD in our options.

Breaking this out of the last commit because this might be more
controversial.

diff --git a/doc/spec/address-spec.txt b/doc/spec/address-spec.txt
index 2e1aff2b8abba005c7bf0d3a5b07098d5aff9571..ce6d2b65e7660b2a4b606df86a31815711863549 100644 (file)
--- a/doc/spec/address-spec.txt
+++ b/doc/spec/address-spec.txt
@@ -12,7 +12,7 @@
 
   These hostnames can be passed to Tor as the address part of a SOCKS4a or
   SOCKS5 request.  If the application is connected to Tor using an IP-only
-  method (such as SOCKS4, TransPort, or NatdPort), these hostnames can be
+  method (such as SOCKS4, TransPort, or NATDPort), these hostnames can be
   substituted for certain IP addresses using the MapAddress configuration
   option or the MAPADDRESS control command.
 

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index d73620d8bd7b9215940a599467fc5109a8b9dc39..e1baf30cd95e063037ed9922f18980d1c7a572cf 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -670,7 +670,7 @@ The following options are useful only for clients (that is, if
 
 **AllowDotExit** **0**|**1**::
     If enabled, we convert "www.google.com.foo.exit" addresses on the
-    SocksPort/TransPort/NatdPort into "www.google.com" addresses that exit from
+    SocksPort/TransPort/NATDPort into "www.google.com" addresses that exit from
     the node "foo". Disabled by default since attacking websites and exit
     relays can use it to manipulate your path selection. (Default: 0)
 

diff --git a/src/or/config.c b/src/or/config.c
index 1339dd1a98f3c8eedc290fdff5e2afb31306cda6..c28cf58aeb92d1ef9e9e1107abfc6913fbfa0abc 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -300,8 +300,8 @@ static config_var_t _option_vars[] = {
   V(MyFamily,                    STRING,   NULL),
   V(NewCircuitPeriod,            INTERVAL, "30 seconds"),
   VAR("NamingAuthoritativeDirectory",BOOL, NamingAuthoritativeDir, "0"),
-  V(NatdListenAddress,           LINELIST, NULL),
-  V(NatdPort,                    UINT,     "0"),
+  V(NATDListenAddress,           LINELIST, NULL),
+  V(NATDPort,                    UINT,     "0"),
   V(Nickname,                    STRING,   NULL),
   V(WarnUnsafeSocks,              BOOL,     "1"),
   V(NoPublish,                   BOOL,     "0"),
@@ -2918,8 +2918,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
   if (options->TransPort == 0 && options->TransListenAddress != NULL)
     REJECT("TransPort must be defined if TransListenAddress is defined.");
 
-  if (options->NatdPort == 0 && options->NatdListenAddress != NULL)
-    REJECT("NatdPort must be defined if NatdListenAddress is defined.");
+  if (options->NATDPort == 0 && options->NATDListenAddress != NULL)
+    REJECT("NATDPort must be defined if NATDListenAddress is defined.");
 
   /* Don't gripe about SocksPort 0 with SocksListenAddress set; a standard
    * configuration does this. */
@@ -2938,8 +2938,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
       old = old_options ? old_options->TransListenAddress : NULL;
       tp = "transparent proxy";
     } else {
-      opt = options->NatdListenAddress;
-      old = old_options ? old_options->NatdListenAddress : NULL;
+      opt = options->NATDListenAddress;
+      old = old_options ? old_options->NATDListenAddress : NULL;
       tp = "natd proxy";
     }
 
@@ -3031,14 +3031,14 @@ options_validate(or_options_t *old_options, or_options_t *options,
   if (options->TransPort < 0 || options->TransPort > 65535)
     REJECT("TransPort option out of bounds.");
 
-  if (options->NatdPort < 0 || options->NatdPort > 65535)
-    REJECT("NatdPort option out of bounds.");
+  if (options->NATDPort < 0 || options->NATDPort > 65535)
+    REJECT("NATDPort option out of bounds.");
 
   if (options->SocksPort == 0 && options->TransPort == 0 &&
-      options->NatdPort == 0 && options->ORPort == 0 &&
+      options->NATDPort == 0 && options->ORPort == 0 &&
       options->DNSPort == 0 && !options->RendConfigLines)
     log(LOG_WARN, LD_CONFIG,
-        "SocksPort, TransPort, NatdPort, DNSPort, and ORPort are all "
+        "SocksPort, TransPort, NATDPort, DNSPort, and ORPort are all "
         "undefined, and there aren't any hidden services configured.  "
         "Tor will still run, but probably won't do anything.");
 

diff --git a/src/or/connection.c b/src/or/connection.c
index c19632daef83cc8de0664dc892614a92ad486004..85cede856c468e032c0897cafc7a326c72517ff5 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1862,8 +1862,8 @@ retry_all_listeners(smartlist_t *replaced_conns,
                       replaced_conns, new_conns, 0,
                       AF_INET)<0)
     return -1;
-  if (retry_listeners(CONN_TYPE_AP_NATD_LISTENER, options->NatdListenAddress,
-                      options->NatdPort, "127.0.0.1",
+  if (retry_listeners(CONN_TYPE_AP_NATD_LISTENER, options->NATDListenAddress,
+                      options->NATDPort, "127.0.0.1",
                       replaced_conns, new_conns, 0,
                       AF_INET)<0)
     return -1;

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 0970cda4b912fec15449dd0b8972238aec2e4731..cc040b17807b9f7a019e22980ff5ce148c270598 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2001,13 +2001,13 @@ connection_ap_process_natd(edge_connection_t *conn)
   if (err == 0)
     return 0;
   if (err < 0) {
-    log_warn(LD_APP,"Natd handshake failed (DEST too long). Closing");
+    log_warn(LD_APP,"NATD handshake failed (DEST too long). Closing");
     connection_mark_unattached_ap(conn, END_STREAM_REASON_INVALID_NATD_DEST);
     return -1;
   }
 
   if (strcmpstart(tmp_buf, "[DEST ")) {
-    log_warn(LD_APP,"Natd handshake was ill-formed; closing. The client "
+    log_warn(LD_APP,"NATD handshake was ill-formed; closing. The client "
              "said: %s",
              escaped(tmp_buf));
     connection_mark_unattached_ap(conn, END_STREAM_REASON_INVALID_NATD_DEST);
@@ -2016,7 +2016,7 @@ connection_ap_process_natd(edge_connection_t *conn)
 
   daddr = tbuf = &tmp_buf[0] + 6; /* after end of "[DEST " */
   if (!(tbuf = strchr(tbuf, ' '))) {
-    log_warn(LD_APP,"Natd handshake was ill-formed; closing. The client "
+    log_warn(LD_APP,"NATD handshake was ill-formed; closing. The client "
              "said: %s",
              escaped(tmp_buf));
     connection_mark_unattached_ap(conn, END_STREAM_REASON_INVALID_NATD_DEST);
@@ -2030,7 +2030,7 @@ connection_ap_process_natd(edge_connection_t *conn)
   socks->port = (uint16_t)
     tor_parse_long(tbuf, 10, 1, 65535, &port_ok, &daddr);
   if (!port_ok) {
-    log_warn(LD_APP,"Natd handshake failed; port %s is ill-formed or out "
+    log_warn(LD_APP,"NATD handshake failed; port %s is ill-formed or out "
              "of range.", escaped(tbuf));
     connection_mark_unattached_ap(conn, END_STREAM_REASON_INVALID_NATD_DEST);
     return -1;

diff --git a/src/or/or.h b/src/or/or.h
index 14f050deb0c5f452cd25f36fe2e205a87d43b225..7f5f68ee52ed15b1a56f8af0fa5a091e7fc842b0 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2379,7 +2379,7 @@ typedef struct {
    * connections. */
   config_line_t *TransListenAddress;
   /** Addresses to bind for listening for transparent natd connections */
-  config_line_t *NatdListenAddress;
+  config_line_t *NATDListenAddress;
   /** Addresses to bind for listening for SOCKS connections. */
   config_line_t *DNSListenAddress;
   /** Addresses to bind for listening for OR connections. */
@@ -2403,7 +2403,7 @@ typedef struct {
   int SocksPort; /**< Port to listen on for SOCKS connections. */
   /** Port to listen on for transparent pf/netfilter connections. */
   int TransPort;
-  int NatdPort; /**< Port to listen on for transparent natd connections. */
+  int NATDPort; /**< Port to listen on for transparent natd connections. */
   int ControlPort; /**< Port to listen on for control connections. */
   config_line_t *ControlSocket; /**< List of Unix Domain Sockets to listen on
                                  * for control connections. */

diff --git a/src/or/router.c b/src/or/router.c
index 725a515e0c3fd90b0f17821d8815d3526bb26e06..af248c65546a6a63f8f010d6253d789bf014f0a0 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1099,7 +1099,7 @@ proxy_mode(or_options_t *options)
 {
   return (options->SocksPort != 0 || options->SocksListenAddress ||
           options->TransPort != 0 || options->TransListenAddress ||
-          options->NatdPort != 0 || options->NatdListenAddress ||
+          options->NATDPort != 0 || options->NATDListenAddress ||
           options->DNSPort != 0 || options->DNSListenAddress);
 }