make check-spaces

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index a4b935065d7038d6fd9c6c04c6a53afc701181b6..95d9fecfe4030b109e24637d57917464e5db1954 100644 (file)
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2124,8 +2124,9 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge)
    * it. If we  */
   if (!fascist_firewall_allows_address_addr(&bridge->addr, bridge->port,
                                             FIREWALL_OR_CONNECTION, 0)) {
-    log_notice(LD_CONFIG, "Tried to fetch a descriptor directly from a bridge, "
-               "but that bridge is not reachable through our firewall.");
+    log_notice(LD_CONFIG, "Tried to fetch a descriptor directly from a "
+               "bridge, but that bridge is not reachable through our "
+               "firewall.");
     return;
   }
 

diff --git a/src/or/or.h b/src/or/or.h
index 04bd42ab1551329c054c9dc95ac6d086da60fbb9..f438212b31521d510bdf01907e581b4800de35cc 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4092,8 +4092,8 @@ typedef struct {
   int ClientUseIPv6;
   /** If true, prefer an IPv6 OR port over an IPv4 one for entry node
    * connections. If auto, bridge clients prefer IPv6, and other clients
-   * prefer IPv4. Use fascist_firewall_prefer_ipv6_orport() instead of accessing
-   * this value directly. */
+   * prefer IPv4. Use fascist_firewall_prefer_ipv6_orport() instead of
+   * accessing this value directly. */
   int ClientPreferIPv6ORPort;
   /** If true, prefer an IPv6 directory port over an IPv4 one for direct
    * directory connections. If auto, bridge clients prefer IPv6, and other

diff --git a/src/or/policies.c b/src/or/policies.c
index faa39adfd692ef4b826ca935aab7be4165fa0c61..984ab6acf9b271561e694546b1e030e93a231015 100644 (file)
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -421,7 +421,8 @@ fascist_firewall_allows_address(const tor_addr_t *addr,
 
 /** Is this client configured to use IPv6?
  */
-int fascist_firewall_use_ipv6(const or_options_t *options)
+int
+fascist_firewall_use_ipv6(const or_options_t *options)
 {
   /* Clients use IPv6 if it's set, or they use bridges, or they don't use
    * IPv4 */
@@ -513,14 +514,14 @@ fascist_firewall_allows_address_addr(const tor_addr_t *addr, uint16_t port,
 
   if (fw_connection == FIREWALL_OR_CONNECTION) {
     return fascist_firewall_allows_address(addr, port,
-                                        reachable_or_addr_policy,
-                                        pref_only,
-                                        fascist_firewall_prefer_ipv6_orport(options));
+                               reachable_or_addr_policy,
+                               pref_only,
+                               fascist_firewall_prefer_ipv6_orport(options));
   } else if (fw_connection == FIREWALL_DIR_CONNECTION) {
     return fascist_firewall_allows_address(addr, port,
-                                        reachable_dir_addr_policy,
-                                        pref_only,
-                                        fascist_firewall_prefer_ipv6_dirport(options));
+                               reachable_dir_addr_policy,
+                               pref_only,
+                               fascist_firewall_prefer_ipv6_dirport(options));
   } else {
     log_warn(LD_BUG, "Bad firewall_connection_t value %d.",
              fw_connection);

diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index c044d9f21045b039a7d9d074660ea9efbb205c8c..3688909acba4a95f87d2ea307c44f838a36e4ed6 100644 (file)
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -1546,7 +1546,6 @@ test_policies_fascist_firewall_choose_address(void *arg)
                                             FIREWALL_DIR_CONNECTION, 1)
             == &ipv6_dir_ap);
 
-
   /* In the default configuration (Auto / IPv6 off), bridge clients should
    * still use IPv6, and only prefer it for bridges configured with an IPv6
    * address, regardless of ClientUseIPv6. */