From 174a88dd79ecf3b6c76d63d44bef3e47378777ee Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Thu, 22 Jul 2010 09:46:23 +0200 Subject: Create circuitlist.h --- src/or/onion.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/or/onion.c') diff --git a/src/or/onion.c b/src/or/onion.c index 887087424..2d666475f 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -11,6 +11,7 @@ **/ #include "or.h" +#include "circuitlist.h" /** Type for a linked list of circuits that are waiting for a free CPU worker * to process a waiting onion handshake. */ -- cgit v1.2.3 From c4f8f1316e18e5eeb6efc14659a66f3d6feb0adf Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Thu, 22 Jul 2010 10:22:51 +0200 Subject: Create config.h --- src/or/buffers.c | 1 + src/or/circuitbuild.c | 1 + src/or/circuitlist.c | 1 + src/or/circuituse.c | 1 + src/or/command.c | 1 + src/or/config.c | 1 + src/or/config.h | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/connection.c | 1 + src/or/connection_edge.c | 1 + src/or/connection_or.c | 1 + src/or/control.c | 1 + src/or/cpuworker.c | 1 + src/or/directory.c | 1 + src/or/dirserv.c | 1 + src/or/dirvote.c | 1 + src/or/dns.c | 1 + src/or/dnsserv.c | 1 + src/or/geoip.c | 1 + src/or/hibernate.c | 1 + src/or/main.c | 1 + src/or/microdesc.c | 1 + src/or/networkstatus.c | 1 + src/or/onion.c | 1 + src/or/or.h | 62 -------------------------------------- src/or/policies.c | 1 + src/or/reasons.c | 1 + src/or/relay.c | 1 + src/or/rendclient.c | 1 + src/or/rendcommon.c | 1 + src/or/rendmid.c | 1 + src/or/rendservice.c | 1 + src/or/rephist.c | 1 + src/or/router.c | 1 + src/or/routerlist.c | 1 + src/or/routerparse.c | 1 + src/test/test.c | 1 + src/test/test_util.c | 1 + 37 files changed, 113 insertions(+), 62 deletions(-) create mode 100644 src/or/config.h (limited to 'src/or/onion.c') diff --git a/src/or/buffers.c b/src/or/buffers.c index 807ca5076..2c1ba78ec 100644 --- a/src/or/buffers.c +++ b/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 diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 9d54dbec5..041aed3a0 100644 --- a/src/or/circuitbuild.c +++ b/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" diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index dbbe7bf36..a4ec4c06a 100644 --- a/src/or/circuitlist.c +++ b/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" diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 6ae929e84..70def3d48 100644 --- a/src/or/circuituse.c +++ b/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" diff --git a/src/or/command.c b/src/or/command.c index 1a5c893b7..96c5fca59 100644 --- a/src/or/command.c +++ b/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" diff --git a/src/or/config.c b/src/or/config.c index e9c9cbd69..a87238bec 100644 --- a/src/or/config.c +++ b/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" diff --git a/src/or/config.h b/src/or/config.h new file mode 100644 index 000000000..7a4ba5c60 --- /dev/null +++ b/src/or/config.h @@ -0,0 +1,78 @@ +/* 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 + diff --git a/src/or/connection.c b/src/or/connection.c index 255dcccdf..5265430ac 100644 --- a/src/or/connection.c +++ b/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" diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 311c48161..ec49d6632 100644 --- a/src/or/connection_edge.c +++ b/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" diff --git a/src/or/connection_or.c b/src/or/connection_or.c index a1e372003..f9fda6553 100644 --- a/src/or/connection_or.c +++ b/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" diff --git a/src/or/control.c b/src/or/control.c index 9c2f4f55d..f6363e522 100644 --- a/src/or/control.c +++ b/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" diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index b9c51d4fc..babc6d67b 100644 --- a/src/or/cpuworker.c +++ b/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. */ diff --git a/src/or/directory.c b/src/or/directory.c index 40f1a1e7f..fa340c126 100644 --- a/src/or/directory.c +++ b/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" diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d24fca027..217734487 100644 --- a/src/or/dirserv.c +++ b/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" diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 782e04c1b..6e6bf8d08 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -5,6 +5,7 @@ #define DIRVOTE_PRIVATE #include "or.h" +#include "config.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/dns.c b/src/or/dns.c index 131304711..905be3ef9 100644 --- a/src/or/dns.c +++ b/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 diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 390ef2f7b..68d8122f8 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -10,6 +10,7 @@ #include "or.h" #include "dnsserv.h" +#include "config.h" #ifdef HAVE_EVENT2_DNS_H #include #include diff --git a/src/or/geoip.c b/src/or/geoip.c index 5275c6ec7..16b3b14ed 100644 --- a/src/or/geoip.c +++ b/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" diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 245c6d4ef..74b1d85de 100644 --- a/src/or/hibernate.c +++ b/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 */ diff --git a/src/or/main.c b/src/or/main.c index 9d4dfed80..4af66c356 100644 --- a/src/or/main.c +++ b/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" diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b3c54a84f..0e478bf2a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -2,6 +2,7 @@ /* See LICENSE for licensing information */ #include "or.h" +#include "config.h" /** A data structure to hold a bunch of cached microdescriptors. There are * two active files in the cache: a "cache file" that we mmap, and a "journal diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 06472f2e6..34ead6f30 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -12,6 +12,7 @@ #include "or.h" #include "circuitbuild.h" +#include "config.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/onion.c b/src/or/onion.c index 2d666475f..5b4f3a07c 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -12,6 +12,7 @@ #include "or.h" #include "circuitlist.h" +#include "config.h" /** Type for a linked list of circuits that are waiting for a free CPU worker * to process a waiting onion handshake. */ diff --git a/src/or/or.h b/src/or/or.h index 29d51fc19..d2b6dd8bc 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3066,68 +3066,6 @@ typedef enum setopt_err_t { SETOPT_ERR_SETTING = -4, } setopt_err_t; -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 - /********************************* connection.c ***************************/ const char *conn_type_to_string(int type); diff --git a/src/or/policies.c b/src/or/policies.c index f5c02a600..8866b57c9 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -9,6 +9,7 @@ **/ #include "or.h" +#include "config.h" #include "ht.h" /** Policy that addresses for incoming SOCKS connections must match. */ diff --git a/src/or/reasons.c b/src/or/reasons.c index e1c64ebff..569e25390 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -9,6 +9,7 @@ **/ #include "or.h" +#include "config.h" /***************************** Edge (stream) reasons **********************/ diff --git a/src/or/relay.c b/src/or/relay.c index 87f453dac..53631ab41 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -15,6 +15,7 @@ #include "buffers.h" #include "circuitbuild.h" #include "circuitlist.h" +#include "config.h" #include "geoip.h" #include "mempool.h" #include "rendcommon.h" diff --git a/src/or/rendclient.c b/src/or/rendclient.c index c8e6c0a4f..5e1f81ee4 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -11,6 +11,7 @@ #include "circuitbuild.h" #include "circuitlist.h" #include "circuituse.h" +#include "config.h" #include "rendclient.h" #include "rendcommon.h" #include "routerlist.h" diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index e8d101484..a8862ae44 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -10,6 +10,7 @@ #include "or.h" #include "circuitbuild.h" +#include "config.h" #include "rendclient.h" #include "rendcommon.h" #include "rendservice.h" diff --git a/src/or/rendmid.c b/src/or/rendmid.c index a248828a0..f99654372 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -9,6 +9,7 @@ #include "or.h" #include "circuitlist.h" +#include "config.h" /** Respond to an ESTABLISH_INTRO cell by checking the signed data and * setting the circuit's purpose and service pk digest. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index fea0b06a1..a7ed2007f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -11,6 +11,7 @@ #include "circuitbuild.h" #include "circuitlist.h" #include "circuituse.h" +#include "config.h" #include "rendclient.h" #include "rendcommon.h" #include "rendservice.h" diff --git a/src/or/rephist.c b/src/or/rephist.c index 4fa421e51..88ba83e3e 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -12,6 +12,7 @@ #include "or.h" #include "circuitlist.h" #include "circuituse.h" +#include "config.h" #include "router.h" #include "routerlist.h" #include "ht.h" diff --git a/src/or/router.c b/src/or/router.c index a1af88f57..20990b2dd 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -9,6 +9,7 @@ #include "or.h" #include "circuitlist.h" #include "circuituse.h" +#include "config.h" #include "geoip.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 76e9b1b3d..5cf698aaa 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -13,6 +13,7 @@ #include "or.h" #include "circuitbuild.h" +#include "config.h" #include "geoip.h" #include "rendcommon.h" #include "rendservice.h" diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1a770c87e..b406a1cba 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -10,6 +10,7 @@ **/ #include "or.h" +#include "config.h" #include "rendcommon.h" #include "router.h" #include "routerlist.h" diff --git a/src/test/test.c b/src/test/test.c index ef9d9d61e..30bb1a0f7 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -45,6 +45,7 @@ double fabs(double x); #include "or.h" #include "buffers.h" #include "circuitbuild.h" +#include "config.h" #include "geoip.h" #include "rendcommon.h" #include "test.h" diff --git a/src/test/test_util.c b/src/test/test_util.c index bba96325c..fc31d055c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -7,6 +7,7 @@ #define CONTROL_PRIVATE #define MEMPOOL_PRIVATE #include "or.h" +#include "config.h" #include "test.h" #include "mempool.h" #include "memarea.h" -- cgit v1.2.3 From f6852fe031e066f46337ea936a40e3e2720bc5ad Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Fri, 23 Jul 2010 20:38:25 +0200 Subject: Create onion.h --- src/or/circuitbuild.c | 1 + src/or/circuitlist.c | 1 + src/or/command.c | 1 + src/or/cpuworker.c | 1 + src/or/main.c | 1 + src/or/onion.c | 1 + src/or/onion.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/or.h | 34 ---------------------------------- src/test/test.c | 1 + 9 files changed, 55 insertions(+), 34 deletions(-) create mode 100644 src/or/onion.h (limited to 'src/or/onion.c') diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5b360807d..00c9026fa 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -23,6 +23,7 @@ #include "directory.h" #include "main.h" #include "networkstatus.h" +#include "onion.h" #include "router.h" #include "routerlist.h" #include "crypto.h" diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index b8c273766..044cdb9c3 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -19,6 +19,7 @@ #include "connection_or.h" #include "control.h" #include "networkstatus.h" +#include "onion.h" #include "rendclient.h" #include "rendcommon.h" #include "routerlist.h" diff --git a/src/or/command.c b/src/or/command.c index 796f75cde..b3b7c2d37 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -25,6 +25,7 @@ #include "control.h" #include "cpuworker.h" #include "hibernate.h" +#include "onion.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 4ab6d4164..2760d9666 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -20,6 +20,7 @@ #include "connection.h" #include "cpuworker.h" #include "main.h" +#include "onion.h" #include "router.h" /** The maximum number of cpuworker processes we will keep around. */ diff --git a/src/or/main.c b/src/or/main.c index 67688bd6d..b30a77edd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -34,6 +34,7 @@ #include "microdesc.h" #include "networkstatus.h" #include "ntmain.h" +#include "onion.h" #include "rendclient.h" #include "rendcommon.h" #include "rendservice.h" diff --git a/src/or/onion.c b/src/or/onion.c index 5b4f3a07c..1612d389d 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -13,6 +13,7 @@ #include "or.h" #include "circuitlist.h" #include "config.h" +#include "onion.h" /** Type for a linked list of circuits that are waiting for a free CPU worker * to process a waiting onion handshake. */ diff --git a/src/or/onion.h b/src/or/onion.h new file mode 100644 index 000000000..e84dbb47b --- /dev/null +++ b/src/or/onion.h @@ -0,0 +1,48 @@ +/* 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 onion.h + * \brief Header file for onion.c. + **/ + +#ifndef _TOR_ONION_H +#define _TOR_ONION_H + +int onion_pending_add(or_circuit_t *circ, char *onionskin); +or_circuit_t *onion_next_task(char **onionskin_out); +void onion_pending_remove(or_circuit_t *circ); + +int onion_skin_create(crypto_pk_env_t *router_key, + crypto_dh_env_t **handshake_state_out, + char *onion_skin_out); + +int onion_skin_server_handshake(const char *onion_skin, + crypto_pk_env_t *private_key, + crypto_pk_env_t *prev_private_key, + char *handshake_reply_out, + char *key_out, + size_t key_out_len); + +int onion_skin_client_handshake(crypto_dh_env_t *handshake_state, + const char *handshake_reply, + char *key_out, + size_t key_out_len); + +int fast_server_handshake(const char *key_in, + char *handshake_reply_out, + char *key_out, + size_t key_out_len); + +int fast_client_handshake(const char *handshake_state, + const char *handshake_reply_out, + char *key_out, + size_t key_out_len); + +void clear_pending_onions(void); + +#endif + diff --git a/src/or/or.h b/src/or/or.h index 2afbac6f3..8322cf3d4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3293,40 +3293,6 @@ typedef enum version_status_t { VS_UNKNOWN, /**< We have no idea. */ } version_status_t; -/********************************* onion.c ***************************/ - -int onion_pending_add(or_circuit_t *circ, char *onionskin); -or_circuit_t *onion_next_task(char **onionskin_out); -void onion_pending_remove(or_circuit_t *circ); - -int onion_skin_create(crypto_pk_env_t *router_key, - crypto_dh_env_t **handshake_state_out, - char *onion_skin_out); - -int onion_skin_server_handshake(const char *onion_skin, - crypto_pk_env_t *private_key, - crypto_pk_env_t *prev_private_key, - char *handshake_reply_out, - char *key_out, - size_t key_out_len); - -int onion_skin_client_handshake(crypto_dh_env_t *handshake_state, - const char *handshake_reply, - char *key_out, - size_t key_out_len); - -int fast_server_handshake(const char *key_in, - char *handshake_reply_out, - char *key_out, - size_t key_out_len); - -int fast_client_handshake(const char *handshake_state, - const char *handshake_reply_out, - char *key_out, - size_t key_out_len); - -void clear_pending_onions(void); - /********************************* policies.c ************************/ /* (length of "accept 255.255.255.255/255.255.255.255:65535-65535\n" plus a diff --git a/src/test/test.c b/src/test/test.c index 7e6bf7055..a1e286819 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -53,6 +53,7 @@ double fabs(double x); #include "torgzip.h" #include "mempool.h" #include "memarea.h" +#include "onion.h" #ifdef USE_DMALLOC #include -- cgit v1.2.3 From df9d42cef56c856db44c22cd3e2eb2a6e2ff1e4c Mon Sep 17 00:00:00 2001 From: Sebastian Hahn Date: Fri, 23 Jul 2010 22:57:20 +0200 Subject: Create rephist.h --- src/or/circuitbuild.c | 1 + src/or/circuitlist.c | 1 + src/or/circuituse.c | 1 + src/or/config.c | 1 + src/or/connection.c | 1 + src/or/connection_edge.c | 1 + src/or/connection_or.c | 1 + src/or/directory.c | 1 + src/or/dirserv.c | 1 + src/or/dirvote.c | 1 + src/or/main.c | 1 + src/or/onion.c | 1 + src/or/or.h | 62 ------------------------------------- src/or/rendclient.c | 1 + src/or/rendcommon.c | 1 + src/or/rendmid.c | 1 + src/or/rendservice.c | 1 + src/or/rephist.c | 1 + src/or/rephist.h | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ src/or/router.c | 1 + src/or/routerlist.c | 1 + src/or/routerparse.c | 1 + src/test/test.c | 1 + 23 files changed, 100 insertions(+), 62 deletions(-) create mode 100644 src/or/rephist.h (limited to 'src/or/onion.c') diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b78845fdd..fc3dbda13 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -26,6 +26,7 @@ #include "onion.h" #include "policies.h" #include "relay.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" #include "crypto.h" diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index df4aec727..c581365f8 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -23,6 +23,7 @@ #include "relay.h" #include "rendclient.h" #include "rendcommon.h" +#include "rephist.h" #include "routerlist.h" #include "ht.h" diff --git a/src/or/circuituse.c b/src/or/circuituse.c index b13e558d0..a3f10a884 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -21,6 +21,7 @@ #include "rendclient.h" #include "rendcommon.h" #include "rendservice.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/config.c b/src/or/config.c index 4fdf32e0a..a4e4f89c1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -30,6 +30,7 @@ #include "relay.h" #include "rendclient.h" #include "rendservice.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" #ifdef MS_WINDOWS diff --git a/src/or/connection.c b/src/or/connection.c index d9aa1cf78..02acd97e7 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -32,6 +32,7 @@ #include "relay.h" #include "rendclient.h" #include "rendcommon.h" +#include "rephist.h" #include "router.h" static connection_t *connection_create_listener( diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 83ba23058..7522368c5 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -29,6 +29,7 @@ #include "rendclient.h" #include "rendcommon.h" #include "rendservice.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/connection_or.c b/src/or/connection_or.c index bf19503d5..405df1578 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -24,6 +24,7 @@ #include "networkstatus.h" #include "reasons.h" #include "relay.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/directory.c b/src/or/directory.c index 1c13cbd3d..c1e68bf45 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -19,6 +19,7 @@ #include "policies.h" #include "rendclient.h" #include "rendcommon.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 38fc8f161..397a0c866 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -17,6 +17,7 @@ #include "microdesc.h" #include "networkstatus.h" #include "policies.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 7873e49e7..2448a6a19 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -12,6 +12,7 @@ #include "microdesc.h" #include "networkstatus.h" #include "policies.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/main.c b/src/or/main.c index e202a109d..92c60e7e8 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -40,6 +40,7 @@ #include "rendclient.h" #include "rendcommon.h" #include "rendservice.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" #ifdef USE_DMALLOC diff --git a/src/or/onion.c b/src/or/onion.c index 1612d389d..ebc358364 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -14,6 +14,7 @@ #include "circuitlist.h" #include "config.h" #include "onion.h" +#include "rephist.h" /** Type for a linked list of circuits that are waiting for a free CPU worker * to process a waiting onion handshake. */ diff --git a/src/or/or.h b/src/or/or.h index 3e7fe2310..f51da60f7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3311,51 +3311,6 @@ typedef enum { /********************************* rephist.c ***************************/ -void rep_hist_init(void); -void rep_hist_note_connect_failed(const char* nickname, time_t when); -void rep_hist_note_connect_succeeded(const char* nickname, time_t when); -void rep_hist_note_disconnect(const char* nickname, time_t when); -void rep_hist_note_connection_died(const char* nickname, time_t when); -void rep_hist_note_extend_succeeded(const char *from_name, - const char *to_name); -void rep_hist_note_extend_failed(const char *from_name, const char *to_name); -void rep_hist_dump_stats(time_t now, int severity); -void rep_hist_note_bytes_read(size_t num_bytes, time_t when); -void rep_hist_note_bytes_written(size_t num_bytes, time_t when); -void rep_hist_note_exit_bytes_read(uint16_t port, size_t num_bytes); -void rep_hist_note_exit_bytes_written(uint16_t port, size_t num_bytes); -void rep_hist_note_exit_stream_opened(uint16_t port); -void rep_hist_exit_stats_init(time_t now); -void rep_hist_exit_stats_write(time_t now); -int rep_hist_bandwidth_assess(void); -char *rep_hist_get_bandwidth_lines(int for_extrainfo); -void rep_hist_update_state(or_state_t *state); -int rep_hist_load_state(or_state_t *state, char **err); -void rep_history_clean(time_t before); - -void rep_hist_note_router_reachable(const char *id, time_t when); -void rep_hist_note_router_unreachable(const char *id, time_t when); -int rep_hist_record_mtbf_data(time_t now, int missing_means_down); -int rep_hist_load_mtbf_data(time_t now); - -time_t rep_hist_downrate_old_runs(time_t now); -double rep_hist_get_stability(const char *id, time_t when); -double rep_hist_get_weighted_fractional_uptime(const char *id, time_t when); -long rep_hist_get_weighted_time_known(const char *id, time_t when); -int rep_hist_have_measured_enough_stability(void); -const char *rep_hist_get_router_stability_doc(time_t now); - -void rep_hist_note_used_port(time_t now, uint16_t port); -smartlist_t *rep_hist_get_predicted_ports(time_t now); -void rep_hist_note_used_resolve(time_t now); -void rep_hist_note_used_internal(time_t now, int need_uptime, - int need_capacity); -int rep_hist_get_predicted_internal(time_t now, int *need_uptime, - int *need_capacity); - -int any_predicted_circuits(time_t now); -int rep_hist_circbuilding_dormant(time_t now); - /** Possible public/private key operations in Tor: used to keep track of where * we're spending our time. */ typedef enum { @@ -3365,23 +3320,6 @@ typedef enum { TLS_HANDSHAKE_C, TLS_HANDSHAKE_S, REND_CLIENT, REND_MID, REND_SERVER, } pk_op_t; -void note_crypto_pk_op(pk_op_t operation); -void dump_pk_ops(int severity); - -void rep_hist_free_all(void); - -/* for hidden service usage statistics */ -void hs_usage_note_publish_total(const char *service_id, time_t now); -void hs_usage_note_publish_novel(const char *service_id, time_t now); -void hs_usage_note_fetch_total(const char *service_id, time_t now); -void hs_usage_note_fetch_successful(const char *service_id, time_t now); -void hs_usage_write_statistics_to_file(time_t now); -void hs_usage_free_all(void); - -void rep_hist_buffer_stats_init(time_t now); -void rep_hist_buffer_stats_add_circ(circuit_t *circ, - time_t end_of_interval); -void rep_hist_buffer_stats_write(time_t now); /********************************* rendcommon.c ***************************/ diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 166d38da8..0377f121c 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -19,6 +19,7 @@ #include "relay.h" #include "rendclient.h" #include "rendcommon.h" +#include "rephist.h" #include "routerlist.h" /** Called when we've established a circuit to an introduction point: diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index fc43f11bb..8a4de3cca 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -15,6 +15,7 @@ #include "rendcommon.h" #include "rendmid.h" #include "rendservice.h" +#include "rephist.h" #include "routerlist.h" /** Return 0 if one and two are the same service ids, else -1 or 1 */ diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 48cb10f52..d392f8e53 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -12,6 +12,7 @@ #include "config.h" #include "relay.h" #include "rendmid.h" +#include "rephist.h" /** Respond to an ESTABLISH_INTRO cell by checking the signed data and * setting the circuit's purpose and service pk digest. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2c1c8cfde..f7ab60dbf 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -19,6 +19,7 @@ #include "rendservice.h" #include "router.h" #include "relay.h" +#include "rephist.h" #include "routerlist.h" static origin_circuit_t *find_intro_circuit(rend_intro_point_t *intro, diff --git a/src/or/rephist.c b/src/or/rephist.c index 88ba83e3e..a419f31e7 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -13,6 +13,7 @@ #include "circuitlist.h" #include "circuituse.h" #include "config.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" #include "ht.h" diff --git a/src/or/rephist.h b/src/or/rephist.h new file mode 100644 index 000000000..1720c9a9f --- /dev/null +++ b/src/or/rephist.h @@ -0,0 +1,79 @@ +/* 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 rephist.h + * \brief Header file for rephist functions + **/ + +#ifndef _TOR_REPHIST_H +#define _TOR_REPHIST_H + +void rep_hist_init(void); +void rep_hist_note_connect_failed(const char* nickname, time_t when); +void rep_hist_note_connect_succeeded(const char* nickname, time_t when); +void rep_hist_note_disconnect(const char* nickname, time_t when); +void rep_hist_note_connection_died(const char* nickname, time_t when); +void rep_hist_note_extend_succeeded(const char *from_name, + const char *to_name); +void rep_hist_note_extend_failed(const char *from_name, const char *to_name); +void rep_hist_dump_stats(time_t now, int severity); +void rep_hist_note_bytes_read(size_t num_bytes, time_t when); +void rep_hist_note_bytes_written(size_t num_bytes, time_t when); +void rep_hist_note_exit_bytes_read(uint16_t port, size_t num_bytes); +void rep_hist_note_exit_bytes_written(uint16_t port, size_t num_bytes); +void rep_hist_note_exit_stream_opened(uint16_t port); +void rep_hist_exit_stats_init(time_t now); +void rep_hist_exit_stats_write(time_t now); +int rep_hist_bandwidth_assess(void); +char *rep_hist_get_bandwidth_lines(int for_extrainfo); +void rep_hist_update_state(or_state_t *state); +int rep_hist_load_state(or_state_t *state, char **err); +void rep_history_clean(time_t before); + +void rep_hist_note_router_reachable(const char *id, time_t when); +void rep_hist_note_router_unreachable(const char *id, time_t when); +int rep_hist_record_mtbf_data(time_t now, int missing_means_down); +int rep_hist_load_mtbf_data(time_t now); + +time_t rep_hist_downrate_old_runs(time_t now); +double rep_hist_get_stability(const char *id, time_t when); +double rep_hist_get_weighted_fractional_uptime(const char *id, time_t when); +long rep_hist_get_weighted_time_known(const char *id, time_t when); +int rep_hist_have_measured_enough_stability(void); +const char *rep_hist_get_router_stability_doc(time_t now); + +void rep_hist_note_used_port(time_t now, uint16_t port); +smartlist_t *rep_hist_get_predicted_ports(time_t now); +void rep_hist_note_used_resolve(time_t now); +void rep_hist_note_used_internal(time_t now, int need_uptime, + int need_capacity); +int rep_hist_get_predicted_internal(time_t now, int *need_uptime, + int *need_capacity); + +int any_predicted_circuits(time_t now); +int rep_hist_circbuilding_dormant(time_t now); + +void note_crypto_pk_op(pk_op_t operation); +void dump_pk_ops(int severity); + +void rep_hist_free_all(void); + +/* for hidden service usage statistics */ +void hs_usage_note_publish_total(const char *service_id, time_t now); +void hs_usage_note_publish_novel(const char *service_id, time_t now); +void hs_usage_note_fetch_total(const char *service_id, time_t now); +void hs_usage_note_fetch_successful(const char *service_id, time_t now); +void hs_usage_write_statistics_to_file(time_t now); +void hs_usage_free_all(void); + +void rep_hist_buffer_stats_init(time_t now); +void rep_hist_buffer_stats_add_circ(circuit_t *circ, + time_t end_of_interval); +void rep_hist_buffer_stats_write(time_t now); + +#endif + diff --git a/src/or/router.c b/src/or/router.c index bf4256677..36e2d2608 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -20,6 +20,7 @@ #include "main.h" #include "policies.h" #include "relay.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 1fb3dbc40..7f47e7128 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -26,6 +26,7 @@ #include "policies.h" #include "rendcommon.h" #include "rendservice.h" +#include "rephist.h" #include "router.h" #include "routerlist.h" diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 0662fd3a1..88fbdbf6c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -20,6 +20,7 @@ #include "memarea.h" #include "microdesc.h" #include "networkstatus.h" +#include "rephist.h" #undef log #include diff --git a/src/test/test.c b/src/test/test.c index b5c908a21..8bb694dba 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -55,6 +55,7 @@ double fabs(double x); #include "memarea.h" #include "onion.h" #include "policies.h" +#include "rephist.h" #ifdef USE_DMALLOC #include -- cgit v1.2.3