tor

commit ad087432995e1a55b9b9e63f28e295cbec528890
parent db0aaf428ebb00b37b451db1d5eecb2fd5689b79
Author: Alexander Færøy <ahf@torproject.org>
Date:   Tue,  2 Jul 2019 19:09:22 +0200

Rename `OUTBOUND_ADDR_EXIT_AND_OR` to `OUTBOUND_ADDR_ANY`.

This patch renames the enumeration value in `outbound_addr_t` from
`OUTBOUND_ADDR_EXIT_AND_OR` to `OUTBOUND_ADDR_ANY` since with the
arrival of `OUTBOUND_ADDR_PT` it no longer makes sense to call the
fallback value for "Exit and OR". Instead we rename it to "any".

See: https://bugs.torproject.org/5304

Diffstat:
M
src/app/config/config.c
 | 
2
+-
M
src/app/config/or_options_st.h
 | 
10
+++++-----
M
src/core/mainloop/connection.c
 | 
8
++++----

3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -7205,7 +7205,7 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg)
   }
 
   if (parse_outbound_address_lines(options->OutboundBindAddress,
-                                   OUTBOUND_ADDR_EXIT_AND_OR, options,
+                                   OUTBOUND_ADDR_ANY, options,
                                    validate_only, msg) < 0) {
     goto err;
   }
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
@@ -24,7 +24,7 @@ struct config_suite_t;
 struct routerset_t;
 
 /** Enumeration of outbound address configuration types:
- * Exit-only, OR-only, or both */
+ * Exit-only, OR-only, PT-only, or any of them */
 typedef enum {
   /** Outbound IP address for Exit connections. Controlled by the
    * `OutboundBindAddressExit` configuration entry in torrc. */
@@ -38,11 +38,11 @@ typedef enum {
    * `OutboundBindAddressPT` configuration entry in torrc. */
   OUTBOUND_ADDR_PT,
 
-  /** Outbound IP address for both Exit and OR connections. Controlled by the
+  /** Outbound IP address for any outgoing connections. Controlled by the
    * OutboundBindAddress configuration entry in torrc. This value is used as
-   * fallback if the more specific OUTBOUND_ADDR_EXIT and OUTBOUND_ADDR_OR is
-   * unset. */
-  OUTBOUND_ADDR_EXIT_AND_OR,
+   * fallback if the more specific OUTBOUND_ADDR_EXIT, OUTBOUND_ADDR_OR, and
+   * OUTBOUND_ADDR_PT are unset. */
+  OUTBOUND_ADDR_ANY,
 
   /** Max value for this enum. Must be the last element in this enum. */
   OUTBOUND_ADDR_MAX
diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c
@@ -2331,9 +2331,9 @@ conn_get_outbound_address(sa_family_t family,
       ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT]
                  [fam_index];
     } else if (!tor_addr_is_null(
-                 &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR]
+                 &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY]
                  [fam_index])) {
-      ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR]
+      ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY]
                  [fam_index];
     }
   } else { // All non-exit connections
@@ -2342,9 +2342,9 @@ conn_get_outbound_address(sa_family_t family,
       ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_OR]
                  [fam_index];
     } else if (!tor_addr_is_null(
-                 &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR]
+                 &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY]
                  [fam_index])) {
-      ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_EXIT_AND_OR]
+      ext_addr = &options->OutboundBindAddresses[OUTBOUND_ADDR_ANY]
                  [fam_index];
     }
   }