Create policies.h

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 00c9026faaa0d57e1717fa3b99317503560cadac..a70effe40ac34bb5dca0a1e2d0b5decc07b480f8 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -24,6 +24,7 @@
 #include "main.h"
 #include "networkstatus.h"
 #include "onion.h"
+#include "policies.h"
 #include "router.h"
 #include "routerlist.h"
 #include "crypto.h"

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 07e3d0bc4b49ba373c75cc1546913045a7569c1f..b13e558d0796f6e464ab4d464b85802e3a85dfd6 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -17,6 +17,7 @@
 #include "connection.h"
 #include "connection_edge.h"
 #include "control.h"
+#include "policies.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"

diff --git a/src/or/config.c b/src/or/config.c
index bfec2f41b47537a4be35288a42fd80e8810f90d9..02d20129f0b36c2894dbba016a7005d37ff7b716 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -26,6 +26,7 @@
 #include "hibernate.h"
 #include "main.h"
 #include "networkstatus.h"
+#include "policies.h"
 #include "rendclient.h"
 #include "rendservice.h"
 #include "router.h"

diff --git a/src/or/connection.c b/src/or/connection.c
index 854a53aafaa262cf8732648914645e405806999b..e4d158afb323151c205eae6467af14cf05ae57d6 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -27,6 +27,7 @@
 #include "dnsserv.h"
 #include "geoip.h"
 #include "main.h"
+#include "policies.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "router.h"

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5dff47958fa500f95a9bc1698fe6451c238504f3..ebc9ec5842583640c7ac31fa14410219d2a1c158 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -23,6 +23,7 @@
 #include "dirserv.h"
 #include "hibernate.h"
 #include "main.h"
+#include "policies.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"

diff --git a/src/or/control.c b/src/or/control.c
index 5f5e45fd8831be799502da12ba4b2c994da7b310..185304813245436d21775e4fe7bfc4004057733d 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -26,6 +26,7 @@
 #include "hibernate.h"
 #include "main.h"
 #include "networkstatus.h"
+#include "policies.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/directory.c b/src/or/directory.c
index 057961da862720c85cb0a6279d2bbc01ac279fa7..1c13cbd3df9465d4fe812429943cf80ca45c9d11 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -16,6 +16,7 @@
 #include "geoip.h"
 #include "main.h"
 #include "networkstatus.h"
+#include "policies.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "router.h"

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index d23542cf6086e86aabcc9c79c4029c88779193bc..38fc8f161ad3188cd06502c910d82aec96da58a7 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -16,6 +16,7 @@
 #include "hibernate.h"
 #include "microdesc.h"
 #include "networkstatus.h"
+#include "policies.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 5b53267ba5f1e03514620a9474a8f83e8a2f81f3..7873e49e7ae91507e82c6f53e82173c8e6cefc8d 100644 (file)
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -11,6 +11,7 @@
 #include "dirvote.h"
 #include "microdesc.h"
 #include "networkstatus.h"
+#include "policies.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/dns.c b/src/or/dns.c
index 7bb2d8ea34ca1bc242ccb6900f85cdd70f93fb06..f2d3d435db72d4db08972661b39f038647f1f2f6 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -20,6 +20,7 @@
 #include "control.h"
 #include "dns.h"
 #include "main.h"
+#include "policies.h"
 #include "router.h"
 #include "ht.h"
 #ifdef HAVE_EVENT2_DNS_H

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 7f9029424de71f8594c2dc68cf731cb88cf3693e..e231b655f4e071936c41ba3631d558056088fd15 100644 (file)
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -15,6 +15,7 @@
 #include "connection_edge.h"
 #include "control.h"
 #include "main.h"
+#include "policies.h"
 #ifdef HAVE_EVENT2_DNS_H
 #include <event2/dns.h>
 #include <event2/dns_compat.h>

diff --git a/src/or/main.c b/src/or/main.c
index b30a77edddbf46f3fc98f023544066e07b5e1283..60bea490067172c5de619e278ecd5e679f20f64a 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -35,6 +35,7 @@
 #include "networkstatus.h"
 #include "ntmain.h"
 #include "onion.h"
+#include "policies.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"

diff --git a/src/or/or.h b/src/or/or.h
index 8322cf3d47485ee43e73ea5cd349943f6707cf69..2f2c3002b0b5e15d42acd17b7f645f7be876a92e 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3295,11 +3295,6 @@ typedef enum version_status_t {
 
 /********************************* policies.c ************************/
 
-/* (length of "accept 255.255.255.255/255.255.255.255:65535-65535\n" plus a
- * NUL.)
- */
-#define POLICY_BUF_LEN 52
-
 /** Outcome of applying an address policy to an address. */
 typedef enum {
   /** The address was accepted */
@@ -3314,45 +3309,6 @@ typedef enum {
   ADDR_POLICY_PROBABLY_REJECTED=2
 } addr_policy_result_t;
 
-int firewall_is_fascist_or(void);
-int fascist_firewall_allows_address_or(const tor_addr_t *addr, uint16_t port);
-int fascist_firewall_allows_or(routerinfo_t *ri);
-int fascist_firewall_allows_address_dir(const tor_addr_t *addr, uint16_t port);
-int dir_policy_permits_address(const tor_addr_t *addr);
-int socks_policy_permits_address(const tor_addr_t *addr);
-int authdir_policy_permits_address(uint32_t addr, uint16_t port);
-int authdir_policy_valid_address(uint32_t addr, uint16_t port);
-int authdir_policy_baddir_address(uint32_t addr, uint16_t port);
-int authdir_policy_badexit_address(uint32_t addr, uint16_t port);
-
-int validate_addr_policies(or_options_t *options, char **msg);
-void policy_expand_private(smartlist_t **policy);
-int policies_parse_from_options(or_options_t *options);
-
-addr_policy_t *addr_policy_get_canonical_entry(addr_policy_t *ent);
-int cmp_addr_policies(smartlist_t *a, smartlist_t *b);
-addr_policy_result_t compare_tor_addr_to_addr_policy(const tor_addr_t *addr,
-                              uint16_t port, const smartlist_t *policy);
-addr_policy_result_t compare_addr_to_addr_policy(uint32_t addr,
-                              uint16_t port, const smartlist_t *policy);
-int policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest,
-                               int rejectprivate, const char *local_address,
-                               int add_default_policy);
-void policies_set_router_exitpolicy_to_reject_all(routerinfo_t *exitrouter);
-int exit_policy_is_general_exit(smartlist_t *policy);
-int policy_is_reject_star(const smartlist_t *policy);
-int getinfo_helper_policies(control_connection_t *conn,
-                            const char *question, char **answer,
-                            const char **errmsg);
-int policy_write_item(char *buf, size_t buflen, addr_policy_t *item,
-                      int format_for_desc);
-
-void addr_policy_list_free(smartlist_t *p);
-void addr_policy_free(addr_policy_t *p);
-void policies_free_all(void);
-
-char *policy_summarize(smartlist_t *policy);
-
 /********************************* reasons.c ***************************/
 
 const char *stream_end_reason_to_control_string(int reason);

diff --git a/src/or/policies.c b/src/or/policies.c
index 72eb168478e38a3d3b4f79762776c79cd7670b4f..cd6307daa61a2e2326e5bf41ac10e4c1f9867216 100644 (file)
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -11,6 +11,7 @@
 #include "or.h"
 #include "config.h"
 #include "dirserv.h"
+#include "policies.h"
 #include "ht.h"
 
 /** Policy that addresses for incoming SOCKS connections must match. */

diff --git a/src/or/policies.h b/src/or/policies.h
new file mode 100644 (file)
index 0000000..b99ee79
--- /dev/null
+++ b/src/or/policies.h
@@ -0,0 +1,60 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file policies.h
+ * \brief Header file for policy.c.
+ **/
+
+#ifndef _TOR_POLICIES_H
+#define _TOR_POLICIES_H
+
+/* (length of "accept 255.255.255.255/255.255.255.255:65535-65535\n" plus a
+ * NUL.)
+ */
+#define POLICY_BUF_LEN 52
+
+int firewall_is_fascist_or(void);
+int fascist_firewall_allows_address_or(const tor_addr_t *addr, uint16_t port);
+int fascist_firewall_allows_or(routerinfo_t *ri);
+int fascist_firewall_allows_address_dir(const tor_addr_t *addr, uint16_t port);
+int dir_policy_permits_address(const tor_addr_t *addr);
+int socks_policy_permits_address(const tor_addr_t *addr);
+int authdir_policy_permits_address(uint32_t addr, uint16_t port);
+int authdir_policy_valid_address(uint32_t addr, uint16_t port);
+int authdir_policy_baddir_address(uint32_t addr, uint16_t port);
+int authdir_policy_badexit_address(uint32_t addr, uint16_t port);
+
+int validate_addr_policies(or_options_t *options, char **msg);
+void policy_expand_private(smartlist_t **policy);
+int policies_parse_from_options(or_options_t *options);
+
+addr_policy_t *addr_policy_get_canonical_entry(addr_policy_t *ent);
+int cmp_addr_policies(smartlist_t *a, smartlist_t *b);
+addr_policy_result_t compare_tor_addr_to_addr_policy(const tor_addr_t *addr,
+                              uint16_t port, const smartlist_t *policy);
+addr_policy_result_t compare_addr_to_addr_policy(uint32_t addr,
+                              uint16_t port, const smartlist_t *policy);
+int policies_parse_exit_policy(config_line_t *cfg, smartlist_t **dest,
+                               int rejectprivate, const char *local_address,
+                               int add_default_policy);
+void policies_set_router_exitpolicy_to_reject_all(routerinfo_t *exitrouter);
+int exit_policy_is_general_exit(smartlist_t *policy);
+int policy_is_reject_star(const smartlist_t *policy);
+int getinfo_helper_policies(control_connection_t *conn,
+                            const char *question, char **answer,
+                            const char **errmsg);
+int policy_write_item(char *buf, size_t buflen, addr_policy_t *item,
+                      int format_for_desc);
+
+void addr_policy_list_free(smartlist_t *p);
+void addr_policy_free(addr_policy_t *p);
+void policies_free_all(void);
+
+char *policy_summarize(smartlist_t *policy);
+
+#endif
+

diff --git a/src/or/relay.c b/src/or/relay.c
index 83f875428ed974c9d6a21885c020b1a5a65155c8..f0801bf8111fc53becd6c242f23911be57b71340 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -24,6 +24,7 @@
 #include "main.h"
 #include "mempool.h"
 #include "networkstatus.h"
+#include "policies.h"
 #include "rendcommon.h"
 #include "routerlist.h"
 

diff --git a/src/or/router.c b/src/or/router.c
index c9501d04ef0f27914724fdf7472656bc02f12435..4a18916990d8c63669ff1f7f49ec0e5639458d25 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -18,6 +18,7 @@
 #include "geoip.h"
 #include "hibernate.h"
 #include "main.h"
+#include "policies.h"
 #include "router.h"
 #include "routerlist.h"
 

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f189943a16eb7666d15db36cb54fd558b620e5ef..1fb3dbc404c517600bf65c756d273c5b4b21ae77 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -23,6 +23,7 @@
 #include "hibernate.h"
 #include "main.h"
 #include "networkstatus.h"
+#include "policies.h"
 #include "rendcommon.h"
 #include "rendservice.h"
 #include "router.h"

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index a7df1f5e05e1c07372f5a61b439acc157b887399..0662fd3a18d476ee7127dbe01240b1d5c004eb81 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -13,6 +13,7 @@
 #include "config.h"
 #include "dirserv.h"
 #include "dirvote.h"
+#include "policies.h"
 #include "rendcommon.h"
 #include "router.h"
 #include "routerlist.h"

diff --git a/src/test/test.c b/src/test/test.c
index a1e286819621c07015c43b07e5c34cb61be7a616..b5c908a215f0c191aa95c64e68f26e06e525876b 100644 (file)
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -54,6 +54,7 @@ double fabs(double x);
 #include "mempool.h"
 #include "memarea.h"
 #include "onion.h"
+#include "policies.h"
 
 #ifdef USE_DMALLOC
 #include <dmalloc.h>