[tor-commits] [tor/master] Make some fascist_firewall_choose_address* functions static

[nickm at torproject.org]

commit a4853f1bc1815a185702ef197c002e89d82dbee0
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Sat Feb 20 20:09:07 2016 +1100

    Make some fascist_firewall_choose_address* functions static
---
 src/or/policies.c |  6 +++---
 src/or/policies.h | 24 ++++++++++--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/or/policies.c b/src/or/policies.c
index e8f4a82..3fe0a41 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -540,7 +540,7 @@ fascist_firewall_allows_address_addr(const tor_addr_t *addr, uint16_t port,
  * If pref_only, return false if addr is not in the client's preferred address
  * family.
  */
-int
+static int
 fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
                                    firewall_connection_t fw_connection,
                                    int pref_only)
@@ -556,7 +556,7 @@ fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
  * fw_connection.
  * If pref_only, return false if addr is not in the client's preferred address
  * family. */
-int
+static int
 fascist_firewall_allows_address_ipv4h(uint32_t ipv4h_or_addr,
                                           uint16_t ipv4_or_port,
                                           firewall_connection_t fw_connection,
@@ -784,7 +784,7 @@ fascist_firewall_choose_address_impl(const tor_addr_port_t *a,
  *    choose one based on want_a and return it.
  *  - Otherwise, return whichever is preferred.
  * Otherwise, return NULL. */
-const tor_addr_port_t *
+STATIC const tor_addr_port_t *
 fascist_firewall_choose_address(const tor_addr_port_t *a,
                                 const tor_addr_port_t *b,
                                 int want_a,
diff --git a/src/or/policies.h b/src/or/policies.h
index 65f10e2..8b330eb 100644
--- a/src/or/policies.h
+++ b/src/or/policies.h
@@ -35,16 +35,11 @@ int fascist_firewall_use_ipv6(const or_options_t *options);
 int fascist_firewall_prefer_ipv6_orport(const or_options_t *options);
 int fascist_firewall_prefer_ipv6_dirport(const or_options_t *options);
 
-int fascist_firewall_allows_address_addr(const tor_addr_t *addr, uint16_t port,
+int fascist_firewall_allows_address_addr(const tor_addr_t *addr,
+                                         uint16_t port,
                                          firewall_connection_t fw_connection,
                                          int pref_only);
-int fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
-                                       firewall_connection_t fw_connection,
-                                       int pref_only);
-int fascist_firewall_allows_address_ipv4h(uint32_t ipv4h_or_addr,
-                                          uint16_t ipv4_or_port,
-                                          firewall_connection_t fw_connection,
-                                          int pref_only);
+
 int fascist_firewall_allows_rs(const routerstatus_t *rs,
                                firewall_connection_t fw_connection,
                                int pref_only);
@@ -55,12 +50,6 @@ int fascist_firewall_allows_dir_server(const dir_server_t *ds,
                                        firewall_connection_t fw_connection,
                                        int pref_only);
 
-const tor_addr_port_t * fascist_firewall_choose_address(
-                                          const tor_addr_port_t *a,
-                                          const tor_addr_port_t *b,
-                                          int want_a,
-                                          firewall_connection_t fw_connection,
-                                          int pref_only);
 int fascist_firewall_choose_address_rs(const routerstatus_t *rs,
                                        firewall_connection_t fw_connection,
                                        int pref_only, tor_addr_port_t* ap);
@@ -140,6 +129,13 @@ STATIC int fascist_firewall_allows_address(const tor_addr_t *addr,
                                            uint16_t port,
                                            smartlist_t *firewall_policy,
                                            int pref_only, int pref_ipv6);
+STATIC const tor_addr_port_t * fascist_firewall_choose_address(
+                                          const tor_addr_port_t *a,
+                                          const tor_addr_port_t *b,
+                                          int want_a,
+                                          firewall_connection_t fw_connection,
+                                          int pref_only);
+
 #endif
 
 #endif