2006-02-09 06:46:49 +01:00
|
|
|
/* Copyright (c) 2001 Matej Pfajfar.
|
|
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
2007-12-12 22:09:01 +01:00
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
2008-02-07 06:31:47 +01:00
|
|
|
* Copyright (c) 2007-2008, The Tor Project, Inc. */
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2005-12-27 05:52:34 +01:00
|
|
|
const char main_c_id[] =
|
|
|
|
"$Id$";
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/**
|
|
|
|
* \file main.c
|
2005-06-11 07:31:17 +02:00
|
|
|
* \brief Toplevel module. Handles signals, multiplexes between
|
|
|
|
* connections, implements main loop, and drives scheduled events.
|
2004-05-09 18:47:25 +02:00
|
|
|
**/
|
2004-05-05 23:32:43 +02:00
|
|
|
|
2007-09-06 20:19:09 +02:00
|
|
|
#define MAIN_PRIVATE
|
2002-06-27 00:45:49 +02:00
|
|
|
#include "or.h"
|
2005-02-03 08:25:10 +01:00
|
|
|
#ifdef USE_DMALLOC
|
|
|
|
#include <dmalloc.h>
|
2008-09-25 19:36:09 +02:00
|
|
|
#include <openssl/crypto.h>
|
2005-02-03 08:25:10 +01:00
|
|
|
#endif
|
2008-04-08 19:29:05 +02:00
|
|
|
#include "memarea.h"
|
2007-03-05 03:40:58 +01:00
|
|
|
|
2006-09-25 22:38:58 +02:00
|
|
|
void evdns_shutdown(int);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-02-29 02:31:33 +01:00
|
|
|
/********* PROTOTYPES **********/
|
2003-07-05 07:46:06 +02:00
|
|
|
|
2005-06-08 19:24:58 +02:00
|
|
|
static void dumpmemusage(int severity);
|
2003-10-15 20:28:32 +02:00
|
|
|
static void dumpstats(int severity); /* log stats */
|
2005-01-12 07:42:32 +01:00
|
|
|
static void conn_read_callback(int fd, short event, void *_conn);
|
|
|
|
static void conn_write_callback(int fd, short event, void *_conn);
|
|
|
|
static void signal_callback(int fd, short events, void *arg);
|
|
|
|
static void second_elapsed_callback(int fd, short event, void *args);
|
|
|
|
static int conn_close_if_marked(int i);
|
2007-05-29 19:31:13 +02:00
|
|
|
static void connection_start_reading_from_linked_conn(connection_t *conn);
|
2007-05-29 20:20:56 +02:00
|
|
|
static int connection_should_read_from_linked_conn(connection_t *conn);
|
2003-07-05 07:46:06 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/********* START VARIABLES **********/
|
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
int global_read_bucket; /**< Max number of bytes I can read this second. */
|
2004-09-08 08:52:33 +02:00
|
|
|
int global_write_bucket; /**< Max number of bytes I can write this second. */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-03-20 03:55:31 +01:00
|
|
|
/** Max number of relayed (bandwidth class 1) bytes I can read this second. */
|
|
|
|
int global_relayed_read_bucket;
|
|
|
|
/** Max number of relayed (bandwidth class 1) bytes I can write this second. */
|
|
|
|
int global_relayed_write_bucket;
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** What was the read bucket before the last call to prepare_for_pool?
|
2004-05-05 23:32:43 +02:00
|
|
|
* (used to determine how many bytes we've read). */
|
2003-10-02 22:00:38 +02:00
|
|
|
static int stats_prev_global_read_bucket;
|
2004-09-08 08:52:33 +02:00
|
|
|
/** What was the write bucket before the last call to prepare_for_pool?
|
|
|
|
* (used to determine how many bytes we've written). */
|
|
|
|
static int stats_prev_global_write_bucket;
|
2007-03-20 03:55:31 +01:00
|
|
|
/* XXX we might want to keep stats about global_relayed_*_bucket too. Or not.*/
|
2004-09-08 08:52:33 +02:00
|
|
|
/** How many bytes have we read/written since we started the process? */
|
2003-10-02 22:00:38 +02:00
|
|
|
static uint64_t stats_n_bytes_read = 0;
|
2004-09-08 08:52:33 +02:00
|
|
|
static uint64_t stats_n_bytes_written = 0;
|
2005-01-10 06:10:22 +01:00
|
|
|
/** What time did this process start up? */
|
2007-11-08 19:15:49 +01:00
|
|
|
time_t time_of_process_start = 0;
|
2004-05-09 18:47:25 +02:00
|
|
|
/** How many seconds have we been running? */
|
2005-01-10 06:10:22 +01:00
|
|
|
long stats_n_seconds_working = 0;
|
2006-12-28 22:29:20 +01:00
|
|
|
/** When do we next launch DNS wildcarding checks? */
|
|
|
|
static time_t time_to_check_for_correct_dns = 0;
|
2007-02-22 07:21:19 +01:00
|
|
|
|
|
|
|
/** How often will we honor SIGNEWNYM requests? */
|
|
|
|
#define MAX_SIGNEWNYM_RATE 10
|
|
|
|
/** When did we last process a SIGNEWNYM request? */
|
|
|
|
static time_t time_of_last_signewnym = 0;
|
|
|
|
/** Is there a signewnym request we're currently waiting to handle? */
|
|
|
|
static int signewnym_is_pending = 0;
|
2004-10-28 20:37:52 +02:00
|
|
|
|
2007-05-22 17:49:14 +02:00
|
|
|
/** Smartlist of all open connections. */
|
|
|
|
static smartlist_t *connection_array = NULL;
|
2007-02-16 21:39:37 +01:00
|
|
|
/** List of connections that have been marked for close and need to be freed
|
|
|
|
* and removed from connection_array. */
|
2005-01-12 07:42:32 +01:00
|
|
|
static smartlist_t *closeable_connection_lst = NULL;
|
2007-05-29 19:31:13 +02:00
|
|
|
/** List of linked connections that are currently reading data into their
|
|
|
|
* inbuf from their partner's outbuf. */
|
2007-04-21 19:26:12 +02:00
|
|
|
static smartlist_t *active_linked_connection_lst = NULL;
|
2007-05-29 19:31:13 +02:00
|
|
|
/** Flag: Set to true iff we entered the current libevent main loop via
|
|
|
|
* <b>loop_once</b>. If so, there's no need to trigger a loopexit in order
|
|
|
|
* to handle linked connections. */
|
2007-04-21 19:26:12 +02:00
|
|
|
static int called_loop_once = 0;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** We set this to 1 when we've opened a circuit, so we can print a log
|
2004-02-29 02:31:33 +01:00
|
|
|
* entry to inform the user that Tor is working. */
|
2004-05-05 23:32:43 +02:00
|
|
|
int has_completed_circuit=0;
|
2004-02-29 02:31:33 +01:00
|
|
|
|
2007-10-18 21:51:14 +02:00
|
|
|
/** How often do we check for router descriptors that we should download
|
|
|
|
* when we have too little directory info? */
|
|
|
|
#define GREEDY_DESCRIPTOR_RETRY_INTERVAL (10)
|
|
|
|
/** How often do we check for router descriptors that we should download
|
|
|
|
* when we have enough directory info? */
|
|
|
|
#define LAZY_DESCRIPTOR_RETRY_INTERVAL (60)
|
2006-03-12 23:48:18 +01:00
|
|
|
/** How often do we 'forgive' undownloadable router descriptors and attempt
|
|
|
|
* to download them again? */
|
|
|
|
#define DESCRIPTOR_FAILURE_RESET_INTERVAL (60*60)
|
|
|
|
/** How long do we let a directory connection stall before expiring it? */
|
|
|
|
#define DIR_CONN_MAX_STALL (5*60)
|
|
|
|
|
|
|
|
/** How old do we let a connection to an OR get before deciding it's
|
|
|
|
* obsolete? */
|
|
|
|
#define TIME_BEFORE_OR_CONN_IS_OBSOLETE (60*60*24*7)
|
2006-05-28 18:07:44 +02:00
|
|
|
/** How long do we let OR connections handshake before we decide that
|
|
|
|
* they are obsolete? */
|
2008-01-18 06:00:35 +01:00
|
|
|
#define TLS_HANDSHAKE_TIMEOUT (60)
|
2004-11-13 17:53:48 +01:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/********* END VARIABLES ************/
|
|
|
|
|
2002-07-05 08:27:23 +02:00
|
|
|
/****************************************************************************
|
|
|
|
*
|
|
|
|
* This section contains accessors and other methods on the connection_array
|
2006-07-27 07:03:57 +02:00
|
|
|
* variables (which are global within this file and unavailable outside it).
|
2002-07-05 08:27:23 +02:00
|
|
|
*
|
|
|
|
****************************************************************************/
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Add <b>conn</b> to the array of connections that we can poll on. The
|
2004-05-05 23:32:43 +02:00
|
|
|
* connection's socket must be set; the connection starts out
|
|
|
|
* non-reading and non-writing.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_add(connection_t *conn)
|
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2007-06-13 21:50:18 +02:00
|
|
|
tor_assert(conn->s >= 0 ||
|
|
|
|
conn->linked ||
|
|
|
|
(conn->type == CONN_TYPE_AP &&
|
2007-07-10 19:14:51 +02:00
|
|
|
TO_EDGE_CONN(conn)->is_dns_request));
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-04-21 19:24:18 +02:00
|
|
|
tor_assert(conn->conn_array_index == -1); /* can only connection_add once */
|
2007-05-22 17:49:14 +02:00
|
|
|
conn->conn_array_index = smartlist_len(connection_array);
|
|
|
|
smartlist_add(connection_array, conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-06-13 23:05:32 +02:00
|
|
|
if (conn->s >= 0 || conn->linked) {
|
2007-06-13 21:50:18 +02:00
|
|
|
conn->read_event = tor_malloc_zero(sizeof(struct event));
|
|
|
|
conn->write_event = tor_malloc_zero(sizeof(struct event));
|
|
|
|
event_set(conn->read_event, conn->s, EV_READ|EV_PERSIST,
|
|
|
|
conn_read_callback, conn);
|
|
|
|
event_set(conn->write_event, conn->s, EV_WRITE|EV_PERSIST,
|
|
|
|
conn_write_callback, conn);
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2006-07-27 07:03:57 +02:00
|
|
|
log_debug(LD_NET,"new conn type %s, socket %d, n_conns %d.",
|
2007-05-22 17:49:14 +02:00
|
|
|
conn_type_to_string(conn->type), conn->s,
|
|
|
|
smartlist_len(connection_array));
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Remove the connection from the global list, and remove the
|
2003-10-09 20:45:14 +02:00
|
|
|
* corresponding poll entry. Calling this function will shift the last
|
|
|
|
* connection (if any) into the position occupied by conn.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_remove(connection_t *conn)
|
|
|
|
{
|
2002-06-27 00:45:49 +02:00
|
|
|
int current_index;
|
2007-05-22 17:49:14 +02:00
|
|
|
connection_t *tmp;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2006-07-27 07:03:57 +02:00
|
|
|
log_debug(LD_NET,"removing socket %d (type %s), n_conns now %d",
|
2007-05-22 17:49:14 +02:00
|
|
|
conn->s, conn_type_to_string(conn->type),
|
|
|
|
smartlist_len(connection_array));
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2006-07-27 07:03:57 +02:00
|
|
|
tor_assert(conn->conn_array_index >= 0);
|
|
|
|
current_index = conn->conn_array_index;
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_unregister_events(conn); /* This is redundant, but cheap. */
|
2007-05-22 17:49:14 +02:00
|
|
|
if (current_index == smartlist_len(connection_array)-1) { /* at the end */
|
|
|
|
smartlist_del(connection_array, current_index);
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0;
|
2003-12-05 10:51:49 +01:00
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-03-18 20:22:56 +01:00
|
|
|
/* replace this one with the one at the end */
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_del(connection_array, current_index);
|
|
|
|
tmp = smartlist_get(connection_array, current_index);
|
|
|
|
tmp->conn_array_index = current_index;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-12-05 10:51:49 +01:00
|
|
|
return 0;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
/** If <b>conn</b> is an edge conn, remove it from the list
|
2005-01-30 22:47:47 +01:00
|
|
|
* of conn's on this circuit. If it's not on an edge,
|
|
|
|
* flush and send destroys for all circuits on this conn.
|
|
|
|
*
|
2007-04-21 19:26:12 +02:00
|
|
|
* Remove it from connection_array (if applicable) and
|
|
|
|
* from closeable_connection_list.
|
2005-01-30 22:47:47 +01:00
|
|
|
*
|
|
|
|
* Then free it.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_unlink(connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-01-30 22:47:47 +01:00
|
|
|
connection_about_to_close_connection(conn);
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->conn_array_index >= 0) {
|
2005-01-30 22:47:47 +01:00
|
|
|
connection_remove(conn);
|
|
|
|
}
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked_conn) {
|
|
|
|
conn->linked_conn->linked_conn = NULL;
|
|
|
|
if (! conn->linked_conn->marked_for_close &&
|
|
|
|
conn->linked_conn->reading_from_linked_conn)
|
|
|
|
connection_start_reading(conn->linked_conn);
|
|
|
|
conn->linked_conn = NULL;
|
|
|
|
}
|
2005-01-31 01:26:09 +01:00
|
|
|
smartlist_remove(closeable_connection_lst, conn);
|
2007-04-21 19:26:12 +02:00
|
|
|
smartlist_remove(active_linked_connection_lst, conn);
|
2005-01-30 22:47:47 +01:00
|
|
|
if (conn->type == CONN_TYPE_EXIT) {
|
2006-07-26 21:07:26 +02:00
|
|
|
assert_connection_edge_not_dns_pending(TO_EDGE_CONN(conn));
|
2005-01-30 22:47:47 +01:00
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR) {
|
|
|
|
if (!tor_digest_is_zero(TO_OR_CONN(conn)->identity_digest))
|
|
|
|
connection_or_remove_from_identity_map(TO_OR_CONN(conn));
|
2005-11-30 05:28:41 +01:00
|
|
|
}
|
2005-01-30 22:47:47 +01:00
|
|
|
connection_free(conn);
|
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Schedule <b>conn</b> to be closed. **/
|
2005-01-12 07:42:32 +01:00
|
|
|
void
|
|
|
|
add_connection_to_closeable_list(connection_t *conn)
|
|
|
|
{
|
|
|
|
tor_assert(!smartlist_isin(closeable_connection_lst, conn));
|
|
|
|
tor_assert(conn->marked_for_close);
|
2005-02-02 01:19:09 +01:00
|
|
|
assert_connection_ok(conn, time(NULL));
|
2005-01-12 07:42:32 +01:00
|
|
|
smartlist_add(closeable_connection_lst, conn);
|
|
|
|
}
|
|
|
|
|
2005-01-31 01:33:32 +01:00
|
|
|
/** Return 1 if conn is on the closeable list, else return 0. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_is_on_closeable_list(connection_t *conn)
|
|
|
|
{
|
2005-01-31 01:33:32 +01:00
|
|
|
return smartlist_isin(closeable_connection_lst, conn);
|
|
|
|
}
|
|
|
|
|
2004-06-02 00:09:58 +02:00
|
|
|
/** Return true iff conn is in the current poll array. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_in_array(connection_t *conn)
|
|
|
|
{
|
2007-05-22 17:49:14 +02:00
|
|
|
return smartlist_isin(connection_array, conn);
|
2004-06-02 00:09:58 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Set <b>*array</b> to an array of all connections, and <b>*n</b>
|
|
|
|
* to the length of the array. <b>*array</b> and <b>*n</b> must not
|
|
|
|
* be modified.
|
2004-05-05 23:32:43 +02:00
|
|
|
*/
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *
|
|
|
|
get_connection_array(void)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2008-09-09 22:43:31 +02:00
|
|
|
if (!connection_array)
|
|
|
|
connection_array = smartlist_create();
|
2007-05-22 17:49:14 +02:00
|
|
|
return connection_array;
|
2003-06-25 09:19:30 +02:00
|
|
|
}
|
|
|
|
|
2005-02-25 06:42:01 +01:00
|
|
|
/** Set the event mask on <b>conn</b> to <b>events</b>. (The event
|
2005-06-11 20:52:12 +02:00
|
|
|
* mask is a bitmask whose bits are EV_READ and EV_WRITE.)
|
2004-05-05 23:32:43 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_watch_events(connection_t *conn, short events)
|
|
|
|
{
|
2007-04-25 09:20:04 +02:00
|
|
|
if (events & EV_READ)
|
|
|
|
connection_start_reading(conn);
|
|
|
|
else
|
|
|
|
connection_stop_reading(conn);
|
|
|
|
|
|
|
|
if (events & EV_WRITE)
|
|
|
|
connection_start_writing(conn);
|
|
|
|
else
|
|
|
|
connection_stop_writing(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Return true iff <b>conn</b> is listening for read events. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_is_reading(connection_t *conn)
|
|
|
|
{
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn);
|
2005-01-12 07:42:32 +01:00
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
return conn->reading_from_linked_conn ||
|
|
|
|
(conn->read_event && event_pending(conn->read_event, EV_READ, NULL));
|
2003-09-07 12:24:40 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Tell the main loop to stop notifying <b>conn</b> of any read events. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_stop_reading(connection_t *conn)
|
|
|
|
{
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn);
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_assert(conn->read_event);
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked) {
|
|
|
|
conn->reading_from_linked_conn = 0;
|
|
|
|
connection_stop_reading_from_linked_conn(conn);
|
|
|
|
} else {
|
|
|
|
if (event_del(conn->read_event))
|
|
|
|
log_warn(LD_NET, "Error from libevent setting read event state for %d "
|
|
|
|
"to unwatched: %s",
|
|
|
|
conn->s,
|
|
|
|
tor_socket_strerror(tor_socket_errno(conn->s)));
|
|
|
|
}
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Tell the main loop to start notifying <b>conn</b> of any read events. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_start_reading(connection_t *conn)
|
|
|
|
{
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn);
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_assert(conn->read_event);
|
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked) {
|
|
|
|
conn->reading_from_linked_conn = 1;
|
|
|
|
if (connection_should_read_from_linked_conn(conn))
|
|
|
|
connection_start_reading_from_linked_conn(conn);
|
|
|
|
} else {
|
|
|
|
if (event_add(conn->read_event, NULL))
|
|
|
|
log_warn(LD_NET, "Error from libevent setting read event state for %d "
|
|
|
|
"to watched: %s",
|
|
|
|
conn->s,
|
|
|
|
tor_socket_strerror(tor_socket_errno(conn->s)));
|
|
|
|
}
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Return true iff <b>conn</b> is listening for write events. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_is_writing(connection_t *conn)
|
|
|
|
{
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_assert(conn);
|
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
return conn->writing_to_linked_conn ||
|
|
|
|
(conn->write_event && event_pending(conn->write_event, EV_WRITE, NULL));
|
2004-02-27 05:42:14 +01:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Tell the main loop to stop notifying <b>conn</b> of any write events. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_stop_writing(connection_t *conn)
|
|
|
|
{
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn);
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_assert(conn->write_event);
|
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked) {
|
|
|
|
conn->writing_to_linked_conn = 0;
|
|
|
|
if (conn->linked_conn)
|
|
|
|
connection_stop_reading_from_linked_conn(conn->linked_conn);
|
|
|
|
} else {
|
|
|
|
if (event_del(conn->write_event))
|
|
|
|
log_warn(LD_NET, "Error from libevent setting write event state for %d "
|
|
|
|
"to unwatched: %s",
|
|
|
|
conn->s,
|
|
|
|
tor_socket_strerror(tor_socket_errno(conn->s)));
|
|
|
|
}
|
2002-07-18 08:37:58 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Tell the main loop to start notifying <b>conn</b> of any write events. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_start_writing(connection_t *conn)
|
|
|
|
{
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn);
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_assert(conn->write_event);
|
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked) {
|
|
|
|
conn->writing_to_linked_conn = 1;
|
|
|
|
if (conn->linked_conn &&
|
|
|
|
connection_should_read_from_linked_conn(conn->linked_conn))
|
|
|
|
connection_start_reading_from_linked_conn(conn->linked_conn);
|
|
|
|
} else {
|
|
|
|
if (event_add(conn->write_event, NULL))
|
|
|
|
log_warn(LD_NET, "Error from libevent setting write event state for %d "
|
|
|
|
"to watched: %s",
|
|
|
|
conn->s,
|
|
|
|
tor_socket_strerror(tor_socket_errno(conn->s)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-05-29 20:20:56 +02:00
|
|
|
/** Return true iff <b>conn</b> is linked conn, and reading from the conn
|
|
|
|
* linked to it would be good and feasible. (Reading is "feasible" if the
|
|
|
|
* other conn exists and has data in its outbuf, and is "good" if we have our
|
|
|
|
* reading_from_linked_conn flag set and the other conn has its
|
|
|
|
* writing_to_linked_conn flag set.)*/
|
|
|
|
static int
|
|
|
|
connection_should_read_from_linked_conn(connection_t *conn)
|
|
|
|
{
|
|
|
|
if (conn->linked && conn->reading_from_linked_conn) {
|
|
|
|
if (! conn->linked_conn ||
|
|
|
|
(conn->linked_conn->writing_to_linked_conn &&
|
|
|
|
buf_datalen(conn->linked_conn->outbuf)))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/** Helper: Tell the main loop to begin reading bytes into <b>conn</b> from
|
|
|
|
* its linked connection, if it is not doing so already. Called by
|
|
|
|
* connection_start_reading and connection_start_writing as appropriate. */
|
|
|
|
static void
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_start_reading_from_linked_conn(connection_t *conn)
|
|
|
|
{
|
|
|
|
tor_assert(conn);
|
|
|
|
tor_assert(conn->linked == 1);
|
|
|
|
|
|
|
|
if (!conn->active_on_link) {
|
|
|
|
conn->active_on_link = 1;
|
|
|
|
smartlist_add(active_linked_connection_lst, conn);
|
|
|
|
if (!called_loop_once) {
|
|
|
|
/* This is the first event on the list; we won't be in LOOP_ONCE mode,
|
|
|
|
* so we need to make sure that the event_loop() actually exits at the
|
|
|
|
* end of its run through the current connections and
|
2007-04-25 09:20:04 +02:00
|
|
|
* lets us activate read events for linked connections. */
|
2007-04-21 19:26:12 +02:00
|
|
|
struct timeval tv = { 0, 0 };
|
|
|
|
event_loopexit(&tv);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
tor_assert(smartlist_isin(active_linked_connection_lst, conn));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/** Tell the main loop to stop reading bytes into <b>conn</b> from its linked
|
|
|
|
* connection, if is currently doing so. Called by connection_stop_reading,
|
|
|
|
* connection_stop_writing, and connection_read. */
|
2007-04-21 19:26:12 +02:00
|
|
|
void
|
|
|
|
connection_stop_reading_from_linked_conn(connection_t *conn)
|
|
|
|
{
|
|
|
|
tor_assert(conn);
|
|
|
|
tor_assert(conn->linked == 1);
|
|
|
|
|
|
|
|
if (conn->active_on_link) {
|
|
|
|
conn->active_on_link = 0;
|
2008-02-06 06:31:21 +01:00
|
|
|
/* FFFF We could keep an index here so we can smartlist_del
|
|
|
|
* cleanly. On the other hand, this doesn't show up on profiles,
|
|
|
|
* so let's leave it alone for now. */
|
2007-04-21 19:26:12 +02:00
|
|
|
smartlist_remove(active_linked_connection_lst, conn);
|
|
|
|
} else {
|
|
|
|
tor_assert(!smartlist_isin(active_linked_connection_lst, conn));
|
|
|
|
}
|
2002-07-18 08:37:58 +02:00
|
|
|
}
|
|
|
|
|
2007-04-25 09:20:04 +02:00
|
|
|
/** Close all connections that have been scheduled to get closed. */
|
2005-01-12 07:42:32 +01:00
|
|
|
static void
|
|
|
|
close_closeable_connections(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < smartlist_len(closeable_connection_lst); ) {
|
|
|
|
connection_t *conn = smartlist_get(closeable_connection_lst, i);
|
2006-07-27 07:03:57 +02:00
|
|
|
if (conn->conn_array_index < 0) {
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_unlink(conn); /* blow it away right now */
|
2005-01-30 22:47:47 +01:00
|
|
|
} else {
|
2006-07-27 07:03:57 +02:00
|
|
|
if (!conn_close_if_marked(conn->conn_array_index))
|
2005-01-30 22:47:47 +01:00
|
|
|
++i;
|
|
|
|
}
|
2005-01-12 07:42:32 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Libevent callback: this gets invoked when (connection_t*)<b>conn</b> has
|
|
|
|
* some data to read. */
|
2005-01-12 07:42:32 +01:00
|
|
|
static void
|
|
|
|
conn_read_callback(int fd, short event, void *_conn)
|
|
|
|
{
|
|
|
|
connection_t *conn = _conn;
|
2006-06-05 00:42:13 +02:00
|
|
|
(void)fd;
|
|
|
|
(void)event;
|
2005-01-12 07:42:32 +01:00
|
|
|
|
2006-02-13 10:37:53 +01:00
|
|
|
log_debug(LD_NET,"socket %d wants to read.",conn->s);
|
2005-01-12 07:42:32 +01:00
|
|
|
|
|
|
|
assert_connection_ok(conn, time(NULL));
|
|
|
|
|
|
|
|
if (connection_handle_read(conn) < 0) {
|
|
|
|
if (!conn->marked_for_close) {
|
|
|
|
#ifndef MS_WINDOWS
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG,"Unhandled error on read for %s connection "
|
2006-02-13 10:37:53 +01:00
|
|
|
"(fd %d); removing",
|
|
|
|
conn_type_to_string(conn->type), conn->s);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2005-01-12 07:42:32 +01:00
|
|
|
#endif
|
2005-03-02 04:13:05 +01:00
|
|
|
if (CONN_IS_EDGE(conn))
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end_errno(TO_EDGE_CONN(conn));
|
2005-01-12 07:42:32 +01:00
|
|
|
connection_mark_for_close(conn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert_connection_ok(conn, time(NULL));
|
|
|
|
|
|
|
|
if (smartlist_len(closeable_connection_lst))
|
|
|
|
close_closeable_connections();
|
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Libevent callback: this gets invoked when (connection_t*)<b>conn</b> has
|
|
|
|
* some data to write. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
conn_write_callback(int fd, short events, void *_conn)
|
2005-01-12 07:42:32 +01:00
|
|
|
{
|
|
|
|
connection_t *conn = _conn;
|
2006-06-05 00:42:13 +02:00
|
|
|
(void)fd;
|
|
|
|
(void)events;
|
2005-01-12 07:42:32 +01:00
|
|
|
|
2005-10-25 10:20:10 +02:00
|
|
|
LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "socket %d wants to write.",conn->s));
|
2005-01-12 07:42:32 +01:00
|
|
|
|
|
|
|
assert_connection_ok(conn, time(NULL));
|
|
|
|
|
2006-12-29 06:06:47 +01:00
|
|
|
if (connection_handle_write(conn, 0) < 0) {
|
2005-01-12 07:42:32 +01:00
|
|
|
if (!conn->marked_for_close) {
|
|
|
|
/* this connection is broken. remove it. */
|
2005-12-14 21:40:40 +01:00
|
|
|
log_fn(LOG_WARN,LD_BUG,
|
2007-05-13 11:25:06 +02:00
|
|
|
"unhandled error on write for %s connection (fd %d); removing",
|
|
|
|
conn_type_to_string(conn->type), conn->s);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2006-07-26 21:07:37 +02:00
|
|
|
if (CONN_IS_EDGE(conn)) {
|
|
|
|
/* otherwise we cry wolf about duplicate close */
|
2006-10-20 19:54:48 +02:00
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
|
|
|
if (!edge_conn->end_reason)
|
|
|
|
edge_conn->end_reason = END_STREAM_REASON_INTERNAL;
|
2006-07-26 21:07:37 +02:00
|
|
|
conn->edge_has_sent_end = 1;
|
|
|
|
}
|
2008-02-21 16:39:26 +01:00
|
|
|
connection_close_immediate(conn); /* So we don't try to flush. */
|
2005-01-12 07:42:32 +01:00
|
|
|
connection_mark_for_close(conn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert_connection_ok(conn, time(NULL));
|
|
|
|
|
|
|
|
if (smartlist_len(closeable_connection_lst))
|
|
|
|
close_closeable_connections();
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** If the connection at connection_array[i] is marked for close, then:
|
2004-05-05 23:32:43 +02:00
|
|
|
* - If it has data that it wants to flush, try to flush it.
|
|
|
|
* - If it _still_ has data to flush, and conn->hold_open_until_flushed is
|
|
|
|
* true, then leave the connection open and return.
|
|
|
|
* - Otherwise, remove the connection from connection_array and from
|
|
|
|
* all other lists, close it, and free it.
|
2005-01-12 07:42:32 +01:00
|
|
|
* Returns 1 if the connection was closed, 0 otherwise.
|
2004-05-05 23:32:43 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
conn_close_if_marked(int i)
|
|
|
|
{
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_t *conn;
|
2004-03-03 09:46:18 +01:00
|
|
|
int retval;
|
2007-07-30 03:32:12 +02:00
|
|
|
time_t now;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-05-22 17:49:14 +02:00
|
|
|
conn = smartlist_get(connection_array, i);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!conn->marked_for_close)
|
2005-01-12 07:42:32 +01:00
|
|
|
return 0; /* nothing to see here, move along */
|
2007-07-30 03:32:12 +02:00
|
|
|
now = time(NULL);
|
|
|
|
assert_connection_ok(conn, now);
|
2004-12-25 07:43:40 +01:00
|
|
|
assert_all_pending_dns_resolves_ok();
|
2004-03-03 09:46:18 +01:00
|
|
|
|
2006-02-13 10:37:53 +01:00
|
|
|
log_debug(LD_NET,"Cleaning up connection (fd %d).",conn->s);
|
2007-04-21 19:26:12 +02:00
|
|
|
if ((conn->s >= 0 || conn->linked_conn) && connection_wants_to_flush(conn)) {
|
2005-10-29 20:19:37 +02:00
|
|
|
/* s == -1 means it's an incomplete edge connection, or that the socket
|
2004-03-03 09:46:18 +01:00
|
|
|
* has already been closed as unflushable. */
|
2008-02-24 23:10:08 +01:00
|
|
|
ssize_t sz = connection_bucket_write_limit(conn, now);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!conn->hold_open_until_flushed)
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_NET,
|
|
|
|
"Conn (addr %s, fd %d, type %s, state %d) marked, but wants "
|
|
|
|
"to flush %d bytes. (Marked at %s:%d)",
|
2006-03-19 04:55:48 +01:00
|
|
|
escaped_safe_str(conn->address),
|
|
|
|
conn->s, conn_type_to_string(conn->type), conn->state,
|
2006-02-13 10:37:53 +01:00
|
|
|
(int)conn->outbuf_flushlen,
|
|
|
|
conn->marked_for_close_file, conn->marked_for_close);
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked_conn) {
|
|
|
|
retval = move_buf_to_buf(conn->linked_conn->inbuf, conn->outbuf,
|
|
|
|
&conn->outbuf_flushlen);
|
|
|
|
if (retval >= 0) {
|
|
|
|
/* The linked conn will notice that it has data when it notices that
|
|
|
|
* we're gone. */
|
|
|
|
connection_start_reading_from_linked_conn(conn->linked_conn);
|
|
|
|
}
|
2008-02-06 06:31:21 +01:00
|
|
|
log_debug(LD_GENERAL, "Flushed last %d bytes from a linked conn; "
|
2007-04-21 19:26:12 +02:00
|
|
|
"%d left; flushlen %d; wants-to-flush==%d", retval,
|
|
|
|
(int)buf_datalen(conn->outbuf),
|
|
|
|
(int)conn->outbuf_flushlen,
|
2008-02-06 06:31:21 +01:00
|
|
|
connection_wants_to_flush(conn));
|
2007-04-21 19:26:12 +02:00
|
|
|
} else if (connection_speaks_cells(conn)) {
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->state == OR_CONN_STATE_OPEN) {
|
2006-07-26 21:07:26 +02:00
|
|
|
retval = flush_buf_tls(TO_OR_CONN(conn)->tls, conn->outbuf, sz,
|
2005-12-14 21:40:40 +01:00
|
|
|
&conn->outbuf_flushlen);
|
2004-03-03 09:46:18 +01:00
|
|
|
} else
|
2004-03-06 02:43:37 +01:00
|
|
|
retval = -1; /* never flush non-open broken tls connections */
|
2004-03-03 09:46:18 +01:00
|
|
|
} else {
|
2005-10-29 20:19:37 +02:00
|
|
|
retval = flush_buf(conn->s, conn->outbuf, sz, &conn->outbuf_flushlen);
|
2004-03-03 09:46:18 +01:00
|
|
|
}
|
2005-10-29 20:19:37 +02:00
|
|
|
if (retval >= 0 && /* Technically, we could survive things like
|
|
|
|
TLS_WANT_WRITE here. But don't bother for now. */
|
|
|
|
conn->hold_open_until_flushed && connection_wants_to_flush(conn)) {
|
2008-02-21 06:51:09 +01:00
|
|
|
if (retval > 0) {
|
2006-03-09 07:34:33 +01:00
|
|
|
LOG_FN_CONN(conn, (LOG_INFO,LD_NET,
|
|
|
|
"Holding conn (fd %d) open for more flushing.",
|
|
|
|
conn->s));
|
2008-02-21 06:51:09 +01:00
|
|
|
conn->timestamp_lastwritten = now; /* reset so we can flush more */
|
|
|
|
}
|
2005-01-12 07:42:32 +01:00
|
|
|
return 0;
|
Integrated onion proxy into or/
The 'or' process can now be told (by the global_role variable) what
roles this server should play -- connect to all ORs, listen for ORs,
listen for OPs, listen for APs, or any combination.
* everything in /src/op/ is now obsolete.
* connection_ap.c now handles all interactions with application proxies
* "port" is now or_port, op_port, ap_port. But routers are still always
referenced (say, in conn_get_by_addr_port()) by addr / or_port. We
should make routers.c actually read these new ports (currently I've
kludged it so op_port = or_port+10, ap_port=or_port+20)
* circuits currently know if they're at the beginning of the path because
circ->cpath is set. They use this instead for crypts (both ways),
if it's set.
* I still obey the "send a 0 back to the AP when you're ready" protocol,
but I think we should phase it out. I can simply not read from the AP
socket until I'm ready.
I need to do a lot of cleanup work here, but the code appears to work, so
now's a good time for a checkin.
svn:r22
2002-07-02 11:36:58 +02:00
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_wants_to_flush(conn)) {
|
2005-10-17 02:35:53 +02:00
|
|
|
int severity;
|
|
|
|
if (conn->type == CONN_TYPE_EXIT ||
|
2006-01-23 10:23:04 +01:00
|
|
|
(conn->type == CONN_TYPE_OR && server_mode(get_options())) ||
|
2005-10-17 02:35:53 +02:00
|
|
|
(conn->type == CONN_TYPE_DIR && conn->purpose == DIR_PURPOSE_SERVER))
|
|
|
|
severity = LOG_INFO;
|
|
|
|
else
|
|
|
|
severity = LOG_NOTICE;
|
2007-03-04 19:58:38 +01:00
|
|
|
/* XXXX Maybe allow this to happen a certain amount per hour; it usually
|
|
|
|
* is meaningless. */
|
|
|
|
log_fn(severity, LD_NET, "We stalled too much while trying to write %d "
|
2007-03-15 23:47:21 +01:00
|
|
|
"bytes to address %s. If this happens a lot, either "
|
2007-03-04 19:58:38 +01:00
|
|
|
"something is wrong with your network connection, or "
|
|
|
|
"something is wrong with theirs. "
|
|
|
|
"(fd %d, type %s, state %d, marked at %s:%d).",
|
2006-01-07 02:43:09 +01:00
|
|
|
(int)buf_datalen(conn->outbuf),
|
2006-03-19 04:55:48 +01:00
|
|
|
escaped_safe_str(conn->address), conn->s,
|
|
|
|
conn_type_to_string(conn->type), conn->state,
|
2006-01-07 02:43:09 +01:00
|
|
|
conn->marked_for_close_file,
|
2004-03-12 09:16:48 +01:00
|
|
|
conn->marked_for_close);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
}
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_unlink(conn); /* unlink, remove, free */
|
2005-01-12 07:42:32 +01:00
|
|
|
return 1;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2005-01-07 16:57:57 +01:00
|
|
|
/** We've just tried every dirserver we know about, and none of
|
|
|
|
* them were reachable. Assume the network is down. Change state
|
|
|
|
* so next time an application connection arrives we'll delay it
|
|
|
|
* and try another directory fetch. Kill off all the circuit_wait
|
|
|
|
* streams that are waiting now, since they will all timeout anyway.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
directory_all_unreachable(time_t now)
|
|
|
|
{
|
2005-01-07 16:57:57 +01:00
|
|
|
connection_t *conn;
|
2006-06-05 00:42:13 +02:00
|
|
|
(void)now;
|
2005-01-07 16:57:57 +01:00
|
|
|
|
2005-01-10 06:10:22 +01:00
|
|
|
stats_n_seconds_working=0; /* reset it */
|
2005-01-07 16:57:57 +01:00
|
|
|
|
|
|
|
while ((conn = connection_get_by_type_state(CONN_TYPE_AP,
|
|
|
|
AP_CONN_STATE_CIRCUIT_WAIT))) {
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
2006-02-13 10:37:53 +01:00
|
|
|
log_notice(LD_NET,
|
|
|
|
"Is your network connection down? "
|
|
|
|
"Failing connection to '%s:%d'.",
|
2006-07-26 21:07:26 +02:00
|
|
|
safe_str(edge_conn->socks_request->address),
|
|
|
|
edge_conn->socks_request->port);
|
2006-07-26 21:07:37 +02:00
|
|
|
connection_mark_unattached_ap(edge_conn,
|
|
|
|
END_STREAM_REASON_NET_UNREACHABLE);
|
2005-01-07 16:57:57 +01:00
|
|
|
}
|
2006-10-23 12:16:43 +02:00
|
|
|
control_event_general_status(LOG_ERR, "DIR_ALL_UNREACHABLE");
|
2005-01-07 16:57:57 +01:00
|
|
|
}
|
|
|
|
|
2005-09-30 01:26:42 +02:00
|
|
|
/** This function is called whenever we successfully pull down some new
|
|
|
|
* network statuses or server descriptors. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2005-09-15 07:19:38 +02:00
|
|
|
directory_info_has_arrived(time_t now, int from_cache)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2004-04-01 00:02:13 +02:00
|
|
|
|
2005-09-15 07:19:38 +02:00
|
|
|
if (!router_have_minimum_dir_info()) {
|
2008-06-09 07:17:52 +02:00
|
|
|
int quiet = directory_too_idle_to_fetch_descriptors(options, now);
|
2008-06-09 07:13:33 +02:00
|
|
|
log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
|
2005-12-14 21:40:40 +01:00
|
|
|
"I learned some more directory information, but not enough to "
|
2007-11-02 05:18:28 +01:00
|
|
|
"build a circuit: %s", get_dir_info_status_string());
|
2006-02-05 04:42:34 +01:00
|
|
|
update_router_descriptor_downloads(now);
|
2005-09-15 07:19:38 +02:00
|
|
|
return;
|
2007-05-18 23:19:19 +02:00
|
|
|
} else {
|
2007-11-26 03:18:57 +01:00
|
|
|
/* if we have enough dir info, then update our guard status with
|
|
|
|
* whatever we just learned. */
|
|
|
|
entry_guards_compute_status();
|
2007-05-18 23:19:19 +02:00
|
|
|
/* Don't even bother trying to get extrainfo until the rest of our
|
|
|
|
* directory info is up-to-date */
|
|
|
|
if (options->DownloadExtraInfo)
|
|
|
|
update_extrainfo_downloads(now);
|
2005-09-15 07:19:38 +02:00
|
|
|
}
|
2005-08-24 04:31:02 +02:00
|
|
|
|
2006-07-22 07:29:31 +02:00
|
|
|
if (server_mode(options) && !we_are_hibernating() && !from_cache &&
|
2006-07-22 09:19:11 +02:00
|
|
|
(has_completed_circuit || !any_predicted_circuits(now)))
|
2006-09-15 07:53:00 +02:00
|
|
|
consider_testing_reachability(1, 1);
|
2004-04-01 00:02:13 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Perform regular maintenance tasks for a single connection. This
|
2005-02-27 10:47:01 +01:00
|
|
|
* function gets run once per second per connection by run_scheduled_events.
|
2003-10-09 20:45:14 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
run_connection_housekeeping(int i, time_t now)
|
|
|
|
{
|
2003-10-09 20:45:14 +02:00
|
|
|
cell_t cell;
|
2007-05-22 17:49:14 +02:00
|
|
|
connection_t *conn = smartlist_get(connection_array, i);
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2006-07-26 21:07:26 +02:00
|
|
|
or_connection_t *or_conn;
|
2003-12-05 10:51:49 +01:00
|
|
|
|
2006-07-28 17:11:20 +02:00
|
|
|
if (conn->outbuf && !buf_datalen(conn->outbuf) && conn->type == CONN_TYPE_OR)
|
|
|
|
TO_OR_CONN(conn)->timestamp_lastempty = now;
|
2005-03-22 21:25:51 +01:00
|
|
|
|
2006-01-07 04:56:56 +01:00
|
|
|
if (conn->marked_for_close) {
|
|
|
|
/* nothing to do here */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-08-28 21:02:57 +02:00
|
|
|
/* Expire any directory connections that haven't been active (sent
|
|
|
|
* if a server or received if a client) for 5 min */
|
2006-08-28 21:00:17 +02:00
|
|
|
if (conn->type == CONN_TYPE_DIR &&
|
|
|
|
((DIR_CONN_IS_SERVER(conn) &&
|
|
|
|
conn->timestamp_lastwritten + DIR_CONN_MAX_STALL < now) ||
|
|
|
|
(!DIR_CONN_IS_SERVER(conn) &&
|
|
|
|
conn->timestamp_lastread + DIR_CONN_MAX_STALL < now))) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_DIR,"Expiring wedged directory conn (fd %d, purpose %d)",
|
|
|
|
conn->s, conn->purpose);
|
2005-10-05 00:34:09 +02:00
|
|
|
/* This check is temporary; it's to let us know whether we should consider
|
|
|
|
* parsing partial serverdesc responses. */
|
2005-10-05 02:22:56 +02:00
|
|
|
if (conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC &&
|
2005-10-14 04:26:13 +02:00
|
|
|
buf_datalen(conn->inbuf)>=1024) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_DIR,"Trying to extract information from wedged server desc "
|
|
|
|
"download.");
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_dir_reached_eof(TO_DIR_CONN(conn));
|
2005-11-04 06:00:12 +01:00
|
|
|
} else {
|
|
|
|
connection_mark_for_close(conn);
|
2005-10-05 00:34:09 +02:00
|
|
|
}
|
2004-04-18 08:35:31 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-11-19 07:57:44 +01:00
|
|
|
if (!connection_speaks_cells(conn))
|
|
|
|
return; /* we're all done here, the rest is just for OR conns */
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
or_conn = TO_OR_CONN(conn);
|
|
|
|
|
|
|
|
if (!conn->or_is_obsolete) {
|
2006-01-07 04:56:56 +01:00
|
|
|
if (conn->timestamp_created + TIME_BEFORE_OR_CONN_IS_OBSOLETE < now) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_OR,
|
|
|
|
"Marking OR conn to %s:%d obsolete (fd %d, %d secs old).",
|
|
|
|
conn->address, conn->port, conn->s,
|
|
|
|
(int)(now - conn->timestamp_created));
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->or_is_obsolete = 1;
|
2006-01-11 23:34:07 +01:00
|
|
|
} else {
|
2006-07-26 21:07:26 +02:00
|
|
|
or_connection_t *best =
|
|
|
|
connection_or_get_by_identity_digest(or_conn->identity_digest);
|
|
|
|
if (best && best != or_conn &&
|
2006-02-14 05:23:05 +01:00
|
|
|
(conn->state == OR_CONN_STATE_OPEN ||
|
2006-03-12 23:48:18 +01:00
|
|
|
now > conn->timestamp_created + TLS_HANDSHAKE_TIMEOUT)) {
|
2006-02-14 18:30:04 +01:00
|
|
|
/* We only mark as obsolete connections that already are in
|
|
|
|
* OR_CONN_STATE_OPEN, i.e. that have finished their TLS handshaking.
|
2006-03-12 23:48:18 +01:00
|
|
|
* This is necessary because authorities judge whether a router is
|
2006-02-14 18:30:04 +01:00
|
|
|
* reachable based on whether they were able to TLS handshake with it
|
|
|
|
* recently. Without this check we would expire connections too
|
|
|
|
* early for router->last_reachable to be updated.
|
|
|
|
*/
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_OR,
|
|
|
|
"Marking duplicate conn to %s:%d obsolete "
|
|
|
|
"(fd %d, %d secs old).",
|
|
|
|
conn->address, conn->port, conn->s,
|
|
|
|
(int)(now - conn->timestamp_created));
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->or_is_obsolete = 1;
|
2006-01-11 23:34:07 +01:00
|
|
|
}
|
2006-01-07 04:56:56 +01:00
|
|
|
}
|
2005-11-19 07:57:44 +01:00
|
|
|
}
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->or_is_obsolete && !or_conn->n_circuits) {
|
2005-11-19 07:57:44 +01:00
|
|
|
/* no unmarked circs -- mark it now */
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_OR,
|
|
|
|
"Expiring non-used OR connection to fd %d (%s:%d) [Obsolete].",
|
2006-07-26 21:07:26 +02:00
|
|
|
conn->s, conn->address, conn->port);
|
2008-09-09 08:25:39 +02:00
|
|
|
if (conn->state == OR_CONN_STATE_CONNECTING)
|
|
|
|
connection_or_connect_failed(TO_OR_CONN(conn),
|
|
|
|
END_OR_CONN_REASON_TIMEOUT,
|
|
|
|
"Tor gave up on the connection");
|
2005-11-19 07:57:44 +01:00
|
|
|
connection_mark_for_close(conn);
|
|
|
|
conn->hold_open_until_flushed = 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-05-05 23:32:43 +02:00
|
|
|
/* If we haven't written to an OR connection for a while, then either nuke
|
|
|
|
the connection or send a keepalive, depending. */
|
2005-11-19 07:57:44 +01:00
|
|
|
if (now >= conn->timestamp_lastwritten + options->KeepalivePeriod) {
|
2006-07-26 21:07:26 +02:00
|
|
|
routerinfo_t *router = router_get_by_digest(or_conn->identity_digest);
|
2007-10-27 00:50:40 +02:00
|
|
|
int maxCircuitlessPeriod = options->MaxCircuitDirtiness*3/2;
|
2005-03-22 07:21:35 +01:00
|
|
|
if (!connection_state_is_open(conn)) {
|
2007-10-27 00:50:40 +02:00
|
|
|
/* We never managed to actually get this connection open and happy. */
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_OR,"Expiring non-open OR connection to fd %d (%s:%d).",
|
|
|
|
conn->s,conn->address, conn->port);
|
2004-05-12 23:12:33 +02:00
|
|
|
connection_mark_for_close(conn);
|
2004-03-08 02:19:57 +01:00
|
|
|
conn->hold_open_until_flushed = 1;
|
2006-07-26 21:07:26 +02:00
|
|
|
} else if (we_are_hibernating() && !or_conn->n_circuits &&
|
2005-03-22 07:21:35 +01:00
|
|
|
!buf_datalen(conn->outbuf)) {
|
2007-10-27 00:50:40 +02:00
|
|
|
/* We're hibernating, there's no circuits, and nothing to flush.*/
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) "
|
|
|
|
"[Hibernating or exiting].",
|
|
|
|
conn->s,conn->address, conn->port);
|
2005-03-22 07:21:35 +01:00
|
|
|
connection_mark_for_close(conn);
|
|
|
|
conn->hold_open_until_flushed = 1;
|
2006-07-26 21:07:26 +02:00
|
|
|
} else if (!clique_mode(options) && !or_conn->n_circuits &&
|
2007-11-08 17:19:07 +01:00
|
|
|
now >= or_conn->timestamp_last_added_nonpadding +
|
|
|
|
maxCircuitlessPeriod &&
|
2005-11-19 07:57:44 +01:00
|
|
|
(!router || !server_mode(options) ||
|
|
|
|
!router_is_clique_mode(router))) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) "
|
|
|
|
"[Not in clique mode].",
|
|
|
|
conn->s,conn->address, conn->port);
|
2005-03-22 07:21:35 +01:00
|
|
|
connection_mark_for_close(conn);
|
|
|
|
conn->hold_open_until_flushed = 1;
|
2005-03-22 21:25:51 +01:00
|
|
|
} else if (
|
2006-07-28 17:11:20 +02:00
|
|
|
now >= or_conn->timestamp_lastempty + options->KeepalivePeriod*10 &&
|
2005-03-22 21:25:51 +01:00
|
|
|
now >= conn->timestamp_lastwritten + options->KeepalivePeriod*10) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,
|
|
|
|
"Expiring stuck OR connection to fd %d (%s:%d). (%d bytes to "
|
|
|
|
"flush; %d seconds since last write)",
|
2005-04-25 19:24:16 +02:00
|
|
|
conn->s, conn->address, conn->port,
|
2005-03-23 00:27:29 +01:00
|
|
|
(int)buf_datalen(conn->outbuf),
|
2005-03-22 21:25:51 +01:00
|
|
|
(int)(now-conn->timestamp_lastwritten));
|
2005-03-22 07:21:35 +01:00
|
|
|
connection_mark_for_close(conn);
|
2005-05-24 00:20:54 +02:00
|
|
|
} else if (!buf_datalen(conn->outbuf)) {
|
2004-07-18 23:47:04 +02:00
|
|
|
/* either in clique mode, or we've got a circuit. send a padding cell. */
|
2005-10-25 10:20:10 +02:00
|
|
|
log_fn(LOG_DEBUG,LD_OR,"Sending keepalive to (%s:%d)",
|
2003-10-09 20:45:14 +02:00
|
|
|
conn->address, conn->port);
|
|
|
|
memset(&cell,0,sizeof(cell_t));
|
|
|
|
cell.command = CELL_PADDING;
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_or_write_cell_to_buf(&cell, or_conn);
|
2003-10-09 20:45:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-06 06:31:21 +01:00
|
|
|
/** Honor a NEWNYM request: make future requests unlinkability to past
|
|
|
|
* requests. */
|
|
|
|
static void
|
|
|
|
signewnym_impl(time_t now)
|
|
|
|
{
|
|
|
|
circuit_expire_all_dirty_circs();
|
|
|
|
addressmap_clear_transient();
|
|
|
|
time_of_last_signewnym = now;
|
|
|
|
signewnym_is_pending = 0;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Perform regular maintenance tasks. This function gets run once per
|
2003-10-09 20:45:14 +02:00
|
|
|
* second by prepare_for_poll.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
run_scheduled_events(time_t now)
|
|
|
|
{
|
2008-01-18 06:00:35 +01:00
|
|
|
static time_t time_to_fetch_directory = 0;
|
|
|
|
static time_t time_to_fetch_running_routers = 0;
|
2007-09-11 22:17:22 +02:00
|
|
|
static time_t last_rotated_x509_certificate = 0;
|
|
|
|
static time_t time_to_check_v3_certificate = 0;
|
2004-10-24 03:22:40 +02:00
|
|
|
static time_t time_to_check_listeners = 0;
|
2004-11-13 17:53:48 +01:00
|
|
|
static time_t time_to_check_descriptor = 0;
|
2005-10-13 00:41:16 +02:00
|
|
|
static time_t time_to_check_ipaddress = 0;
|
2007-04-11 15:18:25 +02:00
|
|
|
static time_t time_to_shrink_memory = 0;
|
2005-09-22 08:34:29 +02:00
|
|
|
static time_t time_to_try_getting_descriptors = 0;
|
|
|
|
static time_t time_to_reset_descriptor_failures = 0;
|
2005-10-07 00:22:22 +02:00
|
|
|
static time_t time_to_add_entropy = 0;
|
2007-04-30 19:46:13 +02:00
|
|
|
static time_t time_to_write_hs_statistics = 0;
|
2007-12-19 05:58:58 +01:00
|
|
|
static time_t time_to_write_bridge_status_file = 0;
|
2007-08-16 21:32:29 +02:00
|
|
|
static time_t time_to_downrate_stability = 0;
|
2007-08-20 17:59:31 +02:00
|
|
|
static time_t time_to_save_stability = 0;
|
2007-12-01 23:38:58 +01:00
|
|
|
static time_t time_to_clean_caches = 0;
|
2008-01-18 05:58:40 +01:00
|
|
|
static time_t time_to_recheck_bandwidth = 0;
|
2008-01-30 23:52:46 +01:00
|
|
|
static time_t time_to_check_for_expired_networkstatus = 0;
|
2008-05-29 04:29:35 +02:00
|
|
|
static time_t time_to_dump_geoip_stats = 0;
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2003-10-09 20:45:14 +02:00
|
|
|
int i;
|
2005-12-15 21:44:15 +01:00
|
|
|
int have_dir_info;
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
|
2004-07-21 01:31:00 +02:00
|
|
|
/** 0. See if we've been asked to shut down and our timeout has
|
2004-10-31 21:28:41 +01:00
|
|
|
* expired; or if our bandwidth limits are exhausted and we
|
|
|
|
* should hibernate; or if it's time to wake up from hibernation.
|
2004-07-21 01:31:00 +02:00
|
|
|
*/
|
2004-10-31 21:28:41 +01:00
|
|
|
consider_hibernation(now);
|
2004-07-21 01:31:00 +02:00
|
|
|
|
2007-02-22 07:21:19 +01:00
|
|
|
/* 0b. If we've deferred a signewnym, make sure it gets handled
|
2008-01-18 06:00:35 +01:00
|
|
|
* eventually. */
|
2007-02-22 07:21:19 +01:00
|
|
|
if (signewnym_is_pending &&
|
2007-02-24 22:21:38 +01:00
|
|
|
time_of_last_signewnym + MAX_SIGNEWNYM_RATE <= now) {
|
|
|
|
log(LOG_INFO, LD_CONTROL, "Honoring delayed NEWNYM request");
|
2008-02-06 06:31:21 +01:00
|
|
|
signewnym_impl(now);
|
2007-02-22 07:21:19 +01:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** 1a. Every MIN_ONION_KEY_LIFETIME seconds, rotate the onion keys,
|
2004-04-25 00:17:50 +02:00
|
|
|
* shut down and restart all cpuworkers, and update the directory if
|
|
|
|
* necessary.
|
|
|
|
*/
|
2004-11-06 06:18:11 +01:00
|
|
|
if (server_mode(options) &&
|
|
|
|
get_onion_key_set_at()+MIN_ONION_KEY_LIFETIME < now) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_GENERAL,"Rotating onion key.");
|
2004-04-25 00:17:50 +02:00
|
|
|
rotate_onion_key();
|
|
|
|
cpuworkers_rotate();
|
2004-11-13 17:53:48 +01:00
|
|
|
if (router_rebuild_descriptor(1)<0) {
|
2006-07-17 08:54:28 +02:00
|
|
|
log_info(LD_CONFIG, "Couldn't rebuild router descriptor");
|
2004-04-25 00:17:50 +02:00
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (advertised_server_mode())
|
2004-11-13 17:53:48 +01:00
|
|
|
router_upload_dir_desc_to_dirservers(0);
|
2004-04-25 00:17:50 +02:00
|
|
|
}
|
|
|
|
|
2005-09-22 08:34:29 +02:00
|
|
|
if (time_to_try_getting_descriptors < now) {
|
|
|
|
update_router_descriptor_downloads(now);
|
2007-05-18 23:19:19 +02:00
|
|
|
update_extrainfo_downloads(now);
|
2007-07-18 12:06:03 +02:00
|
|
|
if (options->UseBridges)
|
|
|
|
fetch_bridge_descriptors(now);
|
2007-10-18 21:51:14 +02:00
|
|
|
if (router_have_minimum_dir_info())
|
|
|
|
time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL;
|
|
|
|
else
|
|
|
|
time_to_try_getting_descriptors = now + GREEDY_DESCRIPTOR_RETRY_INTERVAL;
|
2005-09-22 08:34:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (time_to_reset_descriptor_failures < now) {
|
|
|
|
router_reset_descriptor_download_failures();
|
2005-12-14 21:40:40 +01:00
|
|
|
time_to_reset_descriptor_failures =
|
|
|
|
now + DESCRIPTOR_FAILURE_RESET_INTERVAL;
|
2005-09-22 08:34:29 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */
|
2007-09-11 22:17:22 +02:00
|
|
|
if (!last_rotated_x509_certificate)
|
|
|
|
last_rotated_x509_certificate = now;
|
|
|
|
if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_GENERAL,"Rotating tls context.");
|
2008-02-08 22:13:12 +01:00
|
|
|
if (tor_tls_context_new(get_identity_key(), MAX_SSL_KEY_LIFETIME) < 0) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_BUG, "Error reinitializing TLS context");
|
2008-01-18 06:00:35 +01:00
|
|
|
/* XXX is it a bug here, that we just keep going? -RD */
|
2004-04-25 00:17:50 +02:00
|
|
|
}
|
2007-09-11 22:17:22 +02:00
|
|
|
last_rotated_x509_certificate = now;
|
2008-01-18 06:00:35 +01:00
|
|
|
/* We also make sure to rotate the TLS connections themselves if they've
|
|
|
|
* been up for too long -- but that's done via or_is_obsolete in
|
|
|
|
* connection_run_housekeeping() above. */
|
2004-04-25 00:17:50 +02:00
|
|
|
}
|
|
|
|
|
2005-10-07 00:22:22 +02:00
|
|
|
if (time_to_add_entropy < now) {
|
2008-01-18 06:00:35 +01:00
|
|
|
if (time_to_add_entropy) {
|
|
|
|
/* We already seeded once, so don't die on failure. */
|
2008-03-21 20:18:57 +01:00
|
|
|
crypto_seed_rng(0);
|
2008-01-18 06:00:35 +01:00
|
|
|
}
|
|
|
|
/** How often do we add more entropy to OpenSSL's RNG pool? */
|
|
|
|
#define ENTROPY_INTERVAL (60*60)
|
2005-10-07 00:22:22 +02:00
|
|
|
time_to_add_entropy = now + ENTROPY_INTERVAL;
|
|
|
|
}
|
|
|
|
|
2004-11-03 00:47:32 +01:00
|
|
|
/** 1c. If we have to change the accounting interval or record
|
|
|
|
* bandwidth used in this accounting interval, do so. */
|
2004-11-15 05:01:31 +01:00
|
|
|
if (accounting_is_enabled(options))
|
2004-11-06 07:56:28 +01:00
|
|
|
accounting_run_housekeeping(now);
|
2004-11-03 00:47:32 +01:00
|
|
|
|
2007-06-09 09:05:19 +02:00
|
|
|
if (now % 10 == 0 && (authdir_mode_tests_reachability(options)) &&
|
2007-05-02 23:56:32 +02:00
|
|
|
!we_are_hibernating()) {
|
2007-12-18 22:37:58 +01:00
|
|
|
/* try to determine reachability of the other Tor relays */
|
2007-08-17 03:29:58 +02:00
|
|
|
dirserv_test_reachability(now, 0);
|
2006-01-10 08:21:01 +01:00
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** 1d. Periodically, we discount older stability information so that new
|
|
|
|
* stability info counts more, and save the stability information to disk as
|
|
|
|
* appropriate. */
|
2007-08-16 21:32:29 +02:00
|
|
|
if (time_to_downrate_stability < now)
|
|
|
|
time_to_downrate_stability = rep_hist_downrate_old_runs(now);
|
2007-08-20 17:59:31 +02:00
|
|
|
if (authdir_mode_tests_reachability(options)) {
|
|
|
|
if (time_to_save_stability < now) {
|
2008-01-18 06:00:35 +01:00
|
|
|
if (time_to_save_stability && rep_hist_record_mtbf_data()<0) {
|
2007-08-20 18:34:17 +02:00
|
|
|
log_warn(LD_GENERAL, "Couldn't store mtbf data.");
|
2007-08-20 17:59:31 +02:00
|
|
|
}
|
2008-01-18 06:00:35 +01:00
|
|
|
#define SAVE_STABILITY_INTERVAL (30*60)
|
2007-08-20 17:59:31 +02:00
|
|
|
time_to_save_stability = now + SAVE_STABILITY_INTERVAL;
|
|
|
|
}
|
|
|
|
}
|
2007-08-16 21:32:29 +02:00
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/* 1e. Periodicaly, if we're a v3 authority, we check whether our cert is
|
|
|
|
* close to expiring and warn the admin if it is. */
|
2007-09-11 22:17:22 +02:00
|
|
|
if (time_to_check_v3_certificate < now) {
|
|
|
|
v3_authority_check_key_expiry();
|
2008-01-18 06:00:35 +01:00
|
|
|
#define CHECK_V3_CERTIFICATE_INTERVAL (5*60)
|
2007-09-11 22:17:22 +02:00
|
|
|
time_to_check_v3_certificate = now + CHECK_V3_CERTIFICATE_INTERVAL;
|
|
|
|
}
|
|
|
|
|
2008-01-30 23:52:46 +01:00
|
|
|
/* 1f. Check whether our networkstatus has expired.
|
|
|
|
*/
|
|
|
|
if (time_to_check_for_expired_networkstatus < now) {
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *ns = networkstatus_get_latest_consensus();
|
2008-01-30 23:52:46 +01:00
|
|
|
/*XXXX020 this value needs to be the same as REASONABLY_LIVE_TIME in
|
|
|
|
* networkstatus_get_reasonably_live_consensus(), but that value is way
|
|
|
|
* way too high. Arma: is the bridge issue there resolved yet? -NM */
|
|
|
|
#define NS_EXPIRY_SLOP (24*60*60)
|
|
|
|
if (ns && ns->valid_until < now+NS_EXPIRY_SLOP &&
|
|
|
|
router_have_minimum_dir_info()) {
|
|
|
|
router_dir_info_changed();
|
|
|
|
}
|
|
|
|
#define CHECK_EXPIRED_NS_INTERVAL (2*60)
|
|
|
|
time_to_check_for_expired_networkstatus = now + CHECK_EXPIRED_NS_INTERVAL;
|
|
|
|
}
|
|
|
|
|
2008-05-29 04:29:35 +02:00
|
|
|
if (time_to_dump_geoip_stats < now) {
|
|
|
|
#define DUMP_GEOIP_STATS_INTERVAL (60*60);
|
2008-06-10 22:11:59 +02:00
|
|
|
if (time_to_dump_geoip_stats)
|
|
|
|
dump_geoip_stats();
|
2008-05-29 04:29:35 +02:00
|
|
|
time_to_dump_geoip_stats = now + DUMP_GEOIP_STATS_INTERVAL;
|
|
|
|
}
|
|
|
|
|
2004-11-15 10:05:54 +01:00
|
|
|
/** 2. Periodically, we consider getting a new directory, getting a
|
|
|
|
* new running-routers list, and/or force-uploading our descriptor
|
|
|
|
* (if we've passed our internal checks). */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (time_to_fetch_directory < now) {
|
2008-02-06 13:36:04 +01:00
|
|
|
/* Only caches actually need to fetch v1 directories now. */
|
2007-12-21 07:08:00 +01:00
|
|
|
if (directory_fetches_dir_info_early(options) &&
|
2008-02-06 13:36:04 +01:00
|
|
|
!authdir_mode_v1(options) && any_trusted_dir_is_v1_authority() &&
|
|
|
|
!should_delay_dir_fetches(options))
|
|
|
|
directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR,
|
|
|
|
ROUTER_PURPOSE_GENERAL, NULL, 1);
|
2007-02-16 21:39:37 +01:00
|
|
|
/** How often do we (as a cache) fetch a new V1 directory? */
|
2007-12-01 21:02:05 +01:00
|
|
|
#define V1_DIR_FETCH_PERIOD (12*60*60)
|
2006-04-10 22:16:46 +02:00
|
|
|
time_to_fetch_directory = now + V1_DIR_FETCH_PERIOD;
|
2004-11-14 22:46:40 +01:00
|
|
|
}
|
|
|
|
|
2005-09-14 23:09:25 +02:00
|
|
|
/* Caches need to fetch running_routers; directory clients don't. */
|
2008-02-06 13:36:04 +01:00
|
|
|
if (time_to_fetch_running_routers < now) {
|
|
|
|
if (directory_fetches_dir_info_early(options) &&
|
|
|
|
!authdir_mode_v1(options) && any_trusted_dir_is_v1_authority() &&
|
|
|
|
!should_delay_dir_fetches(options))
|
2007-07-22 02:16:48 +02:00
|
|
|
directory_get_from_dirserver(DIR_PURPOSE_FETCH_RUNNING_LIST,
|
|
|
|
ROUTER_PURPOSE_GENERAL, NULL, 1);
|
2007-02-16 21:39:37 +01:00
|
|
|
/** How often do we (as a cache) fetch a new V1 runningrouters document? */
|
2007-12-01 21:02:05 +01:00
|
|
|
#define V1_RUNNINGROUTERS_FETCH_PERIOD (12*60*60)
|
2006-04-10 22:16:46 +02:00
|
|
|
time_to_fetch_running_routers = now + V1_RUNNINGROUTERS_FETCH_PERIOD;
|
2007-12-01 23:38:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove old information from rephist and the rend cache. */
|
|
|
|
if (time_to_clean_caches < now) {
|
2006-10-06 11:04:11 +02:00
|
|
|
rep_history_clean(now - options->RephistTrackTime);
|
|
|
|
rend_cache_clean();
|
2007-11-02 03:25:28 +01:00
|
|
|
rend_cache_clean_v2_descs_as_dir();
|
2008-01-18 06:00:35 +01:00
|
|
|
#define CLEAN_CACHES_INTERVAL (30*60)
|
2007-12-01 23:38:58 +01:00
|
|
|
time_to_clean_caches = now + CLEAN_CACHES_INTERVAL;
|
2007-06-15 04:12:15 +02:00
|
|
|
}
|
2004-11-14 22:46:40 +01:00
|
|
|
|
2008-01-18 06:00:35 +01:00
|
|
|
/** How often do we check whether part of our router info has changed in a way
|
|
|
|
* that would require an upload? */
|
|
|
|
#define CHECK_DESCRIPTOR_INTERVAL (60)
|
|
|
|
/** How often do we (as a router) check whether our IP address has changed? */
|
|
|
|
#define CHECK_IPADDRESS_INTERVAL (15*60)
|
|
|
|
|
2004-11-14 05:55:02 +01:00
|
|
|
/* 2b. Once per minute, regenerate and upload the descriptor if the old
|
|
|
|
* one is inaccurate. */
|
2004-11-13 17:53:48 +01:00
|
|
|
if (time_to_check_descriptor < now) {
|
2006-10-08 08:33:02 +02:00
|
|
|
static int dirport_reachability_count = 0;
|
2004-11-13 17:53:48 +01:00
|
|
|
time_to_check_descriptor = now + CHECK_DESCRIPTOR_INTERVAL;
|
2005-08-22 05:10:53 +02:00
|
|
|
check_descriptor_bandwidth_changed(now);
|
2005-10-13 00:41:16 +02:00
|
|
|
if (time_to_check_ipaddress < now) {
|
|
|
|
time_to_check_ipaddress = now + CHECK_IPADDRESS_INTERVAL;
|
|
|
|
check_descriptor_ipaddress_changed(now);
|
|
|
|
}
|
2008-01-18 06:00:35 +01:00
|
|
|
/** If our router descriptor ever goes this long without being regenerated
|
|
|
|
* because something changed, we force an immediate regenerate-and-upload. */
|
|
|
|
#define FORCE_REGENERATE_DESCRIPTOR_INTERVAL (18*60*60)
|
2005-08-22 05:10:53 +02:00
|
|
|
mark_my_descriptor_dirty_if_older_than(
|
2005-12-14 21:40:40 +01:00
|
|
|
now - FORCE_REGENERATE_DESCRIPTOR_INTERVAL);
|
2006-06-05 00:42:13 +02:00
|
|
|
consider_publishable_server(0);
|
2005-03-26 06:54:50 +01:00
|
|
|
/* also, check religiously for reachability, if it's within the first
|
|
|
|
* 20 minutes of our uptime. */
|
2005-03-27 13:52:15 +02:00
|
|
|
if (server_mode(options) &&
|
2006-07-22 09:19:11 +02:00
|
|
|
(has_completed_circuit || !any_predicted_circuits(now)) &&
|
2006-10-08 08:33:02 +02:00
|
|
|
!we_are_hibernating()) {
|
2008-01-18 05:58:40 +01:00
|
|
|
if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
|
|
|
|
consider_testing_reachability(1, dirport_reachability_count==0);
|
|
|
|
if (++dirport_reachability_count > 5)
|
|
|
|
dirport_reachability_count = 0;
|
|
|
|
} else if (time_to_recheck_bandwidth < now) {
|
|
|
|
/* If we haven't checked for 12 hours and our bandwidth estimate is
|
|
|
|
* low, do another bandwidth test. This is especially important for
|
|
|
|
* bridges, since they might go long periods without much use. */
|
|
|
|
routerinfo_t *me = router_get_my_routerinfo();
|
|
|
|
if (time_to_recheck_bandwidth && me &&
|
|
|
|
me->bandwidthcapacity < me->bandwidthrate &&
|
|
|
|
me->bandwidthcapacity < 51200) {
|
|
|
|
reset_bandwidth_test();
|
|
|
|
}
|
|
|
|
#define BANDWIDTH_RECHECK_INTERVAL (12*60*60)
|
|
|
|
time_to_recheck_bandwidth = now + BANDWIDTH_RECHECK_INTERVAL;
|
|
|
|
}
|
2006-10-08 08:33:02 +02:00
|
|
|
}
|
2005-09-08 08:22:44 +02:00
|
|
|
|
2005-09-18 04:24:42 +02:00
|
|
|
/* If any networkstatus documents are no longer recent, we need to
|
|
|
|
* update all the descriptors' running status. */
|
2006-10-06 11:04:11 +02:00
|
|
|
/* purge obsolete entries */
|
2007-10-16 01:15:24 +02:00
|
|
|
networkstatus_v2_list_clean(now);
|
2007-10-16 20:19:02 +02:00
|
|
|
/* Remove dead routers. */
|
|
|
|
routerlist_remove_old_routers();
|
2005-09-18 04:24:42 +02:00
|
|
|
|
2005-09-14 23:09:25 +02:00
|
|
|
/* Also, once per minute, check whether we want to download any
|
|
|
|
* networkstatus documents.
|
|
|
|
*/
|
2005-10-05 07:03:52 +02:00
|
|
|
update_networkstatus_downloads(now);
|
2004-11-13 17:53:48 +01:00
|
|
|
}
|
|
|
|
|
2007-07-30 01:11:44 +02:00
|
|
|
/** 2c. Let directory voting happen. */
|
|
|
|
if (authdir_mode_v3(options))
|
2007-10-18 16:27:42 +02:00
|
|
|
dirvote_act(options, now);
|
2007-07-30 01:11:44 +02:00
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
/** 3a. Every second, we examine pending circuits and prune the
|
2004-04-09 22:08:13 +02:00
|
|
|
* ones which have been pending for more than a few seconds.
|
2004-11-15 10:05:54 +01:00
|
|
|
* We do this before step 4, so it can try building more if
|
2003-11-18 08:48:00 +01:00
|
|
|
* it's not comfortable with the number of available circuits.
|
|
|
|
*/
|
2004-04-13 07:20:52 +02:00
|
|
|
circuit_expire_building(now);
|
2003-11-18 08:48:00 +01:00
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
/** 3b. Also look at pending streams and prune the ones that 'began'
|
2004-01-20 10:21:46 +01:00
|
|
|
* a long time ago but haven't gotten a 'connected' yet.
|
2004-11-15 10:05:54 +01:00
|
|
|
* Do this before step 4, so we can put them back into pending
|
2004-01-20 10:21:46 +01:00
|
|
|
* state to be picked up by the new circuit.
|
|
|
|
*/
|
|
|
|
connection_ap_expire_beginning();
|
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
/** 3c. And expire connections that we've held open for too long.
|
2004-03-03 06:08:01 +01:00
|
|
|
*/
|
|
|
|
connection_expire_held_open();
|
|
|
|
|
2004-10-31 21:28:41 +01:00
|
|
|
/** 3d. And every 60 seconds, we relaunch listeners if any died. */
|
|
|
|
if (!we_are_hibernating() && time_to_check_listeners < now) {
|
2007-06-04 18:54:42 +02:00
|
|
|
retry_all_listeners(NULL, NULL);
|
2004-10-24 03:22:40 +02:00
|
|
|
time_to_check_listeners = now+60;
|
|
|
|
}
|
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
/** 4. Every second, we try a new circuit if there are no valid
|
2003-11-16 22:49:52 +01:00
|
|
|
* circuits. Every NewCircuitPeriod seconds, we expire circuits
|
Introduce a notion of 'internal' circs, which are chosen without regard
to the exit policy of the last hop. Intro and rendezvous circs must
be internal circs, to avoid leaking information. Resolve and connect
streams can use internal circs if they want.
New circuit pooling algorithm: make sure to have enough circs around
to satisfy any predicted ports, and also make sure to have 2 internal
circs around if we've required internal circs lately (with high uptime
if we've seen that lately).
Split NewCircuitPeriod config option into NewCircuitPeriod (30 secs),
which describes how often we retry making new circuits if current ones
are dirty, and MaxCircuitDirtiness (10 mins), which describes how long
we're willing to make use of an already-dirty circuit.
Once rendezvous circuits are established, keep using the same circuit as
long as you attach a new stream to it at least every 10 minutes. (So web
browsing doesn't require you to build new rend circs every 30 seconds.)
Cannibalize GENERAL circs to be C_REND, C_INTRO, S_INTRO, and S_REND
circ as necessary, if there are any completed ones lying around when
we try to launch one.
Re-instate the ifdef's to use version-0 style introduce cells, since
there was yet another bug in handling version-1 style. We'll try switching
over again after 0.0.9 is obsolete.
Bugfix: when choosing an exit node for a new non-internal circ, don't take
into account whether it'll be useful for any pending x.onion addresses --
it won't.
Bugfix: we weren't actually publishing the hidden service descriptor when
it became dirty. So we only published it every 20 minutes or so, which
means when you first start your Tor, the hidden service will seem broken.
svn:r3360
2005-01-17 19:13:09 +01:00
|
|
|
* that became dirty more than MaxCircuitDirtiness seconds ago,
|
2003-11-16 22:49:52 +01:00
|
|
|
* and we make a new circ if there are no clean circuits.
|
2003-10-09 20:45:14 +02:00
|
|
|
*/
|
2005-12-15 21:44:15 +01:00
|
|
|
have_dir_info = router_have_minimum_dir_info();
|
|
|
|
if (have_dir_info && !we_are_hibernating())
|
2004-04-13 00:47:12 +02:00
|
|
|
circuit_build_needed_circs(now);
|
2003-11-16 22:49:52 +01:00
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
/** 5. We do housekeeping for each connection... */
|
2007-05-22 17:49:14 +02:00
|
|
|
for (i=0;i<smartlist_len(connection_array);i++) {
|
2003-10-09 20:45:14 +02:00
|
|
|
run_connection_housekeeping(i, now);
|
|
|
|
}
|
2007-04-11 15:18:25 +02:00
|
|
|
if (time_to_shrink_memory < now) {
|
2007-05-22 17:49:14 +02:00
|
|
|
SMARTLIST_FOREACH(connection_array, connection_t *, conn, {
|
|
|
|
if (conn->outbuf)
|
|
|
|
buf_shrink(conn->outbuf);
|
|
|
|
if (conn->inbuf)
|
|
|
|
buf_shrink(conn->inbuf);
|
|
|
|
});
|
2007-04-11 15:18:25 +02:00
|
|
|
clean_cell_pool();
|
2007-07-17 11:26:45 +02:00
|
|
|
buf_shrink_freelists(0);
|
2008-01-18 06:00:35 +01:00
|
|
|
/** How often do we check buffers and pools for empty space that can be
|
|
|
|
* deallocated? */
|
|
|
|
#define MEM_SHRINK_INTERVAL (60)
|
2007-04-11 15:18:25 +02:00
|
|
|
time_to_shrink_memory = now + MEM_SHRINK_INTERVAL;
|
2005-05-03 01:17:08 +02:00
|
|
|
}
|
2003-10-02 22:00:38 +02:00
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
/** 6. And remove any marked circuits... */
|
2004-03-02 18:48:17 +01:00
|
|
|
circuit_close_all_marked();
|
|
|
|
|
2004-11-15 10:05:54 +01:00
|
|
|
/** 7. And upload service descriptors if necessary. */
|
2008-09-09 10:41:58 +02:00
|
|
|
if (has_completed_circuit && !we_are_hibernating()) {
|
2004-11-15 10:05:54 +01:00
|
|
|
rend_consider_services_upload(now);
|
2008-09-09 11:21:21 +02:00
|
|
|
rend_consider_descriptor_republication();
|
2008-09-09 10:41:58 +02:00
|
|
|
}
|
2004-04-13 19:16:47 +02:00
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
/** 8. and blow away any connections that need to die. have to do this now,
|
2004-05-05 02:59:42 +02:00
|
|
|
* because if we marked a conn for close and left its socket -1, then
|
|
|
|
* we'll pass it to poll/select and bad things will happen.
|
2003-10-09 20:45:14 +02:00
|
|
|
*/
|
2005-01-12 07:42:32 +01:00
|
|
|
close_closeable_connections();
|
2006-09-21 23:48:22 +02:00
|
|
|
|
2006-12-07 21:11:30 +01:00
|
|
|
/** 8b. And if anything in our state is ready to get flushed to disk, we
|
|
|
|
* flush it. */
|
|
|
|
or_state_save(now);
|
|
|
|
|
2006-09-21 23:48:22 +02:00
|
|
|
/** 9. and if we're a server, check whether our DNS is telling stories to
|
|
|
|
* us. */
|
2006-12-28 22:29:11 +01:00
|
|
|
if (server_mode(options) && time_to_check_for_correct_dns < now) {
|
|
|
|
if (!time_to_check_for_correct_dns) {
|
|
|
|
time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120);
|
2006-09-21 23:48:22 +02:00
|
|
|
} else {
|
2006-12-28 22:29:11 +01:00
|
|
|
dns_launch_correctness_checks();
|
|
|
|
time_to_check_for_correct_dns = now + 12*3600 +
|
2006-09-21 23:48:22 +02:00
|
|
|
crypto_rand_int(12*3600);
|
|
|
|
}
|
|
|
|
}
|
2007-04-30 19:46:13 +02:00
|
|
|
|
|
|
|
/** 10. write hidden service usage statistic to disk */
|
|
|
|
if (options->HSAuthorityRecordStats && time_to_write_hs_statistics < now) {
|
|
|
|
hs_usage_write_statistics_to_file(now);
|
2008-01-18 06:00:35 +01:00
|
|
|
#define WRITE_HSUSAGE_INTERVAL (30*60)
|
2007-04-30 19:46:13 +02:00
|
|
|
time_to_write_hs_statistics = now+WRITE_HSUSAGE_INTERVAL;
|
|
|
|
}
|
2007-12-19 05:58:58 +01:00
|
|
|
/** 10b. write bridge networkstatus file to disk */
|
|
|
|
if (options->BridgeAuthoritativeDir &&
|
|
|
|
time_to_write_bridge_status_file < now) {
|
2007-12-20 07:36:44 +01:00
|
|
|
networkstatus_dump_bridge_status_to_file(now);
|
2008-01-18 06:00:35 +01:00
|
|
|
#define BRIDGE_STATUSFILE_INTERVAL (30*60)
|
2007-12-19 05:58:58 +01:00
|
|
|
time_to_write_bridge_status_file = now+BRIDGE_STATUSFILE_INTERVAL;
|
|
|
|
}
|
2003-10-09 20:45:14 +02:00
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2007-02-26 06:36:02 +01:00
|
|
|
/** Libevent timer: used to invoke second_elapsed_callback() once per
|
|
|
|
* second. */
|
2005-05-24 19:13:15 +02:00
|
|
|
static struct event *timeout_event = NULL;
|
2007-02-16 21:39:37 +01:00
|
|
|
/** Number of libevent errors in the last second: we die if we get too many. */
|
2005-06-13 02:35:19 +02:00
|
|
|
static int n_libevent_errors = 0;
|
2005-05-24 19:13:15 +02:00
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Libevent callback: invoked once every second. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
second_elapsed_callback(int fd, short event, void *args)
|
2005-01-12 07:42:32 +01:00
|
|
|
{
|
2007-01-02 21:07:54 +01:00
|
|
|
/* XXXX This could be sensibly refactored into multiple callbacks, and we
|
|
|
|
* could use libevent's timers for this rather than checking the current
|
|
|
|
* time against a bunch of timeouts every second. */
|
2005-01-12 07:42:32 +01:00
|
|
|
static struct timeval one_second;
|
|
|
|
static long current_second = 0;
|
2003-10-09 20:45:14 +02:00
|
|
|
struct timeval now;
|
2005-01-12 07:42:32 +01:00
|
|
|
size_t bytes_written;
|
|
|
|
size_t bytes_read;
|
|
|
|
int seconds_elapsed;
|
2005-03-26 02:43:39 +01:00
|
|
|
or_options_t *options = get_options();
|
2006-06-05 00:42:13 +02:00
|
|
|
(void)fd;
|
|
|
|
(void)event;
|
|
|
|
(void)args;
|
2005-01-12 07:42:32 +01:00
|
|
|
if (!timeout_event) {
|
|
|
|
timeout_event = tor_malloc_zero(sizeof(struct event));
|
|
|
|
evtimer_set(timeout_event, second_elapsed_callback, NULL);
|
|
|
|
one_second.tv_sec = 1;
|
|
|
|
one_second.tv_usec = 0;
|
|
|
|
}
|
2003-04-16 08:18:31 +02:00
|
|
|
|
2005-06-13 02:35:19 +02:00
|
|
|
n_libevent_errors = 0;
|
|
|
|
|
2005-01-12 07:42:32 +01:00
|
|
|
/* log_fn(LOG_NOTICE, "Tick."); */
|
2003-10-09 20:45:14 +02:00
|
|
|
tor_gettimeofday(&now);
|
2003-07-05 09:10:34 +02:00
|
|
|
|
2005-01-12 07:42:32 +01:00
|
|
|
/* the second has rolled over. check more stuff. */
|
|
|
|
bytes_written = stats_prev_global_write_bucket - global_write_bucket;
|
|
|
|
bytes_read = stats_prev_global_read_bucket - global_read_bucket;
|
2008-02-22 20:09:45 +01:00
|
|
|
seconds_elapsed = current_second ? (int)(now.tv_sec - current_second) : 0;
|
2005-01-12 07:42:32 +01:00
|
|
|
stats_n_bytes_read += bytes_read;
|
|
|
|
stats_n_bytes_written += bytes_written;
|
2007-01-21 07:24:05 +01:00
|
|
|
if (accounting_is_enabled(options) && seconds_elapsed >= 0)
|
2005-01-12 07:42:32 +01:00
|
|
|
accounting_add_bytes(bytes_read, bytes_written, seconds_elapsed);
|
|
|
|
control_event_bandwidth_used((uint32_t)bytes_read,(uint32_t)bytes_written);
|
2007-02-14 17:46:49 +01:00
|
|
|
control_event_stream_bandwidth_used();
|
2005-01-12 07:42:32 +01:00
|
|
|
|
2007-01-21 07:24:05 +01:00
|
|
|
if (seconds_elapsed > 0)
|
2007-07-30 03:32:12 +02:00
|
|
|
connection_bucket_refill(seconds_elapsed, now.tv_sec);
|
2005-01-12 07:42:32 +01:00
|
|
|
stats_prev_global_read_bucket = global_read_bucket;
|
|
|
|
stats_prev_global_write_bucket = global_write_bucket;
|
|
|
|
|
2005-03-26 02:43:39 +01:00
|
|
|
if (server_mode(options) &&
|
2005-03-29 05:48:31 +02:00
|
|
|
!we_are_hibernating() &&
|
2007-01-21 07:24:05 +01:00
|
|
|
seconds_elapsed > 0 &&
|
2007-10-23 17:44:13 +02:00
|
|
|
has_completed_circuit &&
|
2005-03-27 08:50:36 +02:00
|
|
|
stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT !=
|
|
|
|
(stats_n_seconds_working+seconds_elapsed) /
|
|
|
|
TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
|
|
|
|
/* every 20 minutes, check and complain if necessary */
|
2005-03-26 02:43:39 +01:00
|
|
|
routerinfo_t *me = router_get_my_routerinfo();
|
2005-08-23 00:59:54 +02:00
|
|
|
if (me && !check_whether_orport_reachable())
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that "
|
|
|
|
"its ORPort is reachable. Please check your firewalls, ports, "
|
|
|
|
"address, /etc/hosts file, etc.",
|
|
|
|
me->address, me->or_port);
|
2005-08-23 00:59:54 +02:00
|
|
|
if (me && !check_whether_dirport_reachable())
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Your server (%s:%d) has not managed to confirm that its "
|
|
|
|
"DirPort is reachable. Please check your firewalls, ports, "
|
|
|
|
"address, /etc/hosts file, etc.",
|
|
|
|
me->address, me->dir_port);
|
2005-03-26 02:43:39 +01:00
|
|
|
}
|
|
|
|
|
2006-06-15 11:03:15 +02:00
|
|
|
/** If more than this many seconds have elapsed, probably the clock
|
|
|
|
* jumped: doesn't count. */
|
2006-10-15 04:32:16 +02:00
|
|
|
#define NUM_JUMPED_SECONDS_BEFORE_WARN 100
|
2007-01-21 07:24:05 +01:00
|
|
|
if (seconds_elapsed < -NUM_JUMPED_SECONDS_BEFORE_WARN ||
|
|
|
|
seconds_elapsed >= NUM_JUMPED_SECONDS_BEFORE_WARN) {
|
2005-03-20 00:58:42 +01:00
|
|
|
circuit_note_clock_jumped(seconds_elapsed);
|
2007-01-21 07:24:05 +01:00
|
|
|
/* XXX if the time jumps *back* many months, do our events in
|
|
|
|
* run_scheduled_events() recover? I don't think they do. -RD */
|
|
|
|
} else if (seconds_elapsed > 0)
|
|
|
|
stats_n_seconds_working += seconds_elapsed;
|
2005-01-12 07:42:32 +01:00
|
|
|
|
|
|
|
run_scheduled_events(now.tv_sec);
|
2002-10-02 01:37:31 +02:00
|
|
|
|
2005-01-12 07:42:32 +01:00
|
|
|
current_second = now.tv_sec; /* remember which second it is, for next time */
|
|
|
|
|
2005-07-18 21:16:17 +02:00
|
|
|
#if 0
|
2005-07-25 12:29:21 +02:00
|
|
|
if (current_second % 300 == 0) {
|
2005-07-25 12:36:01 +02:00
|
|
|
rep_history_clean(current_second - options->RephistTrackTime);
|
2005-12-14 21:40:40 +01:00
|
|
|
dumpmemusage(get_min_log_level()<LOG_INFO ?
|
|
|
|
get_min_log_level() : LOG_INFO);
|
2005-07-25 12:29:21 +02:00
|
|
|
}
|
2005-07-18 21:16:17 +02:00
|
|
|
#endif
|
2005-06-08 19:24:58 +02:00
|
|
|
|
2005-02-25 06:42:01 +01:00
|
|
|
if (evtimer_add(timeout_event, &one_second))
|
2006-02-13 10:37:53 +01:00
|
|
|
log_err(LD_NET,
|
|
|
|
"Error from libevent when setting one-second timeout event");
|
2003-03-06 05:52:02 +01:00
|
|
|
}
|
|
|
|
|
2006-09-28 02:53:02 +02:00
|
|
|
#ifndef MS_WINDOWS
|
2005-06-13 02:35:19 +02:00
|
|
|
/** Called when a possibly ignorable libevent error occurs; ensures that we
|
|
|
|
* don't get into an infinite loop by ignoring too many errors from
|
|
|
|
* libevent. */
|
2005-06-20 11:38:29 +02:00
|
|
|
static int
|
2005-06-13 02:35:19 +02:00
|
|
|
got_libevent_error(void)
|
|
|
|
{
|
|
|
|
if (++n_libevent_errors > 8) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_err(LD_NET, "Too many libevent errors in one second; dying");
|
2005-06-13 02:35:19 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2006-09-28 02:53:02 +02:00
|
|
|
#endif
|
2005-06-13 02:35:19 +02:00
|
|
|
|
2006-12-28 22:29:20 +01:00
|
|
|
#define UPTIME_CUTOFF_FOR_NEW_BANDWIDTH_TEST (6*60*60)
|
|
|
|
|
|
|
|
/** Called when our IP address seems to have changed. <b>at_interface</b>
|
|
|
|
* should be true if we detected a change in our interface, and false if we
|
|
|
|
* detected a change in our published address. */
|
|
|
|
void
|
|
|
|
ip_address_changed(int at_interface)
|
|
|
|
{
|
|
|
|
int server = server_mode(get_options());
|
|
|
|
|
|
|
|
if (at_interface) {
|
|
|
|
if (! server) {
|
|
|
|
/* Okay, change our keys. */
|
|
|
|
init_keys();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (server) {
|
|
|
|
if (stats_n_seconds_working > UPTIME_CUTOFF_FOR_NEW_BANDWIDTH_TEST)
|
|
|
|
reset_bandwidth_test();
|
|
|
|
stats_n_seconds_working = 0;
|
|
|
|
router_reset_reachability();
|
|
|
|
mark_my_descriptor_dirty();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dns_servers_relaunch_checks();
|
|
|
|
}
|
|
|
|
|
2007-01-22 08:51:06 +01:00
|
|
|
/** Forget what we've learned about the correctness of our DNS servers, and
|
|
|
|
* start learning again. */
|
2006-12-28 22:29:20 +01:00
|
|
|
void
|
|
|
|
dns_servers_relaunch_checks(void)
|
|
|
|
{
|
|
|
|
if (server_mode(get_options())) {
|
|
|
|
dns_reset_correctness_checks();
|
|
|
|
time_to_check_for_correct_dns = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Called when we get a SIGHUP: reload configuration files and keys,
|
2007-10-14 00:31:35 +02:00
|
|
|
* retry all connections, and so on. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
do_hup(void)
|
|
|
|
{
|
2004-11-09 08:05:53 +01:00
|
|
|
or_options_t *options = get_options();
|
2004-02-26 23:30:44 +01:00
|
|
|
|
2007-07-22 09:05:43 +02:00
|
|
|
#ifdef USE_DMALLOC
|
|
|
|
dmalloc_log_stats();
|
2007-07-29 03:18:00 +02:00
|
|
|
dmalloc_log_changed(0, 1, 0, 0);
|
2007-07-22 09:05:43 +02:00
|
|
|
#endif
|
|
|
|
|
2006-02-13 10:37:53 +01:00
|
|
|
log_notice(LD_GENERAL,"Received reload signal (hup). Reloading config.");
|
2004-11-15 05:48:53 +01:00
|
|
|
if (accounting_is_enabled(options))
|
2006-12-07 19:57:37 +01:00
|
|
|
accounting_record_bandwidth_usage(time(NULL), get_or_state());
|
2004-11-14 23:21:23 +01:00
|
|
|
|
2005-10-06 01:20:45 +02:00
|
|
|
router_reset_warnings();
|
2005-10-05 04:20:46 +02:00
|
|
|
routerlist_reset_warnings();
|
2005-03-11 22:39:39 +01:00
|
|
|
addressmap_clear_transient();
|
2004-02-26 23:30:44 +01:00
|
|
|
/* first, reload config variables, in case they've changed */
|
|
|
|
/* no need to provide argc/v, they've been cached inside init_from_config */
|
2005-07-23 03:58:05 +02:00
|
|
|
if (options_init_from_torrc(0, NULL) < 0) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_err(LD_CONFIG,"Reading config failed--see warnings above. "
|
|
|
|
"For usage, try -h.");
|
2004-10-23 19:06:25 +02:00
|
|
|
return -1;
|
2004-02-26 23:30:44 +01:00
|
|
|
}
|
2004-12-07 10:11:38 +01:00
|
|
|
options = get_options(); /* they have changed now */
|
2007-12-19 00:45:24 +01:00
|
|
|
if (authdir_mode_handles_descs(options, -1)) {
|
2004-02-26 23:30:44 +01:00
|
|
|
/* reload the approved-routers file */
|
2006-09-14 06:53:23 +02:00
|
|
|
if (dirserv_load_fingerprint_file() < 0) {
|
|
|
|
/* warnings are logged from dirserv_load_fingerprint_file() directly */
|
2006-02-13 10:37:53 +01:00
|
|
|
log_info(LD_GENERAL, "Error reloading fingerprints. "
|
|
|
|
"Continuing with old list.");
|
2004-02-26 23:30:44 +01:00
|
|
|
}
|
|
|
|
}
|
2005-10-06 00:36:33 +02:00
|
|
|
|
|
|
|
/* Rotate away from the old dirty circuits. This has to be done
|
|
|
|
* after we've read the new options, but before we start using
|
|
|
|
* circuits for directory fetches. */
|
|
|
|
circuit_expire_all_dirty_circs();
|
|
|
|
|
2005-10-05 07:03:52 +02:00
|
|
|
/* retry appropriate downloads */
|
|
|
|
router_reset_status_download_failures();
|
|
|
|
router_reset_descriptor_download_failures();
|
|
|
|
update_networkstatus_downloads(time(NULL));
|
|
|
|
|
|
|
|
/* We'll retry routerstatus downloads in about 10 seconds; no need to
|
|
|
|
* force a retry there. */
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (server_mode(options)) {
|
2004-06-06 05:38:31 +02:00
|
|
|
/* Restart cpuworker and dnsworker processes, so they get up-to-date
|
|
|
|
* configuration options. */
|
|
|
|
cpuworkers_rotate();
|
2006-08-28 05:15:55 +02:00
|
|
|
dns_reset();
|
2004-02-26 23:30:44 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Tor main loop. */
|
2007-09-06 20:19:09 +02:00
|
|
|
/* static */ int
|
2005-06-11 20:52:12 +02:00
|
|
|
do_main_loop(void)
|
|
|
|
{
|
2005-01-12 07:42:32 +01:00
|
|
|
int loop_result;
|
2007-08-17 03:29:58 +02:00
|
|
|
time_t now;
|
2003-12-05 10:51:49 +01:00
|
|
|
|
2006-08-27 03:41:08 +02:00
|
|
|
/* initialize dns resolve map, spawn workers if needed */
|
|
|
|
if (dns_init() < 0) {
|
|
|
|
log_err(LD_GENERAL,"Error initializing dns subsystem; exiting");
|
|
|
|
return -1;
|
|
|
|
}
|
2005-06-19 10:35:46 +02:00
|
|
|
|
|
|
|
handle_signals(1);
|
|
|
|
|
2004-07-21 20:53:56 +02:00
|
|
|
/* load the private keys, if we're supposed to have them, and set up the
|
|
|
|
* TLS context. */
|
2004-11-21 05:19:04 +01:00
|
|
|
if (! identity_key_is_set()) {
|
|
|
|
if (init_keys() < 0) {
|
2006-09-30 00:33:40 +02:00
|
|
|
log_err(LD_BUG,"Error initializing keys; exiting");
|
2004-11-21 05:19:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-07-21 20:53:56 +02:00
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/* Set up the packed_cell_t memory pool. */
|
2007-04-11 02:30:29 +02:00
|
|
|
init_cell_pool();
|
|
|
|
|
2004-11-09 05:28:18 +01:00
|
|
|
/* Set up our buckets */
|
|
|
|
connection_bucket_init();
|
|
|
|
stats_prev_global_read_bucket = global_read_bucket;
|
|
|
|
stats_prev_global_write_bucket = global_write_bucket;
|
|
|
|
|
2008-06-17 10:15:42 +02:00
|
|
|
/* initialize the bootstrap status events to know we're starting up */
|
|
|
|
control_event_bootstrap(BOOTSTRAP_STATUS_STARTING, 0);
|
|
|
|
|
2007-10-16 01:15:24 +02:00
|
|
|
if (trusted_dirs_reload_certs())
|
|
|
|
return -1;
|
|
|
|
if (router_reload_v2_networkstatus()) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (router_reload_consensus_networkstatus()) {
|
|
|
|
return -1;
|
|
|
|
}
|
2004-09-03 00:08:36 +02:00
|
|
|
/* load the routers file, or assign the defaults. */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (router_reload_router_list()) {
|
2004-09-08 08:52:33 +02:00
|
|
|
return -1;
|
2004-04-07 23:44:46 +02:00
|
|
|
}
|
2005-09-15 07:19:38 +02:00
|
|
|
/* load the networkstatuses. (This launches a download for new routers as
|
|
|
|
* appropriate.)
|
|
|
|
*/
|
2007-08-17 03:29:58 +02:00
|
|
|
now = time(NULL);
|
|
|
|
directory_info_has_arrived(now, 1);
|
2004-04-07 23:44:46 +02:00
|
|
|
|
2007-06-09 09:05:19 +02:00
|
|
|
if (authdir_mode_tests_reachability(get_options())) {
|
2004-07-20 12:17:43 +02:00
|
|
|
/* the directory is already here, run startup things */
|
2007-08-17 03:29:58 +02:00
|
|
|
dirserv_test_reachability(now, 1);
|
2004-04-01 00:02:13 +02:00
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (server_mode(get_options())) {
|
2004-07-20 12:17:43 +02:00
|
|
|
/* launch cpuworkers. Need to do this *after* we've read the onion key. */
|
|
|
|
cpu_init();
|
2003-09-08 08:26:38 +02:00
|
|
|
}
|
2003-09-07 12:24:40 +02:00
|
|
|
|
2005-01-12 07:42:32 +01:00
|
|
|
/* set up once-a-second callback. */
|
|
|
|
second_elapsed_callback(0,0,NULL);
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
for (;;) {
|
2007-03-03 22:16:07 +01:00
|
|
|
if (nt_service_is_stopping())
|
2004-06-12 23:43:02 +02:00
|
|
|
return 0;
|
2005-04-18 00:38:39 +02:00
|
|
|
|
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
/* Make it easier to tell whether libevent failure is our fault or not. */
|
|
|
|
errno = 0;
|
|
|
|
#endif
|
2007-04-21 19:26:12 +02:00
|
|
|
/* All active linked conns should get their read events activated. */
|
|
|
|
SMARTLIST_FOREACH(active_linked_connection_lst, connection_t *, conn,
|
|
|
|
event_active(conn->read_event, EV_READ, 1));
|
|
|
|
called_loop_once = smartlist_len(active_linked_connection_lst) ? 1 : 0;
|
|
|
|
|
|
|
|
/* poll until we have an event, or the second ends, or until we have
|
2007-04-25 09:20:04 +02:00
|
|
|
* some active linked connections to trigger events for. */
|
2007-04-21 19:26:12 +02:00
|
|
|
loop_result = event_loop(called_loop_once ? EVLOOP_ONCE : 0);
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
|
2003-10-15 20:28:32 +02:00
|
|
|
/* let catch() handle things like ^c, and otherwise don't worry about it */
|
2005-01-12 07:42:32 +01:00
|
|
|
if (loop_result < 0) {
|
2005-06-07 19:32:33 +02:00
|
|
|
int e = tor_socket_errno(-1);
|
2004-05-01 22:46:28 +02:00
|
|
|
/* let the program survive things like ^z */
|
2005-06-06 22:06:10 +02:00
|
|
|
if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) {
|
2005-04-01 04:37:40 +02:00
|
|
|
#ifdef HAVE_EVENT_GET_METHOD
|
2006-02-13 10:37:53 +01:00
|
|
|
log_err(LD_NET,"libevent call with %s failed: %s [%d]",
|
|
|
|
event_get_method(), tor_socket_strerror(e), e);
|
2005-04-01 04:37:40 +02:00
|
|
|
#else
|
2006-02-13 10:37:53 +01:00
|
|
|
log_err(LD_NET,"libevent call failed: %s [%d]",
|
|
|
|
tor_socket_strerror(e), e);
|
2005-04-01 04:37:40 +02:00
|
|
|
#endif
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
return -1;
|
2005-06-13 02:35:19 +02:00
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
} else if (e == EINVAL) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_NET, "EINVAL from libevent: should you upgrade libevent?");
|
2005-06-13 02:35:19 +02:00
|
|
|
if (got_libevent_error())
|
|
|
|
return -1;
|
|
|
|
#endif
|
2003-10-15 20:28:32 +02:00
|
|
|
} else {
|
2005-06-06 22:06:10 +02:00
|
|
|
if (ERRNO_IS_EINPROGRESS(e))
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_BUG,
|
|
|
|
"libevent call returned EINPROGRESS? Please report.");
|
|
|
|
log_debug(LD_NET,"libevent call interrupted.");
|
2004-11-17 21:26:39 +01:00
|
|
|
/* You can't trust the results of this poll(). Go back to the
|
|
|
|
* top of the big for loop. */
|
|
|
|
continue;
|
2003-10-15 20:28:32 +02:00
|
|
|
}
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-01-05 07:40:47 +01:00
|
|
|
/** Used to implement the SIGNAL control command: if we accept
|
2006-08-18 01:00:32 +02:00
|
|
|
* <b>the_signal</b> as a remote pseudo-signal, act on it. */
|
2005-01-05 07:40:47 +01:00
|
|
|
/* We don't re-use catch() here because:
|
|
|
|
* 1. We handle a different set of signals than those allowed in catch.
|
|
|
|
* 2. Platforms without signal() are unlikely to define SIGfoo.
|
|
|
|
* 3. The control spec is defined to use fixed numeric signal values
|
|
|
|
* which just happen to match the unix values.
|
|
|
|
*/
|
2006-08-18 01:00:32 +02:00
|
|
|
void
|
2005-01-05 07:40:47 +01:00
|
|
|
control_signal_act(int the_signal)
|
|
|
|
{
|
2005-02-05 22:42:46 +01:00
|
|
|
switch (the_signal)
|
2005-01-05 07:40:47 +01:00
|
|
|
{
|
|
|
|
case 1:
|
2005-01-20 21:16:48 +01:00
|
|
|
signal_callback(0,0,(void*)(uintptr_t)SIGHUP);
|
2005-01-05 07:40:47 +01:00
|
|
|
break;
|
|
|
|
case 2:
|
2005-01-20 21:16:48 +01:00
|
|
|
signal_callback(0,0,(void*)(uintptr_t)SIGINT);
|
2005-01-05 07:40:47 +01:00
|
|
|
break;
|
|
|
|
case 10:
|
2005-01-20 21:16:48 +01:00
|
|
|
signal_callback(0,0,(void*)(uintptr_t)SIGUSR1);
|
2005-01-05 07:40:47 +01:00
|
|
|
break;
|
|
|
|
case 12:
|
2005-01-20 21:16:48 +01:00
|
|
|
signal_callback(0,0,(void*)(uintptr_t)SIGUSR2);
|
2005-01-05 07:40:47 +01:00
|
|
|
break;
|
|
|
|
case 15:
|
2005-01-20 21:16:48 +01:00
|
|
|
signal_callback(0,0,(void*)(uintptr_t)SIGTERM);
|
2005-01-05 07:40:47 +01:00
|
|
|
break;
|
2006-03-09 01:18:16 +01:00
|
|
|
case SIGNEWNYM:
|
|
|
|
signal_callback(0,0,(void*)(uintptr_t)SIGNEWNYM);
|
|
|
|
break;
|
2006-10-25 23:46:21 +02:00
|
|
|
case SIGCLEARDNSCACHE:
|
|
|
|
signal_callback(0,0,(void*)(uintptr_t)SIGCLEARDNSCACHE);
|
|
|
|
break;
|
2005-01-05 07:40:47 +01:00
|
|
|
default:
|
2006-08-18 01:00:32 +02:00
|
|
|
log_warn(LD_BUG, "Unrecognized signal number %d.", the_signal);
|
|
|
|
break;
|
2005-01-05 07:40:47 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/** Libevent callback: invoked when we get a signal.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
signal_callback(int fd, short events, void *arg)
|
2005-01-12 07:42:32 +01:00
|
|
|
{
|
2005-01-20 21:16:48 +01:00
|
|
|
uintptr_t sig = (uintptr_t)arg;
|
2006-06-05 00:42:13 +02:00
|
|
|
(void)fd;
|
|
|
|
(void)events;
|
2005-01-12 07:42:32 +01:00
|
|
|
switch (sig)
|
|
|
|
{
|
2002-09-28 03:40:11 +02:00
|
|
|
case SIGTERM:
|
2007-03-06 20:33:43 +01:00
|
|
|
log_notice(LD_GENERAL,"Catching signal TERM, exiting cleanly.");
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_cleanup();
|
|
|
|
exit(0);
|
2004-12-01 03:54:13 +01:00
|
|
|
break;
|
2004-07-21 01:31:00 +02:00
|
|
|
case SIGINT:
|
2005-01-12 07:42:32 +01:00
|
|
|
if (!server_mode(get_options())) { /* do it now */
|
2006-02-13 10:37:53 +01:00
|
|
|
log_notice(LD_GENERAL,"Interrupt: exiting cleanly.");
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_cleanup();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
hibernate_begin_shutdown();
|
2004-07-21 01:31:00 +02:00
|
|
|
break;
|
2005-01-12 07:42:32 +01:00
|
|
|
#ifdef SIGPIPE
|
2004-03-11 21:15:53 +01:00
|
|
|
case SIGPIPE:
|
2006-02-13 10:37:53 +01:00
|
|
|
log_debug(LD_GENERAL,"Caught sigpipe. Ignoring.");
|
2002-09-28 03:40:11 +02:00
|
|
|
break;
|
2005-01-12 07:42:32 +01:00
|
|
|
#endif
|
2002-09-28 03:40:11 +02:00
|
|
|
case SIGUSR1:
|
2005-01-12 07:42:32 +01:00
|
|
|
/* prefer to log it at INFO, but make sure we always see it */
|
|
|
|
dumpstats(get_min_log_level()<LOG_INFO ? get_min_log_level() : LOG_INFO);
|
2002-09-28 03:40:11 +02:00
|
|
|
break;
|
2004-11-20 08:33:55 +01:00
|
|
|
case SIGUSR2:
|
2005-01-12 07:42:32 +01:00
|
|
|
switch_logs_debug();
|
2006-02-13 10:37:53 +01:00
|
|
|
log_debug(LD_GENERAL,"Caught USR2, going to loglevel debug. "
|
|
|
|
"Send HUP to change back.");
|
2004-11-20 08:33:55 +01:00
|
|
|
break;
|
2005-01-12 07:42:32 +01:00
|
|
|
case SIGHUP:
|
|
|
|
if (do_hup() < 0) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_CONFIG,"Restart failed (config error?). Exiting.");
|
2005-01-12 07:42:32 +01:00
|
|
|
tor_cleanup();
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
#ifdef SIGCHLD
|
2003-08-12 08:41:53 +02:00
|
|
|
case SIGCHLD:
|
2005-12-14 21:40:40 +01:00
|
|
|
while (waitpid(-1,NULL,WNOHANG) > 0) ; /* keep reaping until no more
|
|
|
|
zombies */
|
2003-09-13 23:53:38 +02:00
|
|
|
break;
|
2004-11-12 05:59:37 +01:00
|
|
|
#endif
|
2007-02-22 07:21:19 +01:00
|
|
|
case SIGNEWNYM: {
|
|
|
|
time_t now = time(NULL);
|
2007-02-24 22:21:38 +01:00
|
|
|
if (time_of_last_signewnym + MAX_SIGNEWNYM_RATE > now) {
|
2007-02-22 07:21:19 +01:00
|
|
|
signewnym_is_pending = 1;
|
2007-02-24 22:21:38 +01:00
|
|
|
log(LOG_NOTICE, LD_CONTROL,
|
|
|
|
"Rate limiting NEWNYM request: delaying by %d second(s)",
|
|
|
|
(int)(MAX_SIGNEWNYM_RATE+time_of_last_signewnym-now));
|
2007-02-22 07:21:19 +01:00
|
|
|
} else {
|
2008-02-06 06:31:21 +01:00
|
|
|
signewnym_impl(now);
|
2007-02-22 07:21:16 +01:00
|
|
|
}
|
2006-03-09 01:18:16 +01:00
|
|
|
break;
|
2007-02-22 07:21:19 +01:00
|
|
|
}
|
2006-10-25 23:46:21 +02:00
|
|
|
case SIGCLEARDNSCACHE:
|
|
|
|
addressmap_clear_transient();
|
|
|
|
break;
|
2005-02-22 03:57:43 +01:00
|
|
|
}
|
2002-09-22 00:41:48 +02:00
|
|
|
}
|
|
|
|
|
2006-08-11 09:09:17 +02:00
|
|
|
extern uint64_t rephist_total_alloc;
|
|
|
|
extern uint32_t rephist_total_num;
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/**
|
2006-03-09 01:10:28 +01:00
|
|
|
* Write current memory usage information to the log.
|
2005-06-11 20:52:12 +02:00
|
|
|
*/
|
2005-06-08 19:24:58 +02:00
|
|
|
static void
|
2005-06-11 20:52:12 +02:00
|
|
|
dumpmemusage(int severity)
|
|
|
|
{
|
2007-04-23 05:04:46 +02:00
|
|
|
connection_dump_buffer_mem_stats(severity);
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity, LD_GENERAL, "In rephist: "U64_FORMAT" used by %d Tors.",
|
2005-07-18 08:09:04 +02:00
|
|
|
U64_PRINTF_ARG(rephist_total_alloc), rephist_total_num);
|
2005-11-23 07:00:58 +01:00
|
|
|
dump_routerlist_mem_usage(severity);
|
2007-04-19 20:47:04 +02:00
|
|
|
dump_cell_pool_usage(severity);
|
2007-07-27 20:33:37 +02:00
|
|
|
buf_dump_freelist_sizes(severity);
|
2007-07-30 20:14:14 +02:00
|
|
|
tor_log_mallinfo(severity);
|
2005-06-08 19:24:58 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Write all statistics to the log, with log level 'severity'. Called
|
2004-05-05 23:35:12 +02:00
|
|
|
* in response to a SIGUSR1. */
|
2005-03-14 04:18:35 +01:00
|
|
|
static void
|
2005-06-11 20:52:12 +02:00
|
|
|
dumpstats(int severity)
|
|
|
|
{
|
2003-10-04 05:29:09 +02:00
|
|
|
time_t now = time(NULL);
|
2005-01-10 06:10:22 +01:00
|
|
|
time_t elapsed;
|
2008-04-10 17:12:24 +02:00
|
|
|
int rbuf_cap, wbuf_cap, rbuf_len, wbuf_len;
|
2002-09-22 00:41:48 +02:00
|
|
|
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity, LD_GENERAL, "Dumping stats:");
|
2002-09-22 00:41:48 +02:00
|
|
|
|
2007-05-22 17:49:14 +02:00
|
|
|
SMARTLIST_FOREACH(connection_array, connection_t *, conn,
|
|
|
|
{
|
|
|
|
int i = conn_sl_idx;
|
2005-12-14 21:40:40 +01:00
|
|
|
log(severity, LD_GENERAL,
|
|
|
|
"Conn %d (socket %d) type %d (%s), state %d (%s), created %d secs ago",
|
2005-12-10 10:36:26 +01:00
|
|
|
i, conn->s, conn->type, conn_type_to_string(conn->type),
|
2005-12-14 21:40:40 +01:00
|
|
|
conn->state, conn_state_to_string(conn->type, conn->state),
|
|
|
|
(int)(now - conn->timestamp_created));
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!connection_is_listener(conn)) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(severity,LD_GENERAL,
|
2006-04-25 09:00:04 +02:00
|
|
|
"Conn %d is to %s:%d.", i,
|
2006-04-17 00:34:00 +02:00
|
|
|
safe_str(conn->address), conn->port);
|
2005-12-14 21:40:40 +01:00
|
|
|
log(severity,LD_GENERAL,
|
|
|
|
"Conn %d: %d bytes waiting on inbuf (len %d, last read %d secs ago)",
|
|
|
|
i,
|
2005-12-10 10:36:26 +01:00
|
|
|
(int)buf_datalen(conn->inbuf),
|
2007-12-26 01:12:08 +01:00
|
|
|
(int)buf_allocation(conn->inbuf),
|
2005-12-10 10:36:26 +01:00
|
|
|
(int)(now - conn->timestamp_lastread));
|
2005-12-14 21:40:40 +01:00
|
|
|
log(severity,LD_GENERAL,
|
|
|
|
"Conn %d: %d bytes waiting on outbuf "
|
|
|
|
"(len %d, last written %d secs ago)",i,
|
2005-12-10 10:36:26 +01:00
|
|
|
(int)buf_datalen(conn->outbuf),
|
2007-12-26 01:12:08 +01:00
|
|
|
(int)buf_allocation(conn->outbuf),
|
2005-12-10 10:36:26 +01:00
|
|
|
(int)(now - conn->timestamp_lastwritten));
|
2008-04-10 17:12:24 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR) {
|
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
|
|
|
if (or_conn->tls) {
|
|
|
|
tor_tls_get_buffer_sizes(or_conn->tls, &rbuf_cap, &rbuf_len,
|
|
|
|
&wbuf_cap, &wbuf_len);
|
|
|
|
log(severity, LD_GENERAL,
|
|
|
|
"Conn %d: %d/%d bytes used on openssl read buffer; "
|
|
|
|
"%d/%d bytes used on write buffer.",
|
|
|
|
i, rbuf_len, rbuf_cap, wbuf_len, wbuf_cap);
|
|
|
|
}
|
|
|
|
}
|
2002-09-22 00:41:48 +02:00
|
|
|
}
|
2005-12-14 21:40:40 +01:00
|
|
|
circuit_dump_by_conn(conn, severity); /* dump info about all the circuits
|
|
|
|
* using this conn */
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity, LD_NET,
|
2005-12-31 09:09:26 +01:00
|
|
|
"Cells processed: "U64_FORMAT" padding\n"
|
|
|
|
" "U64_FORMAT" create\n"
|
|
|
|
" "U64_FORMAT" created\n"
|
|
|
|
" "U64_FORMAT" relay\n"
|
|
|
|
" ("U64_FORMAT" relayed)\n"
|
|
|
|
" ("U64_FORMAT" delivered)\n"
|
|
|
|
" "U64_FORMAT" destroy",
|
|
|
|
U64_PRINTF_ARG(stats_n_padding_cells_processed),
|
|
|
|
U64_PRINTF_ARG(stats_n_create_cells_processed),
|
|
|
|
U64_PRINTF_ARG(stats_n_created_cells_processed),
|
|
|
|
U64_PRINTF_ARG(stats_n_relay_cells_processed),
|
|
|
|
U64_PRINTF_ARG(stats_n_relay_cells_relayed),
|
|
|
|
U64_PRINTF_ARG(stats_n_relay_cells_delivered),
|
|
|
|
U64_PRINTF_ARG(stats_n_destroy_cells_processed));
|
2003-10-02 22:00:38 +02:00
|
|
|
if (stats_n_data_cells_packaged)
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity,LD_NET,"Average packaged cell fullness: %2.3f%%",
|
2006-07-17 02:39:05 +02:00
|
|
|
100*(U64_TO_DBL(stats_n_data_bytes_packaged) /
|
2006-07-18 04:24:01 +02:00
|
|
|
U64_TO_DBL(stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) );
|
2003-10-15 21:25:28 +02:00
|
|
|
if (stats_n_data_cells_received)
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity,LD_NET,"Average delivered cell fullness: %2.3f%%",
|
2006-07-17 02:39:05 +02:00
|
|
|
100*(U64_TO_DBL(stats_n_data_bytes_received) /
|
2006-07-18 04:24:01 +02:00
|
|
|
U64_TO_DBL(stats_n_data_cells_received*RELAY_PAYLOAD_SIZE)) );
|
2003-12-05 10:51:49 +01:00
|
|
|
|
2005-01-10 06:10:22 +01:00
|
|
|
if (now - time_of_process_start >= 0)
|
|
|
|
elapsed = now - time_of_process_start;
|
|
|
|
else
|
|
|
|
elapsed = 0;
|
|
|
|
|
|
|
|
if (elapsed) {
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity, LD_NET,
|
2005-01-10 06:10:22 +01:00
|
|
|
"Average bandwidth: "U64_FORMAT"/%d = %d bytes/sec reading",
|
2004-11-03 00:47:32 +01:00
|
|
|
U64_PRINTF_ARG(stats_n_bytes_read),
|
2005-01-10 06:10:22 +01:00
|
|
|
(int)elapsed,
|
|
|
|
(int) (stats_n_bytes_read/elapsed));
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity, LD_NET,
|
2005-01-10 06:10:22 +01:00
|
|
|
"Average bandwidth: "U64_FORMAT"/%d = %d bytes/sec writing",
|
2004-12-07 17:50:47 +01:00
|
|
|
U64_PRINTF_ARG(stats_n_bytes_written),
|
2005-01-10 06:10:22 +01:00
|
|
|
(int)elapsed,
|
|
|
|
(int) (stats_n_bytes_written/elapsed));
|
2004-12-07 17:50:47 +01:00
|
|
|
}
|
2004-11-03 17:38:04 +01:00
|
|
|
|
2005-10-25 10:20:10 +02:00
|
|
|
log(severity, LD_NET, "--------------- Dumping memory information:");
|
2005-06-08 19:24:58 +02:00
|
|
|
dumpmemusage(severity);
|
2005-06-06 19:03:21 +02:00
|
|
|
|
2004-03-20 05:59:29 +01:00
|
|
|
rep_hist_dump_stats(now,severity);
|
2004-04-09 22:02:16 +02:00
|
|
|
rend_service_dump_stats(severity);
|
2006-10-31 20:17:07 +01:00
|
|
|
dump_pk_ops(severity);
|
2006-11-30 23:23:01 +01:00
|
|
|
dump_distinct_digest_count(severity);
|
2002-09-22 00:41:48 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Called by exit() as we shut down the process.
|
2004-05-05 23:35:12 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
exit_function(void)
|
2004-03-10 07:26:38 +01:00
|
|
|
{
|
2004-11-12 17:39:03 +01:00
|
|
|
/* NOTE: If we ever daemonize, this gets called immediately. That's
|
|
|
|
* okay for now, because we only use this on Windows. */
|
2004-03-10 07:26:38 +01:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
WSACleanup();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2004-08-08 09:25:45 +02:00
|
|
|
/** Set up the signal handlers for either parent or child. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
handle_signals(int is_parent)
|
2004-08-08 09:25:45 +02:00
|
|
|
{
|
|
|
|
#ifndef MS_WINDOWS /* do signal stuff only on unix */
|
2005-01-12 07:42:32 +01:00
|
|
|
int i;
|
|
|
|
static int signals[] = {
|
2005-01-12 13:18:46 +01:00
|
|
|
SIGINT, /* do a controlled slow shutdown */
|
|
|
|
SIGTERM, /* to terminate now */
|
|
|
|
SIGPIPE, /* otherwise sigpipe kills us */
|
|
|
|
SIGUSR1, /* dump stats */
|
|
|
|
SIGUSR2, /* go to loglevel debug */
|
|
|
|
SIGHUP, /* to reload config, retry conns, etc */
|
2004-11-12 05:59:37 +01:00
|
|
|
#ifdef SIGXFSZ
|
2005-01-12 13:18:46 +01:00
|
|
|
SIGXFSZ, /* handle file-too-big resource exhaustion */
|
2005-01-12 07:42:32 +01:00
|
|
|
#endif
|
2005-01-12 13:22:25 +01:00
|
|
|
SIGCHLD, /* handle dns/cpu workers that exit */
|
2005-01-12 07:42:32 +01:00
|
|
|
-1 };
|
|
|
|
static struct event signal_events[16]; /* bigger than it has to be. */
|
|
|
|
if (is_parent) {
|
|
|
|
for (i = 0; signals[i] >= 0; ++i) {
|
|
|
|
signal_set(&signal_events[i], signals[i], signal_callback,
|
2005-01-20 21:21:34 +01:00
|
|
|
(void*)(uintptr_t)signals[i]);
|
2005-02-25 06:42:01 +01:00
|
|
|
if (signal_add(&signal_events[i], NULL))
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_BUG, "Error from libevent when adding event for signal %d",
|
|
|
|
signals[i]);
|
2005-01-12 07:42:32 +01:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
struct sigaction action;
|
|
|
|
action.sa_flags = 0;
|
|
|
|
sigemptyset(&action.sa_mask);
|
|
|
|
action.sa_handler = SIG_IGN;
|
2005-01-12 13:18:46 +01:00
|
|
|
sigaction(SIGINT, &action, NULL);
|
|
|
|
sigaction(SIGTERM, &action, NULL);
|
|
|
|
sigaction(SIGPIPE, &action, NULL);
|
|
|
|
sigaction(SIGUSR1, &action, NULL);
|
|
|
|
sigaction(SIGUSR2, &action, NULL);
|
|
|
|
sigaction(SIGHUP, &action, NULL);
|
2005-01-12 07:42:32 +01:00
|
|
|
#ifdef SIGXFSZ
|
2005-01-12 13:18:46 +01:00
|
|
|
sigaction(SIGXFSZ, &action, NULL);
|
2004-11-12 05:59:37 +01:00
|
|
|
#endif
|
2005-01-12 07:42:32 +01:00
|
|
|
}
|
2007-02-28 21:24:27 +01:00
|
|
|
#else /* MS windows */
|
|
|
|
(void)is_parent;
|
2005-02-22 03:57:43 +01:00
|
|
|
#endif /* signal stuff */
|
2004-08-08 09:25:45 +02:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Main entry point for the Tor command-line client.
|
2004-05-05 23:35:12 +02:00
|
|
|
*/
|
2007-09-06 20:19:09 +02:00
|
|
|
/* static */ int
|
2005-06-11 20:52:12 +02:00
|
|
|
tor_init(int argc, char *argv[])
|
|
|
|
{
|
2007-05-22 17:48:46 +02:00
|
|
|
char buf[256];
|
2007-11-01 05:38:43 +01:00
|
|
|
int i, quiet = 0;
|
2005-01-10 06:10:22 +01:00
|
|
|
time_of_process_start = time(NULL);
|
2007-05-22 17:49:14 +02:00
|
|
|
if (!connection_array)
|
|
|
|
connection_array = smartlist_create();
|
2005-09-30 23:22:25 +02:00
|
|
|
if (!closeable_connection_lst)
|
|
|
|
closeable_connection_lst = smartlist_create();
|
2007-04-21 19:26:12 +02:00
|
|
|
if (!active_linked_connection_lst)
|
|
|
|
active_linked_connection_lst = smartlist_create();
|
2007-05-22 17:48:46 +02:00
|
|
|
/* Have the log set up with our application name. */
|
|
|
|
tor_snprintf(buf, sizeof(buf), "Tor %s", get_version());
|
|
|
|
log_set_application_name(buf);
|
2004-11-23 10:00:55 +01:00
|
|
|
/* Initialize the history structures. */
|
|
|
|
rep_hist_init();
|
|
|
|
/* Initialize the service cache. */
|
|
|
|
rend_cache_init();
|
2005-12-14 21:40:40 +01:00
|
|
|
addressmap_init(); /* Init the client dns cache. Do it always, since it's
|
|
|
|
* cheap. */
|
2004-11-23 10:00:55 +01:00
|
|
|
|
2007-11-01 05:38:43 +01:00
|
|
|
/* We search for the "quiet" option first, since it decides whether we
|
|
|
|
* will log anything at all to the command line. */
|
|
|
|
for (i=1;i<argc;++i) {
|
2008-03-27 18:25:49 +01:00
|
|
|
if (!strcmp(argv[i], "--hush"))
|
2007-11-01 05:38:43 +01:00
|
|
|
quiet = 1;
|
2008-03-27 18:25:49 +01:00
|
|
|
if (!strcmp(argv[i], "--quiet"))
|
|
|
|
quiet = 2;
|
2007-11-01 05:38:43 +01:00
|
|
|
}
|
2008-03-27 18:25:49 +01:00
|
|
|
/* give it somewhere to log to initially */
|
|
|
|
switch (quiet) {
|
|
|
|
case 2:
|
|
|
|
/* no initial logging */
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
add_temp_log(LOG_WARN);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
add_temp_log(LOG_NOTICE);
|
2007-11-01 05:38:43 +01:00
|
|
|
}
|
2005-01-27 22:45:32 +01:00
|
|
|
|
2007-03-10 07:33:44 +01:00
|
|
|
log(LOG_NOTICE, LD_GENERAL, "Tor v%s. This is experimental software. "
|
2007-05-22 17:48:46 +02:00
|
|
|
"Do not rely on it for strong anonymity. (Running on %s)",get_version(),
|
2007-03-10 07:33:44 +01:00
|
|
|
get_uname());
|
2003-10-18 02:13:08 +02:00
|
|
|
|
2004-03-10 07:26:38 +01:00
|
|
|
if (network_init()<0) {
|
2006-09-30 00:33:40 +02:00
|
|
|
log_err(LD_BUG,"Error initializing network; exiting.");
|
2004-06-12 21:45:46 +02:00
|
|
|
return -1;
|
2004-03-10 07:26:38 +01:00
|
|
|
}
|
|
|
|
atexit(exit_function);
|
|
|
|
|
2005-07-23 03:58:05 +02:00
|
|
|
if (options_init_from_torrc(argc,argv) < 0) {
|
2006-05-08 06:28:49 +02:00
|
|
|
log_err(LD_CONFIG,"Reading config failed--see warnings above.");
|
2004-01-19 07:12:32 +01:00
|
|
|
return -1;
|
2004-11-09 05:28:18 +01:00
|
|
|
}
|
2004-01-19 07:12:32 +01:00
|
|
|
|
2003-12-14 05:39:23 +01:00
|
|
|
#ifndef MS_WINDOWS
|
2004-11-28 10:05:49 +01:00
|
|
|
if (geteuid()==0)
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_GENERAL,"You are running Tor as root. You don't need to, "
|
|
|
|
"and you probably shouldn't.");
|
2003-12-14 05:39:23 +01:00
|
|
|
#endif
|
2004-03-21 00:27:22 +01:00
|
|
|
|
2005-06-20 20:56:35 +02:00
|
|
|
crypto_global_init(get_options()->HardwareAccel);
|
2008-03-21 20:18:57 +01:00
|
|
|
if (crypto_seed_rng(1)) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_err(LD_BUG, "Unable to seed random number generator. Exiting.");
|
2005-06-06 22:02:33 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2005-07-28 21:01:48 +02:00
|
|
|
|
2004-06-12 21:45:46 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-01 22:06:26 +02:00
|
|
|
static tor_lockfile_t *lockfile = NULL;
|
|
|
|
|
2008-11-10 21:40:01 +01:00
|
|
|
/** Try to grab the lock file described in <b>options</b>, if we do not
|
|
|
|
* already have it. If <b>err_if_locked</b> is true, warn if somebody else is
|
|
|
|
* holding the lock, and exit if we can't get it after waiting. Otherwise,
|
|
|
|
* return -1 if we can't get the lockfile. Return 0 on success.
|
|
|
|
*/
|
2008-09-01 22:06:26 +02:00
|
|
|
int
|
|
|
|
try_locking(or_options_t *options, int err_if_locked)
|
|
|
|
{
|
|
|
|
if (lockfile)
|
|
|
|
return 0;
|
|
|
|
else {
|
|
|
|
char *fname = options_get_datadir_fname2_suffix(options, "lock",NULL,NULL);
|
|
|
|
int already_locked = 0;
|
|
|
|
tor_lockfile_t *lf = tor_lockfile_lock(fname, 0, &already_locked);
|
|
|
|
tor_free(fname);
|
|
|
|
if (!lf) {
|
|
|
|
if (err_if_locked && already_locked) {
|
|
|
|
int r;
|
|
|
|
log_warn(LD_GENERAL, "It looks like another Tor process is running "
|
|
|
|
"with the same data directory. Waiting 5 seconds to see "
|
|
|
|
"if it goes away.");
|
2008-09-04 23:58:09 +02:00
|
|
|
#ifndef WIN32
|
2008-09-01 22:06:26 +02:00
|
|
|
sleep(5);
|
2008-09-04 23:58:09 +02:00
|
|
|
#else
|
|
|
|
Sleep(5000);
|
|
|
|
#endif
|
2008-09-01 22:06:26 +02:00
|
|
|
r = try_locking(options, 0);
|
|
|
|
if (r<0) {
|
|
|
|
log_err(LD_GENERAL, "No, it's still there. Exiting.");
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
lockfile = lf;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
have_lockfile(void)
|
|
|
|
{
|
|
|
|
return lockfile != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
release_lockfile(void)
|
|
|
|
{
|
|
|
|
if (lockfile) {
|
|
|
|
tor_lockfile_unlock(lockfile);
|
|
|
|
lockfile = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-03 08:23:48 +01:00
|
|
|
/** Free all memory that we might have allocated somewhere.
|
2007-07-16 06:33:47 +02:00
|
|
|
* If <b>postfork</b>, we are a worker process and we want to free
|
|
|
|
* only the parts of memory that we won't touch. If !<b>postfork</b>,
|
|
|
|
* Tor is shutting down and we should free everything.
|
2005-02-03 08:23:48 +01:00
|
|
|
*
|
2007-07-16 06:33:47 +02:00
|
|
|
* Helps us find the real leaks with dmalloc and the like. Also valgrind
|
|
|
|
* should then report 0 reachable in its leak report (in an ideal world --
|
|
|
|
* in practice libevent, ssl, libc etc never quite free everything). */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
tor_free_all(int postfork)
|
2005-02-11 00:18:39 +01:00
|
|
|
{
|
2006-09-25 22:38:58 +02:00
|
|
|
if (!postfork) {
|
|
|
|
evdns_shutdown(1);
|
|
|
|
}
|
2007-12-17 23:44:11 +01:00
|
|
|
geoip_free_all();
|
2007-07-27 20:33:30 +02:00
|
|
|
dirvote_free_all();
|
2005-09-15 01:42:06 +02:00
|
|
|
routerlist_free_all();
|
2007-10-08 23:21:50 +02:00
|
|
|
networkstatus_free_all();
|
2005-02-22 01:53:08 +01:00
|
|
|
addressmap_free_all();
|
2005-05-16 12:32:10 +02:00
|
|
|
set_exit_redirects(NULL); /* free the registered exit redirects */
|
2005-02-11 00:18:39 +01:00
|
|
|
dirserv_free_all();
|
|
|
|
rend_service_free_all();
|
2005-02-28 23:38:00 +01:00
|
|
|
rend_cache_free_all();
|
2008-08-12 18:12:26 +02:00
|
|
|
rend_service_authorization_free_all();
|
2005-02-11 00:18:39 +01:00
|
|
|
rep_hist_free_all();
|
2007-04-30 19:46:13 +02:00
|
|
|
hs_usage_free_all();
|
2005-02-11 02:26:47 +01:00
|
|
|
dns_free_all();
|
|
|
|
clear_pending_onions();
|
|
|
|
circuit_free_all();
|
2006-01-10 23:42:44 +01:00
|
|
|
entry_guards_free_all();
|
2005-02-11 02:26:47 +01:00
|
|
|
connection_free_all();
|
2007-07-17 11:26:45 +02:00
|
|
|
buf_shrink_freelists(1);
|
2008-04-08 19:29:05 +02:00
|
|
|
memarea_clear_freelist();
|
2005-05-03 05:51:20 +02:00
|
|
|
if (!postfork) {
|
|
|
|
config_free_all();
|
2005-10-06 01:20:45 +02:00
|
|
|
router_free_all();
|
2008-03-27 16:05:28 +01:00
|
|
|
policies_free_all();
|
2005-05-03 05:51:20 +02:00
|
|
|
}
|
2007-04-11 02:30:29 +02:00
|
|
|
free_cell_pool();
|
2008-03-27 16:05:28 +01:00
|
|
|
if (!postfork) {
|
|
|
|
tor_tls_free_all();
|
|
|
|
}
|
2005-02-11 02:26:47 +01:00
|
|
|
/* stuff in main.c */
|
2008-09-09 22:43:31 +02:00
|
|
|
if (connection_array)
|
|
|
|
smartlist_free(connection_array);
|
|
|
|
if (closeable_connection_lst)
|
|
|
|
smartlist_free(closeable_connection_lst);
|
|
|
|
if (active_linked_connection_lst)
|
|
|
|
smartlist_free(active_linked_connection_lst);
|
2005-05-24 19:13:15 +02:00
|
|
|
tor_free(timeout_event);
|
2008-08-05 22:08:19 +02:00
|
|
|
/* Stuff in util.c and address.c*/
|
2005-05-03 05:51:20 +02:00
|
|
|
if (!postfork) {
|
2007-07-23 00:51:07 +02:00
|
|
|
escaped(NULL);
|
|
|
|
esc_router_info(NULL);
|
2007-07-16 06:33:47 +02:00
|
|
|
logs_free_all(); /* free log strings. do this last so logs keep working. */
|
2005-05-03 05:51:20 +02:00
|
|
|
}
|
2005-02-03 08:23:48 +01:00
|
|
|
}
|
|
|
|
|
2004-07-23 00:15:36 +02:00
|
|
|
/** Do whatever cleanup is necessary before shutting Tor down. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2005-09-30 03:09:52 +02:00
|
|
|
tor_cleanup(void)
|
|
|
|
{
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2004-07-23 00:15:36 +02:00
|
|
|
/* Remove our pid file. We don't care if there was an error when we
|
|
|
|
* unlink, nothing we could do about it anyways. */
|
2006-03-12 21:51:02 +01:00
|
|
|
if (options->command == CMD_RUN_TOR) {
|
|
|
|
if (options->PidFile)
|
|
|
|
unlink(options->PidFile);
|
|
|
|
if (accounting_is_enabled(options))
|
2006-12-07 19:57:37 +01:00
|
|
|
accounting_record_bandwidth_usage(time(NULL), get_or_state());
|
2006-12-07 21:11:30 +01:00
|
|
|
or_state_mark_dirty(get_or_state(), 0); /* force an immediate save. */
|
|
|
|
or_state_save(time(NULL));
|
2007-08-20 18:34:17 +02:00
|
|
|
if (authdir_mode_tests_reachability(options))
|
|
|
|
rep_hist_record_mtbf_data();
|
2006-03-12 21:51:02 +01:00
|
|
|
}
|
2007-07-29 03:18:00 +02:00
|
|
|
#ifdef USE_DMALLOC
|
|
|
|
dmalloc_log_stats();
|
|
|
|
#endif
|
2007-05-24 20:12:52 +02:00
|
|
|
tor_free_all(0); /* We could move tor_free_all back into the ifdef below
|
|
|
|
later, if it makes shutdown unacceptably slow. But for
|
|
|
|
now, leave it here: it's helped us catch bugs in the
|
|
|
|
past. */
|
2005-02-28 03:52:51 +01:00
|
|
|
crypto_global_cleanup();
|
2005-02-03 08:25:10 +01:00
|
|
|
#ifdef USE_DMALLOC
|
|
|
|
dmalloc_log_unfreed();
|
|
|
|
dmalloc_shutdown();
|
|
|
|
#endif
|
2004-06-12 21:45:46 +02:00
|
|
|
}
|
|
|
|
|
2005-01-12 13:18:46 +01:00
|
|
|
/** Read/create keys as needed, and echo our fingerprint to stdout. */
|
2007-09-06 20:19:09 +02:00
|
|
|
/* static */ int
|
2005-06-11 20:52:12 +02:00
|
|
|
do_list_fingerprint(void)
|
2004-10-30 21:18:37 +02:00
|
|
|
{
|
|
|
|
char buf[FINGERPRINT_LEN+1];
|
|
|
|
crypto_pk_env_t *k;
|
2004-11-06 10:22:08 +01:00
|
|
|
const char *nickname = get_options()->Nickname;
|
2004-11-21 00:16:03 +01:00
|
|
|
if (!server_mode(get_options())) {
|
2006-08-24 02:54:18 +02:00
|
|
|
log_err(LD_GENERAL,
|
|
|
|
"Clients don't have long-term identity keys. Exiting.\n");
|
2006-08-24 01:45:03 +02:00
|
|
|
return -1;
|
2004-11-11 14:24:10 +01:00
|
|
|
}
|
|
|
|
tor_assert(nickname);
|
2004-10-30 21:18:37 +02:00
|
|
|
if (init_keys() < 0) {
|
2006-09-30 00:33:40 +02:00
|
|
|
log_err(LD_BUG,"Error initializing keys; can't display fingerprint");
|
2006-08-24 01:45:03 +02:00
|
|
|
return -1;
|
2004-10-30 21:18:37 +02:00
|
|
|
}
|
|
|
|
if (!(k = get_identity_key())) {
|
2006-02-13 10:37:53 +01:00
|
|
|
log_err(LD_GENERAL,"Error: missing identity key.");
|
2006-08-24 01:45:03 +02:00
|
|
|
return -1;
|
2004-11-03 00:47:32 +01:00
|
|
|
}
|
2004-10-30 21:18:37 +02:00
|
|
|
if (crypto_pk_get_fingerprint(k, buf, 1)<0) {
|
2006-08-24 02:54:18 +02:00
|
|
|
log_err(LD_BUG, "Error computing fingerprint");
|
2006-08-24 01:45:03 +02:00
|
|
|
return -1;
|
2004-10-30 21:18:37 +02:00
|
|
|
}
|
2004-11-11 14:24:10 +01:00
|
|
|
printf("%s %s\n", nickname, buf);
|
2006-08-24 01:45:03 +02:00
|
|
|
return 0;
|
2004-10-30 21:18:37 +02:00
|
|
|
}
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
/** Entry point for password hashing: take the desired password from
|
|
|
|
* the command line, and print its salted hash to stdout. **/
|
2007-09-06 20:19:09 +02:00
|
|
|
/* static */ void
|
2005-06-11 20:52:12 +02:00
|
|
|
do_hash_password(void)
|
2004-11-03 20:49:03 +01:00
|
|
|
{
|
|
|
|
|
|
|
|
char output[256];
|
|
|
|
char key[S2K_SPECIFIER_LEN+DIGEST_LEN];
|
|
|
|
|
|
|
|
crypto_rand(key, S2K_SPECIFIER_LEN-1);
|
|
|
|
key[S2K_SPECIFIER_LEN-1] = (uint8_t)96; /* Hash 64 K of data. */
|
|
|
|
secret_to_key(key+S2K_SPECIFIER_LEN, DIGEST_LEN,
|
2004-11-06 06:18:11 +01:00
|
|
|
get_options()->command_arg, strlen(get_options()->command_arg),
|
2004-11-03 20:49:03 +01:00
|
|
|
key);
|
2005-05-23 04:31:53 +02:00
|
|
|
base16_encode(output, sizeof(output), key, sizeof(key));
|
|
|
|
printf("16:%s\n",output);
|
2004-11-03 20:49:03 +01:00
|
|
|
}
|
|
|
|
|
2007-01-22 08:51:06 +01:00
|
|
|
/** Main entry point for the Tor process. Called from main(). */
|
|
|
|
/* This function is distinct from main() only so we can link main.c into
|
|
|
|
* the unittest binary without conflicting with the unittests' main. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
tor_main(int argc, char *argv[])
|
|
|
|
{
|
2006-08-24 01:45:03 +02:00
|
|
|
int result = 0;
|
2008-04-23 22:32:31 +02:00
|
|
|
tor_threads_init();
|
2008-03-26 18:25:16 +01:00
|
|
|
init_logging();
|
2005-10-03 22:20:38 +02:00
|
|
|
#ifdef USE_DMALLOC
|
2008-05-29 16:37:56 +02:00
|
|
|
{
|
2008-09-25 19:36:09 +02:00
|
|
|
int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc, _tor_free);
|
2008-05-29 16:37:56 +02:00
|
|
|
tor_assert(r);
|
|
|
|
}
|
2005-10-03 22:20:38 +02:00
|
|
|
#endif
|
2007-09-06 19:42:05 +02:00
|
|
|
#ifdef NT_SERVICE
|
2007-09-06 20:19:09 +02:00
|
|
|
{
|
|
|
|
int done = 0;
|
|
|
|
result = nt_service_parse_options(argc, argv, &done);
|
|
|
|
if (done) return result;
|
|
|
|
}
|
2005-02-23 06:34:25 +01:00
|
|
|
#endif
|
2004-06-12 21:45:46 +02:00
|
|
|
if (tor_init(argc, argv)<0)
|
|
|
|
return -1;
|
2004-11-06 06:18:11 +01:00
|
|
|
switch (get_options()->command) {
|
2004-10-30 21:18:37 +02:00
|
|
|
case CMD_RUN_TOR:
|
2007-09-06 19:42:05 +02:00
|
|
|
#ifdef NT_SERVICE
|
|
|
|
nt_service_set_state(SERVICE_RUNNING);
|
2005-02-23 06:34:25 +01:00
|
|
|
#endif
|
2006-08-24 01:45:03 +02:00
|
|
|
result = do_main_loop();
|
2004-10-30 21:18:37 +02:00
|
|
|
break;
|
|
|
|
case CMD_LIST_FINGERPRINT:
|
2006-08-24 01:45:03 +02:00
|
|
|
result = do_list_fingerprint();
|
2004-10-30 21:18:37 +02:00
|
|
|
break;
|
2004-11-03 20:49:03 +01:00
|
|
|
case CMD_HASH_PASSWORD:
|
|
|
|
do_hash_password();
|
2006-08-24 01:45:03 +02:00
|
|
|
result = 0;
|
2004-11-03 20:49:03 +01:00
|
|
|
break;
|
2005-05-07 06:49:09 +02:00
|
|
|
case CMD_VERIFY_CONFIG:
|
|
|
|
printf("Configuration was valid\n");
|
2006-08-24 01:45:03 +02:00
|
|
|
result = 0;
|
2005-05-07 06:49:09 +02:00
|
|
|
break;
|
2006-08-11 09:31:16 +02:00
|
|
|
case CMD_RUN_UNITTESTS: /* only set by test.c */
|
2004-10-30 21:18:37 +02:00
|
|
|
default:
|
2006-02-13 10:37:53 +01:00
|
|
|
log_warn(LD_BUG,"Illegal command number %d: internal error.",
|
|
|
|
get_options()->command);
|
2006-08-24 01:45:03 +02:00
|
|
|
result = -1;
|
2004-10-30 21:18:37 +02:00
|
|
|
}
|
2004-06-12 21:45:46 +02:00
|
|
|
tor_cleanup();
|
2006-08-24 01:45:03 +02:00
|
|
|
return result;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2005-10-05 04:06:36 +02:00
|
|
|
|