Create config.h

src/or/buffers.c

@@ -13,6 +13,7 @@
 #define BUFFERS_PRIVATE
 #include "or.h"
 #include "buffers.h"
+#include "config.h"
 #include "../common/util.h"
 #include "../common/torlog.h"
 #ifdef HAVE_UNISTD_H

src/or/circuitbuild.c

@@ -15,6 +15,7 @@
 #include "circuitbuild.h"
 #include "circuitlist.h"
 #include "circuituse.h"
+#include "config.h"
 #include "router.h"
 #include "routerlist.h"
 #include "crypto.h"

src/or/circuitlist.c

@@ -13,6 +13,7 @@
 #include "circuitbuild.h"
 #include "circuitlist.h"
 #include "circuituse.h"
+#include "config.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "routerlist.h"

src/or/circuituse.c

@@ -13,6 +13,7 @@
 #include "circuitbuild.h"
 #include "circuitlist.h"
 #include "circuituse.h"
+#include "config.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"

src/or/command.c

@@ -19,6 +19,7 @@
 #include "circuitbuild.h"
 #include "circuitlist.h"
 #include "command.h"
+#include "config.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/config.c

@@ -14,6 +14,7 @@
 #include "or.h"
 #include "circuitbuild.h"
 #include "circuitlist.h"
+#include "config.h"
 #include "geoip.h"
 #include "rendclient.h"
 #include "rendservice.h"

src/or/config.h

+/* 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 config.h
+ * \brief Header file for config.c.
+ **/
+
+#ifndef _TOR_CONFIG_H
+#define _TOR_CONFIG_H
+
+const char *get_dirportfrontpage(void);
+or_options_t *get_options(void);
+int set_options(or_options_t *new_val, char **msg);
+void config_free_all(void);
+const char *safe_str_client(const char *address);
+const char *safe_str(const char *address);
+const char *escaped_safe_str_client(const char *address);
+const char *escaped_safe_str(const char *address);
+const char *get_version(void);
+
+int config_get_lines(const char *string, config_line_t **result);
+void config_free_lines(config_line_t *front);
+setopt_err_t options_trial_assign(config_line_t *list, int use_defaults,
+                                  int clear_first, char **msg);
+int resolve_my_address(int warn_severity, or_options_t *options,
+                       uint32_t *addr, char **hostname_out);
+int is_local_addr(const tor_addr_t *addr) ATTR_PURE;
+void options_init(or_options_t *options);
+char *options_dump(or_options_t *options, int minimal);
+int options_init_from_torrc(int argc, char **argv);
+setopt_err_t options_init_from_string(const char *cf,
+                            int command, const char *command_arg, char **msg);
+int option_is_recognized(const char *key);
+const char *option_get_canonical_name(const char *key);
+config_line_t *option_get_assignment(or_options_t *options,
+                                     const char *key);
+int options_save_current(void);
+const char *get_torrc_fname(void);
+char *options_get_datadir_fname2_suffix(or_options_t *options,
+                                        const char *sub1, const char *sub2,
+                                        const char *suffix);
+#define get_datadir_fname2_suffix(sub1, sub2, suffix) \
+  options_get_datadir_fname2_suffix(get_options(), (sub1), (sub2), (suffix))
+/** Return a newly allocated string containing datadir/sub1.  See
+ * get_datadir_fname2_suffix.  */
+#define get_datadir_fname(sub1) get_datadir_fname2_suffix((sub1), NULL, NULL)
+/** Return a newly allocated string containing datadir/sub1/sub2.  See
+ * get_datadir_fname2_suffix.  */
+#define get_datadir_fname2(sub1,sub2) \
+  get_datadir_fname2_suffix((sub1), (sub2), NULL)
+/** Return a newly allocated string containing datadir/sub1suffix.  See
+ * get_datadir_fname2_suffix. */
+#define get_datadir_fname_suffix(sub1, suffix) \
+  get_datadir_fname2_suffix((sub1), NULL, (suffix))
+
+or_state_t *get_or_state(void);
+int or_state_save(time_t now);
+
+int options_need_geoip_info(or_options_t *options, const char **reason_out);
+int getinfo_helper_config(control_connection_t *conn,
+                          const char *question, char **answer,
+                          const char **errmsg);
+
+const char *tor_get_digests(void);
+uint32_t get_effective_bwrate(or_options_t *options);
+uint32_t get_effective_bwburst(or_options_t *options);
+
+#ifdef CONFIG_PRIVATE
+/* Used only by config.c and test.c */
+or_options_t *options_new(void);
+#endif
+
+#endif
+

src/or/connection.c

@@ -15,6 +15,7 @@
 #include "circuitbuild.h"
 #include "circuitlist.h"
 #include "circuituse.h"
+#include "config.h"
 #include "dnsserv.h"
 #include "geoip.h"
 #include "rendclient.h"

src/or/connection_edge.c

@@ -13,6 +13,7 @@
 #include "buffers.h"
 #include "circuitlist.h"
 #include "circuituse.h"
+#include "config.h"
 #include "dnsserv.h"
 #include "rendclient.h"
 #include "rendcommon.h"

src/or/connection_or.c

@@ -14,6 +14,7 @@
 #include "buffers.h"
 #include "circuitbuild.h"
 #include "command.h"
+#include "config.h"
 #include "geoip.h"
 #include "router.h"
 #include "routerlist.h"

src/or/control.c

@@ -15,6 +15,7 @@
 #include "circuitbuild.h"
 #include "circuitlist.h"
 #include "circuituse.h"
+#include "config.h"
 #include "dnsserv.h"
 #include "geoip.h"
 #include "router.h"

src/or/cpuworker.c

@@ -16,6 +16,7 @@
 #include "buffers.h"
 #include "circuitbuild.h"
 #include "circuitlist.h"
+#include "config.h"
 #include "router.h"
 
 /** The maximum number of cpuworker processes we will keep around. */

src/or/directory.c

@@ -6,6 +6,7 @@
 #include "or.h"
 #include "buffers.h"
 #include "circuitbuild.h"
+#include "config.h"
 #include "geoip.h"
 #include "rendclient.h"
 #include "rendcommon.h"

src/or/dirserv.c

@@ -6,6 +6,7 @@
 #define DIRSERV_PRIVATE
 #include "or.h"
 #include "buffers.h"
+#include "config.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/dirvote.c

@@ -5,6 +5,7 @@
 
 #define DIRVOTE_PRIVATE
 #include "or.h"
+#include "config.h"
 #include "router.h"
 #include "routerlist.h"
 

src/or/dns.c

@@ -14,6 +14,7 @@
 #include "or.h"
 #include "circuitlist.h"
 #include "circuituse.h"
+#include "config.h"
 #include "router.h"
 #include "ht.h"
 #ifdef HAVE_EVENT2_DNS_H

src/or/dnsserv.c

@@ -10,6 +10,7 @@
 
 #include "or.h"
 #include "dnsserv.h"
+#include "config.h"
 #ifdef HAVE_EVENT2_DNS_H
 #include <event2/dns.h>
 #include <event2/dns_compat.h>

src/or/geoip.c

@@ -10,6 +10,7 @@
 #define GEOIP_PRIVATE
 #include "or.h"
 #include "ht.h"
+#include "config.h"
 #include "dnsserv.h"
 #include "geoip.h"
 #include "routerlist.h"

src/or/hibernate.c

@@ -22,6 +22,7 @@ hibernating, phase 2:
 */
 
 #include "or.h"
+#include "config.h"
 #include "router.h"
 
 /** Possible values of hibernate_state */

src/or/main.c

@@ -17,6 +17,7 @@
 #include "circuitlist.h"
 #include "circuituse.h"
 #include "command.h"
+#include "config.h"
 #include "dnsserv.h"
 #include "geoip.h"
 #include "rendclient.h"