2006-02-09 06:46:49 +01:00
|
|
|
/* Copyright (c) 2001 Matej Pfajfar.
|
|
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
|
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-14 21:40:40 +01:00
|
|
|
const char connection_c_id[] =
|
|
|
|
"$Id$";
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 05:56:58 +02:00
|
|
|
/**
|
|
|
|
* \file connection.c
|
2004-05-10 09:37:10 +02:00
|
|
|
* \brief General high-level functions to handle reading and writing
|
|
|
|
* on connections.
|
2004-05-10 05:56:58 +02:00
|
|
|
**/
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#include "or.h"
|
|
|
|
|
2005-10-17 05:17:29 +02:00
|
|
|
static connection_t *connection_create_listener(const char *listenaddress,
|
|
|
|
uint16_t listenport, int type);
|
2006-08-10 11:01:37 +02:00
|
|
|
static int connection_init_accepted_conn(connection_t *conn,
|
|
|
|
uint8_t listener_type);
|
2003-10-09 20:45:14 +02:00
|
|
|
static int connection_handle_listener_read(connection_t *conn, int new_type);
|
2006-07-26 21:07:26 +02:00
|
|
|
static int connection_receiver_bucket_should_increase(or_connection_t *conn);
|
2004-05-12 21:17:09 +02:00
|
|
|
static int connection_finished_flushing(connection_t *conn);
|
2006-06-18 09:38:55 +02:00
|
|
|
static int connection_flushed_some(connection_t *conn);
|
2004-05-12 21:17:09 +02:00
|
|
|
static int connection_finished_connecting(connection_t *conn);
|
2004-11-21 11:14:57 +01:00
|
|
|
static int connection_reached_eof(connection_t *conn);
|
2004-11-21 08:43:12 +01:00
|
|
|
static int connection_read_to_buf(connection_t *conn, int *max_to_read);
|
|
|
|
static int connection_process_inbuf(connection_t *conn, int package_partial);
|
2005-08-03 22:42:17 +02:00
|
|
|
static void client_check_address_changed(int sock);
|
|
|
|
|
|
|
|
static uint32_t last_interface_ip = 0;
|
|
|
|
static smartlist_t *outgoing_addrs = NULL;
|
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
|
|
|
|
|
|
|
/**************************************************************/
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/**
|
|
|
|
* Return the human-readable name for the connection type <b>type</b>
|
|
|
|
*/
|
2005-04-07 22:25:22 +02:00
|
|
|
const char *
|
|
|
|
conn_type_to_string(int type)
|
|
|
|
{
|
|
|
|
static char buf[64];
|
|
|
|
switch (type) {
|
|
|
|
case CONN_TYPE_OR_LISTENER: return "OR listener";
|
|
|
|
case CONN_TYPE_OR: return "OR";
|
|
|
|
case CONN_TYPE_EXIT: return "Exit";
|
2005-07-14 10:43:19 +02:00
|
|
|
case CONN_TYPE_AP_LISTENER: return "Socks listener";
|
2006-08-10 11:01:37 +02:00
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER: return "Transparent listener";
|
2005-07-14 10:43:19 +02:00
|
|
|
case CONN_TYPE_AP: return "Socks";
|
|
|
|
case CONN_TYPE_DIR_LISTENER: return "Directory listener";
|
|
|
|
case CONN_TYPE_DIR: return "Directory";
|
2005-04-07 22:25:22 +02:00
|
|
|
case CONN_TYPE_DNSWORKER: return "DNS worker";
|
|
|
|
case CONN_TYPE_CPUWORKER: return "CPU worker";
|
|
|
|
case CONN_TYPE_CONTROL_LISTENER: return "Control listener";
|
|
|
|
case CONN_TYPE_CONTROL: return "Control";
|
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Bug: unknown connection type %d", type);
|
2005-04-07 22:25:22 +02:00
|
|
|
tor_snprintf(buf, sizeof(buf), "unknown [%d]", type);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/**
|
|
|
|
* Return the human-readable name for the connection state <b>state</b>
|
|
|
|
* for the connection type <b>type</b>
|
|
|
|
*/
|
2005-04-07 22:25:22 +02:00
|
|
|
const char *
|
2005-06-11 20:52:12 +02:00
|
|
|
conn_state_to_string(int type, int state)
|
|
|
|
{
|
2005-04-07 22:25:22 +02:00
|
|
|
static char buf[96];
|
|
|
|
switch (type) {
|
|
|
|
case CONN_TYPE_OR_LISTENER:
|
|
|
|
case CONN_TYPE_AP_LISTENER:
|
2006-08-10 11:01:37 +02:00
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER:
|
2005-04-07 22:25:22 +02:00
|
|
|
case CONN_TYPE_DIR_LISTENER:
|
|
|
|
case CONN_TYPE_CONTROL_LISTENER:
|
|
|
|
if (state == LISTENER_STATE_READY)
|
|
|
|
return "ready";
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
switch (state) {
|
|
|
|
case OR_CONN_STATE_CONNECTING: return "connect()ing";
|
|
|
|
case OR_CONN_STATE_PROXY_FLUSHING: return "proxy flushing";
|
|
|
|
case OR_CONN_STATE_PROXY_READING: return "proxy reading";
|
2006-01-05 13:18:34 +01:00
|
|
|
case OR_CONN_STATE_HANDSHAKING: return "handshaking";
|
2005-04-07 22:25:22 +02:00
|
|
|
case OR_CONN_STATE_OPEN: return "open";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
switch (state) {
|
|
|
|
case EXIT_CONN_STATE_RESOLVING: return "waiting for dest info";
|
|
|
|
case EXIT_CONN_STATE_CONNECTING: return "connecting";
|
|
|
|
case EXIT_CONN_STATE_OPEN: return "open";
|
|
|
|
case EXIT_CONN_STATE_RESOLVEFAILED: return "resolve failed";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP:
|
|
|
|
switch (state) {
|
2006-08-10 11:01:37 +02:00
|
|
|
case AP_CONN_STATE_ORIGDST_WAIT:
|
2005-04-07 22:25:22 +02:00
|
|
|
case AP_CONN_STATE_SOCKS_WAIT: return "waiting for dest info";
|
|
|
|
case AP_CONN_STATE_RENDDESC_WAIT: return "waiting for rendezvous desc";
|
|
|
|
case AP_CONN_STATE_CONTROLLER_WAIT: return "waiting for controller";
|
|
|
|
case AP_CONN_STATE_CIRCUIT_WAIT: return "waiting for safe circuit";
|
|
|
|
case AP_CONN_STATE_CONNECT_WAIT: return "waiting for connect";
|
|
|
|
case AP_CONN_STATE_RESOLVE_WAIT: return "waiting for resolve";
|
|
|
|
case AP_CONN_STATE_OPEN: return "open";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
|
|
|
switch (state) {
|
|
|
|
case DIR_CONN_STATE_CONNECTING: return "connecting";
|
|
|
|
case DIR_CONN_STATE_CLIENT_SENDING: return "client sending";
|
2006-01-07 03:12:38 +01:00
|
|
|
case DIR_CONN_STATE_CLIENT_READING: return "client reading";
|
2005-04-07 22:25:22 +02:00
|
|
|
case DIR_CONN_STATE_SERVER_COMMAND_WAIT: return "waiting for command";
|
|
|
|
case DIR_CONN_STATE_SERVER_WRITING: return "writing";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_DNSWORKER:
|
|
|
|
switch (state) {
|
|
|
|
case DNSWORKER_STATE_IDLE: return "idle";
|
|
|
|
case DNSWORKER_STATE_BUSY: return "busy";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_CPUWORKER:
|
|
|
|
switch (state) {
|
|
|
|
case CPUWORKER_STATE_IDLE: return "idle";
|
|
|
|
case CPUWORKER_STATE_BUSY_ONION: return "busy with onion";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
switch (state) {
|
2005-06-17 20:49:55 +02:00
|
|
|
case CONTROL_CONN_STATE_OPEN_V0: return "open (protocol v0)";
|
|
|
|
case CONTROL_CONN_STATE_OPEN_V1: return "open (protocol v1)";
|
|
|
|
case CONTROL_CONN_STATE_NEEDAUTH_V0:
|
|
|
|
return "waiting for authentication (protocol unknown)";
|
|
|
|
case CONTROL_CONN_STATE_NEEDAUTH_V1:
|
|
|
|
return "waiting for authentication (protocol v1)";
|
2005-04-07 22:25:22 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Bug: unknown connection state %d (type %d)", state, type);
|
2005-04-07 22:25:22 +02:00
|
|
|
tor_snprintf(buf, sizeof(buf),
|
|
|
|
"unknown state [%d] on unknown [%s] connection",
|
|
|
|
state, conn_type_to_string(type));
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Allocate space for a new connection_t. This function just initializes
|
2004-05-09 18:33:04 +02:00
|
|
|
* conn; you must call connection_add() to link it into the main array.
|
|
|
|
*
|
2006-07-27 07:03:57 +02:00
|
|
|
* Set conn-\>type to <b>type</b>. Set conn-\>s and conn-\>conn_array_index to
|
2004-05-09 18:33:04 +02:00
|
|
|
* -1 to signify they are not yet assigned.
|
|
|
|
*
|
|
|
|
* If conn is not a listener type, allocate buffers for it. If it's
|
|
|
|
* an AP type, allocate space to store the socks_request.
|
|
|
|
*
|
|
|
|
* Assign a pseudorandom next_circ_id between 0 and 2**15.
|
|
|
|
*
|
|
|
|
* Initialize conn's timestamps to now.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
connection_t *
|
|
|
|
connection_new(int type)
|
|
|
|
{
|
2006-07-28 17:11:11 +02:00
|
|
|
static uint32_t n_connections_allocated = 1;
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_t *conn;
|
2003-10-04 05:29:09 +02:00
|
|
|
time_t now = time(NULL);
|
2006-07-26 21:07:26 +02:00
|
|
|
size_t length;
|
|
|
|
uint32_t magic;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
switch (type) {
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
length = sizeof(or_connection_t);
|
|
|
|
magic = OR_CONNECTION_MAGIC;
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
case CONN_TYPE_AP:
|
|
|
|
length = sizeof(edge_connection_t);
|
|
|
|
magic = EDGE_CONNECTION_MAGIC;
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
|
|
|
length = sizeof(dir_connection_t);
|
|
|
|
magic = DIR_CONNECTION_MAGIC;
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
length = sizeof(control_connection_t);
|
|
|
|
magic = CONTROL_CONNECTION_MAGIC;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
length = sizeof(connection_t);
|
|
|
|
magic = BASE_CONNECTION_MAGIC;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
conn = tor_malloc_zero(length);
|
|
|
|
conn->magic = magic;
|
2003-10-15 20:50:16 +02:00
|
|
|
conn->s = -1; /* give it a default of 'not used' */
|
2006-07-27 07:03:57 +02:00
|
|
|
conn->conn_array_index = -1; /* also default to 'not used' */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
conn->type = type;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!connection_is_listener(conn)) { /* listeners never use their buf */
|
2003-10-14 05:06:48 +02:00
|
|
|
conn->inbuf = buf_new();
|
|
|
|
conn->outbuf = buf_new();
|
|
|
|
}
|
2003-11-11 03:41:31 +01:00
|
|
|
if (type == CONN_TYPE_AP) {
|
2006-07-26 21:07:26 +02:00
|
|
|
TO_EDGE_CONN(conn)->socks_request =
|
|
|
|
tor_malloc_zero(sizeof(socks_request_t));
|
2003-11-11 03:41:31 +01:00
|
|
|
}
|
2006-07-28 17:11:11 +02:00
|
|
|
if (CONN_IS_EDGE(conn)) {
|
|
|
|
TO_EDGE_CONN(conn)->global_identifier = n_connections_allocated++;
|
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
if (type == CONN_TYPE_OR)
|
|
|
|
TO_OR_CONN(conn)->next_circ_id = crypto_rand_int(1<<15);
|
2003-12-28 05:46:09 +01:00
|
|
|
|
2003-10-04 05:29:09 +02:00
|
|
|
conn->timestamp_created = now;
|
|
|
|
conn->timestamp_lastread = now;
|
|
|
|
conn->timestamp_lastwritten = now;
|
2002-10-13 15:17:27 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
|
2005-02-25 06:42:01 +01:00
|
|
|
/** Tell libevent that we don't care about <b>conn</b> any more. */
|
|
|
|
void
|
|
|
|
connection_unregister(connection_t *conn)
|
|
|
|
{
|
|
|
|
if (conn->read_event) {
|
|
|
|
if (event_del(conn->read_event))
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Error removing read event for %d", conn->s);
|
2005-02-25 06:42:01 +01:00
|
|
|
tor_free(conn->read_event);
|
|
|
|
}
|
|
|
|
if (conn->write_event) {
|
|
|
|
if (event_del(conn->write_event))
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Error removing write event for %d", conn->s);
|
2005-02-25 06:42:01 +01:00
|
|
|
tor_free(conn->write_event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/** Deallocate memory used by <b>conn</b>. Deallocate its buffers if
|
|
|
|
* necessary, close its socket if necessary, and mark the directory as dirty
|
|
|
|
* if <b>conn</b> is an OR or OP connection.
|
2004-05-09 18:33:04 +02:00
|
|
|
*/
|
2005-01-31 02:02:20 +01:00
|
|
|
static void
|
2005-06-11 20:52:12 +02:00
|
|
|
_connection_free(connection_t *conn)
|
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
void *mem;
|
|
|
|
switch (conn->type) {
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
tor_assert(conn->magic == OR_CONNECTION_MAGIC);
|
|
|
|
mem = TO_OR_CONN(conn);
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP:
|
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
tor_assert(conn->magic == EDGE_CONNECTION_MAGIC);
|
|
|
|
mem = TO_EDGE_CONN(conn);
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
|
|
|
tor_assert(conn->magic == DIR_CONNECTION_MAGIC);
|
|
|
|
mem = TO_DIR_CONN(conn);
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
tor_assert(conn->magic == CONTROL_CONNECTION_MAGIC);
|
|
|
|
mem = TO_CONTROL_CONN(conn);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
tor_assert(conn->magic == BASE_CONNECTION_MAGIC);
|
|
|
|
mem = conn;
|
|
|
|
break;
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!connection_is_listener(conn)) {
|
2003-10-14 05:06:48 +02:00
|
|
|
buf_free(conn->inbuf);
|
|
|
|
buf_free(conn->outbuf);
|
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
|
2003-10-21 11:48:17 +02:00
|
|
|
tor_free(conn->address);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_speaks_cells(conn)) {
|
2006-07-26 21:07:26 +02:00
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
|
|
|
if (or_conn->tls) {
|
|
|
|
tor_tls_free(or_conn->tls);
|
|
|
|
or_conn->tls = NULL;
|
2005-02-28 03:52:51 +01:00
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
|
|
|
|
tor_free(or_conn->nickname);
|
|
|
|
}
|
|
|
|
if (CONN_IS_EDGE(conn)) {
|
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
|
|
|
tor_free(edge_conn->chosen_exit_name);
|
|
|
|
tor_free(edge_conn->socks_request);
|
|
|
|
}
|
|
|
|
if (conn->type == CONN_TYPE_CONTROL) {
|
|
|
|
control_connection_t *control_conn = TO_CONTROL_CONN(conn);
|
|
|
|
tor_free(control_conn->incoming_cmd);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2005-04-06 02:46:57 +02:00
|
|
|
tor_free(conn->read_event); /* Probably already freed by connection_free. */
|
|
|
|
tor_free(conn->write_event); /* Probably already freed by connection_free. */
|
2006-07-26 21:07:26 +02:00
|
|
|
|
|
|
|
if (conn->type == CONN_TYPE_DIR) {
|
|
|
|
dir_connection_t *dir_conn = TO_DIR_CONN(conn);
|
|
|
|
tor_free(dir_conn->requested_resource);
|
|
|
|
if (dir_conn->zlib_state)
|
|
|
|
tor_zlib_free(dir_conn->zlib_state);
|
|
|
|
if (dir_conn->fingerprint_stack) {
|
|
|
|
SMARTLIST_FOREACH(dir_conn->fingerprint_stack, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(dir_conn->fingerprint_stack);
|
|
|
|
}
|
|
|
|
if (dir_conn->cached_dir)
|
|
|
|
cached_dir_decref(dir_conn->cached_dir);
|
|
|
|
}
|
2005-02-25 06:42:01 +01:00
|
|
|
|
2005-02-10 00:16:31 +01:00
|
|
|
if (conn->s >= 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,"closing fd %d.",conn->s);
|
2005-02-10 00:16:31 +01:00
|
|
|
tor_close_socket(conn->s);
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
if (conn->type == CONN_TYPE_OR &&
|
2006-07-26 21:07:26 +02:00
|
|
|
!tor_digest_is_zero(TO_OR_CONN(conn)->identity_digest)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "called on OR conn with non-zeroed identity_digest");
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_or_remove_from_identity_map(TO_OR_CONN(conn));
|
2006-06-18 09:38:55 +02:00
|
|
|
}
|
2005-11-30 04:01:16 +01:00
|
|
|
|
2004-02-25 08:31:46 +01:00
|
|
|
memset(conn, 0xAA, sizeof(connection_t)); /* poison memory */
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_free(mem);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2005-01-31 02:02:20 +01:00
|
|
|
/** Make sure <b>conn</b> isn't in any of the global conn lists; then free it.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_free(connection_t *conn)
|
|
|
|
{
|
2005-01-31 02:02:20 +01:00
|
|
|
tor_assert(conn);
|
|
|
|
tor_assert(!connection_is_on_closeable_list(conn));
|
|
|
|
tor_assert(!connection_in_array(conn));
|
2005-04-06 02:46:57 +02:00
|
|
|
if (connection_speaks_cells(conn)) {
|
|
|
|
if (conn->state == OR_CONN_STATE_OPEN)
|
|
|
|
directory_set_dirty();
|
2006-07-26 21:07:26 +02:00
|
|
|
if (!tor_digest_is_zero(TO_OR_CONN(conn)->identity_digest)) {
|
|
|
|
connection_or_remove_from_identity_map(TO_OR_CONN(conn));
|
2005-12-05 20:15:27 +01:00
|
|
|
}
|
2005-04-06 02:46:57 +02:00
|
|
|
}
|
2005-08-07 21:20:55 +02:00
|
|
|
if (conn->type == CONN_TYPE_CONTROL) {
|
2006-07-26 21:07:26 +02:00
|
|
|
TO_CONTROL_CONN(conn)->event_mask = 0;
|
2005-08-07 21:20:55 +02:00
|
|
|
control_update_global_event_mask();
|
|
|
|
}
|
2005-04-06 02:46:57 +02:00
|
|
|
connection_unregister(conn);
|
2005-01-31 02:02:20 +01:00
|
|
|
_connection_free(conn);
|
|
|
|
}
|
|
|
|
|
2005-08-03 22:42:17 +02:00
|
|
|
/** Call _connection_free() on every connection in our array, and release all
|
|
|
|
* storage helpd by connection.c. This is used by cpuworkers and dnsworkers
|
|
|
|
* when they fork, so they don't keep resources held open (especially
|
|
|
|
* sockets).
|
2005-01-31 02:02:20 +01:00
|
|
|
*
|
|
|
|
* Don't do the checks in connection_free(), because they will
|
|
|
|
* fail.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_free_all(void)
|
|
|
|
{
|
2004-01-06 08:53:40 +01:00
|
|
|
int i, n;
|
|
|
|
connection_t **carray;
|
|
|
|
|
|
|
|
get_connection_array(&carray,&n);
|
2005-08-07 21:27:38 +02:00
|
|
|
|
|
|
|
/* We don't want to log any messages to controllers. */
|
|
|
|
for (i=0;i<n;i++)
|
|
|
|
if (carray[i]->type == CONN_TYPE_CONTROL)
|
2006-07-26 21:07:26 +02:00
|
|
|
TO_CONTROL_CONN(carray[i])->event_mask = 0;
|
2005-08-07 21:27:38 +02:00
|
|
|
control_update_global_event_mask();
|
|
|
|
|
2005-12-05 20:15:27 +01:00
|
|
|
/* Unlink everything from the identity map. */
|
|
|
|
connection_or_clear_identity_map();
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
for (i=0;i<n;i++)
|
2005-01-31 02:02:20 +01:00
|
|
|
_connection_free(carray[i]);
|
2005-08-04 20:29:01 +02:00
|
|
|
|
|
|
|
if (outgoing_addrs) {
|
|
|
|
SMARTLIST_FOREACH(outgoing_addrs, void*, addr, tor_free(addr));
|
|
|
|
smartlist_free(outgoing_addrs);
|
|
|
|
outgoing_addrs = NULL;
|
|
|
|
}
|
2004-01-06 08:53:40 +01:00
|
|
|
}
|
|
|
|
|
2004-11-15 08:50:15 +01:00
|
|
|
/** Do any cleanup needed:
|
|
|
|
* - Directory conns that failed to fetch a rendezvous descriptor
|
|
|
|
* need to inform pending rendezvous streams.
|
|
|
|
* - OR conns need to call rep_hist_note_*() to record status.
|
|
|
|
* - AP conns need to send a socks reject if necessary.
|
|
|
|
* - Exit conns need to call connection_dns_remove() if necessary.
|
|
|
|
* - AP and Exit conns need to send an end cell if they can.
|
|
|
|
* - DNS conns need to fail any resolves that are pending on them.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_about_to_close_connection(connection_t *conn)
|
2004-05-12 22:36:44 +02:00
|
|
|
{
|
2005-01-31 02:27:49 +01:00
|
|
|
circuit_t *circ;
|
2006-07-26 21:07:26 +02:00
|
|
|
dir_connection_t *dir_conn;
|
|
|
|
or_connection_t *or_conn;
|
|
|
|
edge_connection_t *edge_conn;
|
2004-05-20 01:32:20 +02:00
|
|
|
|
2004-06-02 20:32:24 +02:00
|
|
|
assert(conn->marked_for_close);
|
|
|
|
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn)) {
|
2006-07-26 21:07:26 +02:00
|
|
|
if (!conn->edge_has_sent_end) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Harmless bug: Edge connection (marked at %s:%d) "
|
|
|
|
"hasn't sent end yet?",
|
|
|
|
conn->marked_for_close_file, conn->marked_for_close);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2005-02-01 01:37:16 +01:00
|
|
|
}
|
2004-05-20 01:32:20 +02:00
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (conn->type) {
|
2004-05-12 23:12:33 +02:00
|
|
|
case CONN_TYPE_DIR:
|
2006-07-26 21:07:26 +02:00
|
|
|
dir_conn = TO_DIR_CONN(conn);
|
2005-09-12 09:36:26 +02:00
|
|
|
if (conn->state < DIR_CONN_STATE_CLIENT_FINISHED) {
|
|
|
|
/* It's a directory connection and connecting or fetching
|
|
|
|
* failed: forget about this router, and maybe try again. */
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_dir_request_failed(dir_conn);
|
2006-01-17 05:16:59 +01:00
|
|
|
// XXX if it's rend desc we may want to retry -RD
|
2005-01-03 20:51:10 +01:00
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->purpose == DIR_PURPOSE_FETCH_RENDDESC)
|
2006-07-26 21:07:26 +02:00
|
|
|
rend_client_desc_here(dir_conn->rend_query); /* give it a try */
|
2004-05-12 23:12:33 +02:00
|
|
|
break;
|
2004-05-20 01:32:20 +02:00
|
|
|
case CONN_TYPE_OR:
|
2006-07-26 21:07:26 +02:00
|
|
|
or_conn = TO_OR_CONN(conn);
|
2004-05-20 01:32:20 +02:00
|
|
|
/* Remember why we're closing this connection. */
|
|
|
|
if (conn->state != OR_CONN_STATE_OPEN) {
|
2006-07-26 21:07:26 +02:00
|
|
|
if (connection_or_nonopen_was_started_here(or_conn)) {
|
|
|
|
rep_hist_note_connect_failed(or_conn->identity_digest, time(NULL));
|
|
|
|
entry_guard_set_status(or_conn->identity_digest, 0);
|
|
|
|
router_set_status(or_conn->identity_digest, 0);
|
|
|
|
control_event_or_conn_status(or_conn, OR_CONN_EVENT_FAILED);
|
2004-11-03 19:33:07 +01:00
|
|
|
}
|
2004-11-12 06:52:19 +01:00
|
|
|
} else if (conn->hold_open_until_flushed) {
|
|
|
|
/* XXXX009 We used to have an arg that told us whether we closed the
|
|
|
|
* connection on purpose or not. Can we use hold_open_until_flushed
|
|
|
|
* instead? We only set it when we are intentionally closing a
|
|
|
|
* connection. -NM
|
|
|
|
*
|
|
|
|
* (Of course, now things we set to close which expire rather than
|
|
|
|
* flushing still get noted as dead, not disconnected. But this is an
|
|
|
|
* improvement. -NM
|
|
|
|
*/
|
2006-07-26 21:07:26 +02:00
|
|
|
rep_hist_note_disconnect(or_conn->identity_digest, time(NULL));
|
|
|
|
control_event_or_conn_status(or_conn, OR_CONN_EVENT_CLOSED);
|
|
|
|
} else if (or_conn->identity_digest) {
|
|
|
|
rep_hist_note_connection_died(or_conn->identity_digest, time(NULL));
|
|
|
|
control_event_or_conn_status(or_conn, OR_CONN_EVENT_CLOSED);
|
2004-05-20 01:32:20 +02:00
|
|
|
}
|
|
|
|
break;
|
2004-05-12 23:12:33 +02:00
|
|
|
case CONN_TYPE_AP:
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_conn = TO_EDGE_CONN(conn);
|
|
|
|
if (edge_conn->socks_request->has_finished == 0) {
|
2005-03-24 00:19:18 +01:00
|
|
|
/* since conn gets removed right after this function finishes,
|
|
|
|
* there's no point trying to send back a reply at this point. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG,"Bug: Closing stream (marked at %s:%d) without sending"
|
|
|
|
" back a socks reply.",
|
|
|
|
conn->marked_for_close_file, conn->marked_for_close);
|
2004-11-03 19:33:07 +01:00
|
|
|
} else {
|
2006-07-26 21:07:26 +02:00
|
|
|
control_event_stream_status(edge_conn, STREAM_EVENT_CLOSED);
|
2004-05-20 01:32:20 +02:00
|
|
|
}
|
|
|
|
break;
|
2004-05-12 23:12:33 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_conn = TO_EDGE_CONN(conn);
|
2004-05-21 14:25:15 +02:00
|
|
|
if (conn->state == EXIT_CONN_STATE_RESOLVING) {
|
2006-07-26 21:07:26 +02:00
|
|
|
circ = circuit_get_by_edge_conn(edge_conn);
|
2005-01-31 02:27:49 +01:00
|
|
|
if (circ)
|
2006-07-26 21:07:26 +02:00
|
|
|
circuit_detach_stream(circ, edge_conn);
|
|
|
|
connection_dns_remove(edge_conn);
|
2004-05-21 14:25:15 +02:00
|
|
|
}
|
2004-05-20 01:32:20 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_DNSWORKER:
|
|
|
|
if (conn->state == DNSWORKER_STATE_BUSY) {
|
|
|
|
dns_cancel_pending_resolve(conn->address);
|
2004-05-12 23:12:33 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2004-05-12 22:36:44 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Close the underlying socket for <b>conn</b>, so we don't try to
|
|
|
|
* flush it. Must be used in conjunction with (right before)
|
|
|
|
* connection_mark_for_close().
|
2004-02-28 20:14:11 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_close_immediate(connection_t *conn)
|
2004-02-28 20:14:11 +01:00
|
|
|
{
|
|
|
|
assert_connection_ok(conn,0);
|
|
|
|
if (conn->s < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,"Bug: Attempt to close already-closed connection.");
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2004-02-28 20:14:11 +01:00
|
|
|
return;
|
|
|
|
}
|
2004-03-03 03:07:57 +01:00
|
|
|
if (conn->outbuf_flushlen) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,"fd %d, type %s, state %s, %d bytes on outbuf.",
|
|
|
|
conn->s, conn_type_to_string(conn->type),
|
|
|
|
conn_state_to_string(conn->type, conn->state),
|
|
|
|
(int)conn->outbuf_flushlen);
|
2004-03-03 03:07:57 +01:00
|
|
|
}
|
2005-02-25 06:42:01 +01:00
|
|
|
|
|
|
|
connection_unregister(conn);
|
|
|
|
|
2004-04-28 23:14:56 +02:00
|
|
|
tor_close_socket(conn->s);
|
2004-02-28 20:14:11 +01:00
|
|
|
conn->s = -1;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!connection_is_listener(conn)) {
|
2004-03-03 02:58:45 +01:00
|
|
|
buf_clear(conn->outbuf);
|
|
|
|
conn->outbuf_flushlen = 0;
|
|
|
|
}
|
2004-02-28 20:14:11 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Mark <b>conn</b> to be closed next time we loop through
|
2004-11-15 08:50:15 +01:00
|
|
|
* conn_close_if_marked() in main.c. */
|
2005-04-03 07:22:33 +02:00
|
|
|
void
|
|
|
|
_connection_mark_for_close(connection_t *conn, int line, const char *file)
|
2004-02-27 23:00:26 +01:00
|
|
|
{
|
|
|
|
assert_connection_ok(conn,0);
|
2005-04-03 07:22:33 +02:00
|
|
|
tor_assert(line);
|
|
|
|
tor_assert(file);
|
2004-02-27 23:00:26 +01:00
|
|
|
|
|
|
|
if (conn->marked_for_close) {
|
2005-10-25 09:04:36 +02:00
|
|
|
log(LOG_WARN,LD_BUG,"Duplicate call to connection_mark_for_close at %s:%d"
|
2005-04-03 07:22:33 +02:00
|
|
|
" (first at %s:%d)", file, line, conn->marked_for_close_file,
|
|
|
|
conn->marked_for_close);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2005-04-03 07:22:33 +02:00
|
|
|
return;
|
2004-02-27 23:00:26 +01:00
|
|
|
}
|
|
|
|
|
2005-04-03 07:22:33 +02:00
|
|
|
conn->marked_for_close = line;
|
|
|
|
conn->marked_for_close_file = file;
|
2005-01-12 07:42:32 +01:00
|
|
|
add_connection_to_closeable_list(conn);
|
2004-03-29 22:04:09 +02:00
|
|
|
|
|
|
|
/* in case we're going to be held-open-til-flushed, reset
|
|
|
|
* the number of seconds since last successful write, so
|
|
|
|
* we get our whole 15 seconds */
|
|
|
|
conn->timestamp_lastwritten = time(NULL);
|
2004-02-27 23:00:26 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Find each connection that has hold_open_until_flushed set to
|
|
|
|
* 1 but hasn't written in the past 15 seconds, and set
|
|
|
|
* hold_open_until_flushed to 0. This means it will get cleaned
|
|
|
|
* up in the next loop through close_if_marked() in main.c.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_expire_held_open(void)
|
2004-03-03 06:08:01 +01:00
|
|
|
{
|
|
|
|
connection_t **carray, *conn;
|
|
|
|
int n, i;
|
|
|
|
time_t now;
|
|
|
|
|
|
|
|
now = time(NULL);
|
|
|
|
|
|
|
|
get_connection_array(&carray, &n);
|
|
|
|
for (i = 0; i < n; ++i) {
|
|
|
|
conn = carray[i];
|
|
|
|
/* If we've been holding the connection open, but we haven't written
|
|
|
|
* for 15 seconds...
|
|
|
|
*/
|
2004-03-03 07:26:34 +01:00
|
|
|
if (conn->hold_open_until_flushed) {
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn->marked_for_close);
|
2004-03-03 07:26:34 +01:00
|
|
|
if (now - conn->timestamp_lastwritten >= 15) {
|
2005-10-17 03:29:28 +02:00
|
|
|
int severity;
|
|
|
|
if (conn->type == CONN_TYPE_EXIT ||
|
2005-12-14 21:40:40 +01:00
|
|
|
(conn->type == CONN_TYPE_DIR &&
|
|
|
|
conn->purpose == DIR_PURPOSE_SERVER))
|
2005-10-17 03:29:28 +02:00
|
|
|
severity = LOG_INFO;
|
|
|
|
else
|
|
|
|
severity = LOG_NOTICE;
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(severity, LD_NET,
|
2005-12-14 21:40:40 +01:00
|
|
|
"Giving up on marked_for_close conn that's been flushing "
|
|
|
|
"for 15s (fd %d, type %s, state %s).",
|
2005-04-07 22:25:22 +02:00
|
|
|
conn->s, conn_type_to_string(conn->type),
|
|
|
|
conn_state_to_string(conn->type, conn->state));
|
2004-03-03 07:26:34 +01:00
|
|
|
conn->hold_open_until_flushed = 0;
|
|
|
|
}
|
2004-03-03 06:08:01 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Bind a new non-blocking socket listening to
|
2005-10-17 05:17:29 +02:00
|
|
|
* <b>listenaddress</b>:<b>listenport</b>, and add this new connection
|
2004-05-10 03:32:57 +02:00
|
|
|
* (of type <b>type</b>) to the connection array.
|
2004-05-19 22:25:44 +02:00
|
|
|
*
|
2005-10-17 05:17:29 +02:00
|
|
|
* If <b>listenaddress</b> includes a port, we bind on that port;
|
|
|
|
* otherwise, we use listenport.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-09-14 04:36:29 +02:00
|
|
|
static connection_t *
|
2005-10-17 05:17:29 +02:00
|
|
|
connection_create_listener(const char *listenaddress, uint16_t listenport,
|
2005-09-14 04:36:29 +02:00
|
|
|
int type)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-10-17 05:17:29 +02:00
|
|
|
struct sockaddr_in listenaddr; /* where to bind */
|
2005-07-15 00:56:17 +02:00
|
|
|
char *address = NULL;
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_t *conn;
|
2004-10-12 17:52:09 +02:00
|
|
|
uint16_t usePort;
|
2004-10-16 23:53:30 +02:00
|
|
|
uint32_t addr;
|
2003-10-25 14:01:09 +02:00
|
|
|
int s; /* the socket we're going to make */
|
2005-03-25 00:20:06 +01:00
|
|
|
#ifndef MS_WINDOWS
|
2002-06-27 00:45:49 +02:00
|
|
|
int one=1;
|
2005-03-25 00:20:06 +01:00
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2005-10-17 05:17:29 +02:00
|
|
|
memset(&listenaddr,0,sizeof(struct sockaddr_in));
|
2006-07-06 04:44:07 +02:00
|
|
|
if (parse_addr_port(LOG_WARN, listenaddress, &address, &addr, &usePort)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Error parsing/resolving ListenAddress %s", listenaddress);
|
2005-09-14 04:36:29 +02:00
|
|
|
return NULL;
|
2003-10-25 14:01:09 +02:00
|
|
|
}
|
2004-11-03 02:32:26 +01:00
|
|
|
|
2004-10-12 17:52:09 +02:00
|
|
|
if (usePort==0)
|
2005-10-17 05:17:29 +02:00
|
|
|
usePort = listenport;
|
|
|
|
listenaddr.sin_addr.s_addr = htonl(addr);
|
|
|
|
listenaddr.sin_family = AF_INET;
|
|
|
|
listenaddr.sin_port = htons((uint16_t) usePort);
|
2003-10-25 14:01:09 +02:00
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_NET, "Opening %s on %s:%d",
|
|
|
|
conn_type_to_string(type), address, usePort);
|
2005-07-15 01:04:31 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
s = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
|
2003-12-17 22:09:31 +01:00
|
|
|
if (s < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"Socket creation failed.");
|
2005-07-15 00:56:17 +02:00
|
|
|
goto err;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2005-03-25 00:20:06 +01:00
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
/* REUSEADDR on normal places means you can rebind to the port
|
|
|
|
* right after somebody else has let it go. But REUSEADDR on win32
|
2005-04-06 17:19:32 +02:00
|
|
|
* means you can bind to the port _even when somebody else
|
2005-03-25 00:20:06 +01:00
|
|
|
* already has it bound_. So, don't do that on Win32. */
|
2004-03-09 23:01:17 +01:00
|
|
|
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*) &one, sizeof(one));
|
2005-03-25 00:20:06 +01:00
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2005-10-17 05:17:29 +02:00
|
|
|
if (bind(s,(struct sockaddr *)&listenaddr,sizeof(listenaddr)) < 0) {
|
2006-02-06 06:01:44 +01:00
|
|
|
const char *helpfulhint = "";
|
2006-02-03 13:26:10 +01:00
|
|
|
int e = tor_socket_errno(s);
|
|
|
|
if (ERRNO_IS_EADDRINUSE(e))
|
|
|
|
helpfulhint = ". Is Tor already running?";
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET, "Could not bind to %s:%u: %s%s", address, usePort,
|
|
|
|
tor_socket_strerror(e), helpfulhint);
|
2006-04-01 12:22:57 +02:00
|
|
|
tor_close_socket(s);
|
2005-07-15 00:56:17 +02:00
|
|
|
goto err;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (listen(s,SOMAXCONN) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort,
|
|
|
|
tor_socket_strerror(tor_socket_errno(s)));
|
2006-04-01 12:22:57 +02:00
|
|
|
tor_close_socket(s);
|
2005-07-15 00:56:17 +02:00
|
|
|
goto err;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2003-08-12 05:08:41 +02:00
|
|
|
set_socket_nonblocking(s);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
conn = connection_new(type);
|
|
|
|
conn->s = s;
|
2005-07-15 00:56:17 +02:00
|
|
|
conn->address = address;
|
|
|
|
address = NULL;
|
2005-07-11 19:20:22 +02:00
|
|
|
conn->port = usePort;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_add(conn) < 0) { /* no space, forget it */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"connection_add failed. Giving up.");
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_free(conn);
|
2005-07-15 00:56:17 +02:00
|
|
|
goto err;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,"%s listening on port %u.",
|
|
|
|
conn_type_to_string(type), usePort);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
conn->state = LISTENER_STATE_READY;
|
2002-07-18 08:37:58 +02:00
|
|
|
connection_start_reading(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2005-09-14 04:36:29 +02:00
|
|
|
return conn;
|
2005-07-15 00:56:17 +02:00
|
|
|
|
|
|
|
err:
|
|
|
|
tor_free(address);
|
2005-09-14 04:36:29 +02:00
|
|
|
return NULL;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2005-04-06 17:42:35 +02:00
|
|
|
/** Do basic sanity checking on a newly received socket. Return 0
|
|
|
|
* if it looks ok, else return -1. */
|
|
|
|
static int
|
|
|
|
check_sockaddr_in(struct sockaddr *sa, int len, int level)
|
|
|
|
{
|
|
|
|
int ok = 1;
|
|
|
|
struct sockaddr_in *sin=(struct sockaddr_in*)sa;
|
|
|
|
|
|
|
|
if (len != sizeof(struct sockaddr_in)) {
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(level, LD_NET, "Length of address not as expected: %d vs %d",
|
2005-04-06 17:42:35 +02:00
|
|
|
len,(int)sizeof(struct sockaddr_in));
|
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
if (sa->sa_family != AF_INET) {
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(level, LD_NET, "Family of address not as expected: %d vs %d",
|
2005-04-06 17:42:35 +02:00
|
|
|
sa->sa_family, AF_INET);
|
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
if (sin->sin_addr.s_addr == 0 || sin->sin_port == 0) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log_fn(level, LD_NET,
|
|
|
|
"Address for new connection has address/port equal to zero.");
|
2005-04-06 17:42:35 +02:00
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
return ok ? 0 : -1;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** The listener connection <b>conn</b> told poll() it wanted to read.
|
2004-05-10 06:34:48 +02:00
|
|
|
* Call accept() on conn-\>s, and add the new connection if necessary.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
connection_handle_listener_read(connection_t *conn, int new_type)
|
|
|
|
{
|
2002-06-27 00:45:49 +02:00
|
|
|
int news; /* the new socket */
|
|
|
|
connection_t *newconn;
|
2004-10-14 04:47:09 +02:00
|
|
|
/* information about the remote peer when connecting to other routers */
|
|
|
|
struct sockaddr_in remote;
|
2005-04-06 17:42:35 +02:00
|
|
|
char addrbuf[256];
|
2005-05-07 07:55:06 +02:00
|
|
|
/* length of the remote address. Must be whatever accept() needs. */
|
|
|
|
socklen_t remotelen = 256;
|
2005-02-22 09:18:36 +01:00
|
|
|
char tmpbuf[INET_NTOA_BUF_LEN];
|
2005-04-08 05:26:44 +02:00
|
|
|
tor_assert((size_t)remotelen >= sizeof(struct sockaddr_in));
|
2005-04-06 17:42:35 +02:00
|
|
|
memset(addrbuf, 0, sizeof(addrbuf));
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2005-04-06 18:16:31 +02:00
|
|
|
news = accept(conn->s,(struct sockaddr *)&addrbuf,&remotelen);
|
2006-07-21 01:33:11 +02:00
|
|
|
if (news < 0) { /* accept() error */
|
2006-06-05 11:08:10 +02:00
|
|
|
int e = tor_socket_errno(conn->s);
|
2004-10-24 02:55:18 +02:00
|
|
|
if (ERRNO_IS_ACCEPT_EAGAIN(e)) {
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0; /* he hung up before we could accept(). that's fine. */
|
2004-10-24 02:55:18 +02:00
|
|
|
} else if (ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_NET,"accept failed: %s. Dropping incoming connection.",
|
|
|
|
tor_socket_strerror(e));
|
2004-10-24 02:55:18 +02:00
|
|
|
return 0;
|
2003-08-14 19:13:52 +02:00
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
/* else there was a real error. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"accept() failed: %s. Closing listener.",
|
|
|
|
tor_socket_strerror(e));
|
2004-05-12 23:12:33 +02:00
|
|
|
connection_mark_for_close(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,
|
|
|
|
"Connection accepted on socket %d (child of fd %d).",
|
|
|
|
news,conn->s);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-08-12 05:08:41 +02:00
|
|
|
set_socket_nonblocking(news);
|
2002-07-16 04:12:58 +02:00
|
|
|
|
2005-04-06 17:42:35 +02:00
|
|
|
if (check_sockaddr_in((struct sockaddr*)addrbuf, remotelen, LOG_INFO)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,
|
|
|
|
"accept() returned a strange address; trying getsockname().");
|
2005-04-06 17:42:35 +02:00
|
|
|
remotelen=256;
|
|
|
|
memset(addrbuf, 0, sizeof(addrbuf));
|
|
|
|
if (getsockname(news, (struct sockaddr*)addrbuf, &remotelen)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET, "getsockname() failed.");
|
2005-04-06 17:42:35 +02:00
|
|
|
} else {
|
2005-12-14 21:40:40 +01:00
|
|
|
if (check_sockaddr_in((struct sockaddr*)addrbuf, remotelen,
|
|
|
|
LOG_WARN) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"Something's wrong with this conn. Closing it.");
|
2005-04-06 17:42:35 +02:00
|
|
|
tor_close_socket(news);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
memcpy(&remote, addrbuf, sizeof(struct sockaddr_in));
|
|
|
|
|
2004-08-06 11:56:36 +02:00
|
|
|
/* process entrance policies here, before we even create the connection */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (new_type == CONN_TYPE_AP) {
|
2004-08-06 11:56:36 +02:00
|
|
|
/* check sockspolicy to see if we should accept it */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (socks_policy_permits_address(ntohl(remote.sin_addr.s_addr)) == 0) {
|
2005-02-22 09:18:36 +01:00
|
|
|
tor_inet_ntoa(&remote.sin_addr, tmpbuf, sizeof(tmpbuf));
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_APP,"Denying socks connection from untrusted address %s.",
|
|
|
|
tmpbuf);
|
2004-08-06 11:56:36 +02:00
|
|
|
tor_close_socket(news);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (new_type == CONN_TYPE_DIR) {
|
2004-10-25 08:16:26 +02:00
|
|
|
/* check dirpolicy to see if we should accept it */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (dir_policy_permits_address(ntohl(remote.sin_addr.s_addr)) == 0) {
|
2005-02-22 09:18:36 +01:00
|
|
|
tor_inet_ntoa(&remote.sin_addr, tmpbuf, sizeof(tmpbuf));
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_DIRSERV,"Denying dir connection from address %s.",
|
|
|
|
tmpbuf);
|
2004-10-25 08:16:26 +02:00
|
|
|
tor_close_socket(news);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2004-08-06 11:56:36 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
newconn = connection_new(new_type);
|
|
|
|
newconn->s = news;
|
|
|
|
|
2005-02-22 09:18:36 +01:00
|
|
|
/* remember the remote address */
|
2002-10-13 15:17:27 +02:00
|
|
|
newconn->addr = ntohl(remote.sin_addr.s_addr);
|
|
|
|
newconn->port = ntohs(remote.sin_port);
|
2005-08-26 09:41:19 +02:00
|
|
|
newconn->address = tor_dup_addr(newconn->addr);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_add(newconn) < 0) { /* no space, forget it */
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_free(newconn);
|
2002-09-03 20:36:40 +02:00
|
|
|
return 0; /* no need to tear down the parent */
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2006-08-10 11:01:37 +02:00
|
|
|
if (connection_init_accepted_conn(newconn, conn->type) < 0) {
|
2004-05-12 23:12:33 +02:00
|
|
|
connection_mark_for_close(newconn);
|
2003-09-08 12:59:00 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Initialize states for newly accepted connection <b>conn</b>.
|
|
|
|
* If conn is an OR, start the tls handshake.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
2006-08-10 11:01:37 +02:00
|
|
|
connection_init_accepted_conn(connection_t *conn, uint8_t listener_type)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2003-09-08 12:59:00 +02:00
|
|
|
connection_start_reading(conn);
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (conn->type) {
|
2003-09-08 12:59:00 +02:00
|
|
|
case CONN_TYPE_OR:
|
2006-07-26 21:07:26 +02:00
|
|
|
control_event_or_conn_status(TO_OR_CONN(conn), OR_CONN_EVENT_NEW);
|
|
|
|
return connection_tls_start_handshake(TO_OR_CONN(conn), 1);
|
2003-09-08 12:59:00 +02:00
|
|
|
case CONN_TYPE_AP:
|
2006-08-10 11:01:37 +02:00
|
|
|
switch (listener_type) {
|
|
|
|
case CONN_TYPE_AP_LISTENER:
|
|
|
|
conn->state = AP_CONN_STATE_SOCKS_WAIT;
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER:
|
|
|
|
conn->state = AP_CONN_STATE_ORIGDST_WAIT;
|
|
|
|
break;
|
|
|
|
}
|
2003-09-08 12:59:00 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
2004-03-31 00:57:49 +02:00
|
|
|
conn->purpose = DIR_PURPOSE_SERVER;
|
2003-09-17 22:09:06 +02:00
|
|
|
conn->state = DIR_CONN_STATE_SERVER_COMMAND_WAIT;
|
2003-09-08 12:59:00 +02:00
|
|
|
break;
|
2004-11-03 02:32:26 +01:00
|
|
|
case CONN_TYPE_CONTROL:
|
2005-06-17 20:49:55 +02:00
|
|
|
conn->state = CONTROL_CONN_STATE_NEEDAUTH_V0;
|
2004-11-03 02:32:26 +01:00
|
|
|
break;
|
2003-09-08 12:59:00 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Take conn, make a nonblocking socket; try to connect to
|
2003-09-16 03:58:46 +02:00
|
|
|
* addr:port (they arrive in *host order*). If fail, return -1. Else
|
2005-05-17 19:01:36 +02:00
|
|
|
* assign s to conn-\>s: if connected return 1, if EAGAIN return 0.
|
2004-05-10 03:32:57 +02:00
|
|
|
*
|
|
|
|
* address is used to make the logs useful.
|
|
|
|
*
|
2004-05-10 06:34:48 +02:00
|
|
|
* On success, add conn to the list of polled connections.
|
2003-09-16 03:58:46 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_connect(connection_t *conn, char *address,
|
|
|
|
uint32_t addr, uint16_t port)
|
|
|
|
{
|
2005-08-03 22:42:17 +02:00
|
|
|
int s, inprogress = 0;
|
2003-09-16 03:58:46 +02:00
|
|
|
struct sockaddr_in dest_addr;
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2003-09-16 03:58:46 +02:00
|
|
|
|
2004-12-01 04:15:59 +01:00
|
|
|
s = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
|
2003-09-16 03:58:46 +02:00
|
|
|
if (s < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"Error creating network socket: %s",
|
|
|
|
tor_socket_strerror(tor_socket_errno(-1)));
|
2003-09-16 03:58:46 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-08-16 13:43:18 +02:00
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
if (options->OutboundBindAddress) {
|
2004-08-16 13:43:18 +02:00
|
|
|
struct sockaddr_in ext_addr;
|
|
|
|
|
|
|
|
memset(&ext_addr, 0, sizeof(ext_addr));
|
|
|
|
ext_addr.sin_family = AF_INET;
|
|
|
|
ext_addr.sin_port = 0;
|
2004-11-06 06:18:11 +01:00
|
|
|
if (!tor_inet_aton(options->OutboundBindAddress, &ext_addr.sin_addr)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Outbound bind address '%s' didn't parse. Ignoring.",
|
|
|
|
options->OutboundBindAddress);
|
2004-08-16 13:43:18 +02:00
|
|
|
} else {
|
2004-11-28 10:05:49 +01:00
|
|
|
if (bind(s, (struct sockaddr*)&ext_addr, sizeof(ext_addr)) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"Error binding network socket: %s",
|
|
|
|
tor_socket_strerror(tor_socket_errno(s)));
|
2006-04-01 12:22:57 +02:00
|
|
|
tor_close_socket(s);
|
2004-08-16 13:43:18 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
set_socket_nonblocking(s);
|
|
|
|
|
2003-11-18 09:20:19 +01:00
|
|
|
memset(&dest_addr,0,sizeof(dest_addr));
|
2003-09-16 03:58:46 +02:00
|
|
|
dest_addr.sin_family = AF_INET;
|
|
|
|
dest_addr.sin_port = htons(port);
|
|
|
|
dest_addr.sin_addr.s_addr = htonl(addr);
|
|
|
|
|
2006-03-19 04:55:48 +01:00
|
|
|
log_debug(LD_NET,"Connecting to %s:%u.",escaped_safe_str(address),port);
|
2003-09-16 03:58:46 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connect(s,(struct sockaddr *)&dest_addr,sizeof(dest_addr)) < 0) {
|
2004-11-28 06:48:02 +01:00
|
|
|
int e = tor_socket_errno(s);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!ERRNO_IS_CONN_EINPROGRESS(e)) {
|
2003-09-16 03:58:46 +02:00
|
|
|
/* yuck. kill it. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,
|
2006-03-19 04:55:48 +01:00
|
|
|
"connect() to %s:%u failed: %s",escaped_safe_str(address),
|
|
|
|
port, tor_socket_strerror(e));
|
2004-04-28 23:14:56 +02:00
|
|
|
tor_close_socket(s);
|
2003-09-16 03:58:46 +02:00
|
|
|
return -1;
|
|
|
|
} else {
|
2005-08-03 22:42:17 +02:00
|
|
|
inprogress = 1;
|
2003-09-16 03:58:46 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-03 22:42:17 +02:00
|
|
|
if (!server_mode(options))
|
|
|
|
client_check_address_changed(s);
|
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
/* it succeeded. we're connected. */
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(inprogress?LOG_DEBUG:LOG_INFO, LD_NET,
|
2006-03-19 04:55:48 +01:00
|
|
|
"Connection to %s:%u %s (sock %d).",escaped_safe_str(address),
|
|
|
|
port, inprogress?"in progress":"established", s);
|
2003-09-16 03:58:46 +02:00
|
|
|
conn->s = s;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_add(conn) < 0) /* no space, forget it */
|
2004-05-05 03:26:57 +02:00
|
|
|
return -1;
|
2005-08-03 22:42:17 +02:00
|
|
|
return inprogress ? 0 : 1;
|
2003-09-16 03:58:46 +02:00
|
|
|
}
|
|
|
|
|
2004-11-09 21:04:00 +01:00
|
|
|
/**
|
2004-10-24 03:50:33 +02:00
|
|
|
* Launch any configured listener connections of type <b>type</b>. (A
|
|
|
|
* listener is configured if <b>port_option</b> is non-zero. If any
|
2005-10-17 05:17:29 +02:00
|
|
|
* ListenAddress configuration options are given in <b>cfg</b>, create a
|
2004-10-24 03:50:33 +02:00
|
|
|
* connection binding to each one. Otherwise, create a single
|
|
|
|
* connection binding to the address <b>default_addr</b>.)
|
|
|
|
*
|
|
|
|
* If <b>force</b> is true, close and re-open all listener connections.
|
2004-11-09 21:04:00 +01:00
|
|
|
* Otherwise, only relaunch the listeners of this type if the number of
|
2005-07-11 19:20:22 +02:00
|
|
|
* existing connections is not as configured (e.g., because one died),
|
|
|
|
* or if the existing connections do not match those configured.
|
2005-09-14 04:36:29 +02:00
|
|
|
*
|
|
|
|
* Add all old conns that should be closed to <b>replaced_conns</b>.
|
|
|
|
* Add all new connections to <b>new_conns</b>.
|
2004-10-24 03:50:33 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
2005-07-22 23:12:10 +02:00
|
|
|
retry_listeners(int type, config_line_t *cfg,
|
2005-09-14 04:36:29 +02:00
|
|
|
int port_option, const char *default_addr, int force,
|
|
|
|
smartlist_t *replaced_conns,
|
2006-05-03 20:29:44 +02:00
|
|
|
smartlist_t *new_conns,
|
|
|
|
int never_open_conns)
|
2004-05-20 04:42:50 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
smartlist_t *launch = smartlist_create();
|
2005-07-11 19:20:22 +02:00
|
|
|
int free_launch_elts = 1;
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *c;
|
2005-07-11 19:20:22 +02:00
|
|
|
int n_conn, i;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *line;
|
2004-10-24 03:22:40 +02:00
|
|
|
|
2005-07-11 19:20:22 +02:00
|
|
|
if (cfg && port_option) {
|
|
|
|
for (c = cfg; c; c = c->next) {
|
|
|
|
smartlist_add(launch, c);
|
2004-10-24 03:22:40 +02:00
|
|
|
}
|
2005-07-11 19:20:22 +02:00
|
|
|
free_launch_elts = 0;
|
|
|
|
} else if (port_option) {
|
2005-07-22 23:12:10 +02:00
|
|
|
line = tor_malloc_zero(sizeof(config_line_t));
|
2005-07-11 19:20:22 +02:00
|
|
|
line->key = tor_strdup("");
|
|
|
|
line->value = tor_strdup(default_addr);
|
|
|
|
smartlist_add(launch, line);
|
2004-10-24 03:22:40 +02:00
|
|
|
}
|
2004-11-03 02:32:26 +01:00
|
|
|
|
2005-09-14 04:36:29 +02:00
|
|
|
/*
|
|
|
|
SMARTLIST_FOREACH(launch, config_line_t *, l,
|
|
|
|
log_fn(LOG_NOTICE, "#%s#%s", l->key, l->value));
|
|
|
|
*/
|
|
|
|
|
2005-07-11 19:20:22 +02:00
|
|
|
get_connection_array(&carray,&n_conn);
|
|
|
|
for (i=0; i < n_conn; ++i) {
|
|
|
|
conn = carray[i];
|
|
|
|
if (conn->type != type || conn->marked_for_close)
|
|
|
|
continue;
|
|
|
|
if (force) {
|
|
|
|
/* It's a listener, and we're relaunching all listeners of this
|
|
|
|
* type. Close this one. */
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(LOG_NOTICE, LD_NET, "Closing %s on %s:%d",
|
2005-07-15 01:07:05 +02:00
|
|
|
conn_type_to_string(type), conn->address, conn->port);
|
2005-07-11 19:20:22 +02:00
|
|
|
connection_close_immediate(conn);
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* Okay, so this is a listener. Is it configured? */
|
|
|
|
line = NULL;
|
2005-07-22 23:12:10 +02:00
|
|
|
SMARTLIST_FOREACH(launch, config_line_t *, wanted,
|
2005-07-11 19:20:22 +02:00
|
|
|
{
|
2005-09-30 23:30:04 +02:00
|
|
|
char *address=NULL;
|
2005-07-11 19:20:22 +02:00
|
|
|
uint16_t port;
|
2006-07-06 04:44:07 +02:00
|
|
|
if (!parse_addr_port(LOG_WARN, wanted->value, &address, NULL, &port)) {
|
2005-09-30 23:30:04 +02:00
|
|
|
int addr_matches = !strcasecmp(address, conn->address);
|
|
|
|
tor_free(address);
|
2005-07-11 19:20:22 +02:00
|
|
|
if (! port)
|
|
|
|
port = port_option;
|
2005-09-30 23:28:00 +02:00
|
|
|
if (port == conn->port && addr_matches) {
|
2005-07-11 19:20:22 +02:00
|
|
|
line = wanted;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
if (! line) {
|
|
|
|
/* This one isn't configured. Close it. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_NET, "Closing %s on %s:%d",
|
|
|
|
conn_type_to_string(type), conn->address, conn->port);
|
2005-09-14 04:36:29 +02:00
|
|
|
if (replaced_conns) {
|
|
|
|
smartlist_add(replaced_conns, conn);
|
|
|
|
} else {
|
|
|
|
connection_close_immediate(conn);
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
}
|
2004-05-20 04:42:50 +02:00
|
|
|
} else {
|
2005-07-11 19:20:22 +02:00
|
|
|
/* It's configured; we don't need to launch it. */
|
2006-02-13 10:02:35 +01:00
|
|
|
// log_debug(LD_NET, "Already have %s on %s:%d",
|
|
|
|
// conn_type_to_string(type), conn->address, conn->port);
|
2005-07-11 19:20:22 +02:00
|
|
|
smartlist_remove(launch, line);
|
2005-09-30 23:31:26 +02:00
|
|
|
if (free_launch_elts)
|
|
|
|
config_free_lines(line);
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
2003-12-14 07:03:46 +01:00
|
|
|
}
|
2005-07-11 19:20:22 +02:00
|
|
|
|
|
|
|
/* Now open all the listeners that are configured but not opened. */
|
|
|
|
i = 0;
|
2006-05-03 20:29:44 +02:00
|
|
|
if (!never_open_conns) {
|
|
|
|
SMARTLIST_FOREACH(launch, config_line_t *, cfg,
|
|
|
|
{
|
|
|
|
conn = connection_create_listener(cfg->value, (uint16_t) port_option,
|
|
|
|
type);
|
|
|
|
if (!conn) {
|
|
|
|
i = -1;
|
|
|
|
} else {
|
|
|
|
if (new_conns)
|
|
|
|
smartlist_add(new_conns, conn);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
2005-07-11 19:20:22 +02:00
|
|
|
|
|
|
|
if (free_launch_elts) {
|
2005-07-22 23:12:10 +02:00
|
|
|
SMARTLIST_FOREACH(launch, config_line_t *, cfg,
|
2005-07-11 19:20:22 +02:00
|
|
|
config_free_lines(cfg));
|
|
|
|
}
|
|
|
|
smartlist_free(launch);
|
|
|
|
|
|
|
|
return i;
|
2003-12-14 07:03:46 +01:00
|
|
|
}
|
|
|
|
|
2004-10-24 03:22:40 +02:00
|
|
|
/** (Re)launch listeners for each port you should have open. If
|
|
|
|
* <b>force</b> is true, close and relaunch all listeners. If <b>force</b>
|
|
|
|
* is false, then only relaunch listeners when we have the wrong number of
|
|
|
|
* connections for a given type.
|
2005-09-14 04:36:29 +02:00
|
|
|
*
|
|
|
|
* Add all old conns that should be closed to <b>replaced_conns</b>.
|
|
|
|
* Add all new connections to <b>new_conns</b>.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2005-09-14 04:36:29 +02:00
|
|
|
retry_all_listeners(int force, smartlist_t *replaced_conns,
|
|
|
|
smartlist_t *new_conns)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2006-05-03 20:29:44 +02:00
|
|
|
if (retry_listeners(CONN_TYPE_OR_LISTENER, options->ORListenAddress,
|
2005-09-14 04:36:29 +02:00
|
|
|
options->ORPort, "0.0.0.0", force,
|
2006-05-03 20:29:44 +02:00
|
|
|
replaced_conns, new_conns, options->ClientOnly)<0)
|
2004-05-20 04:42:50 +02:00
|
|
|
return -1;
|
2005-10-17 05:17:29 +02:00
|
|
|
if (retry_listeners(CONN_TYPE_DIR_LISTENER, options->DirListenAddress,
|
2005-09-14 04:36:29 +02:00
|
|
|
options->DirPort, "0.0.0.0", force,
|
2006-05-03 20:29:44 +02:00
|
|
|
replaced_conns, new_conns, 0)<0)
|
2004-05-20 04:42:50 +02:00
|
|
|
return -1;
|
2005-10-17 05:17:29 +02:00
|
|
|
if (retry_listeners(CONN_TYPE_AP_LISTENER, options->SocksListenAddress,
|
2005-09-14 04:36:29 +02:00
|
|
|
options->SocksPort, "127.0.0.1", force,
|
2006-05-03 20:29:44 +02:00
|
|
|
replaced_conns, new_conns, 0)<0)
|
2004-05-20 04:42:50 +02:00
|
|
|
return -1;
|
2006-08-10 11:01:37 +02:00
|
|
|
if (retry_listeners(CONN_TYPE_AP_TRANS_LISTENER, options->TransListenAddress,
|
|
|
|
options->TransPort, "127.0.0.1", force,
|
|
|
|
replaced_conns, new_conns, 0)<0)
|
|
|
|
return -1;
|
2006-02-13 07:25:16 +01:00
|
|
|
if (retry_listeners(CONN_TYPE_CONTROL_LISTENER,
|
|
|
|
options->ControlListenAddress,
|
2005-09-14 04:36:29 +02:00
|
|
|
options->ControlPort, "127.0.0.1", force,
|
2006-05-03 20:29:44 +02:00
|
|
|
replaced_conns, new_conns, 0)<0)
|
2004-11-04 07:41:49 +01:00
|
|
|
return -1;
|
2002-10-02 03:03:00 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-09-08 08:52:33 +02:00
|
|
|
extern int global_read_bucket, global_write_bucket;
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** How many bytes at most can we read onto this connection? */
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
connection_bucket_read_limit(connection_t *conn)
|
|
|
|
{
|
2004-03-14 17:00:52 +01:00
|
|
|
int at_most;
|
2006-02-04 09:58:51 +01:00
|
|
|
int base = connection_speaks_cells(conn) ?
|
|
|
|
CELL_NETWORK_SIZE : RELAY_PAYLOAD_SIZE;
|
|
|
|
|
|
|
|
/* Do a rudimentary round-robin so one circuit can't hog a connection.
|
|
|
|
* Pick at most 32 cells, at least 4 cells if possible, and if we're in
|
|
|
|
* the middle pick 1/8 of the available bandwidth. */
|
|
|
|
at_most = global_read_bucket / 8;
|
|
|
|
at_most -= (at_most % base); /* round down */
|
|
|
|
if (at_most > 32*base) /* 16 KB */
|
|
|
|
at_most = 32*base;
|
|
|
|
else if (at_most < 4*base) /* 2 KB */
|
|
|
|
at_most = 4*base;
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (at_most > global_read_bucket)
|
2004-09-08 08:52:33 +02:00
|
|
|
at_most = global_read_bucket;
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (connection_speaks_cells(conn) && conn->state == OR_CONN_STATE_OPEN) {
|
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
|
|
|
if (at_most > or_conn->receiver_bucket)
|
|
|
|
at_most = or_conn->receiver_bucket;
|
|
|
|
}
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2005-01-12 13:19:00 +01:00
|
|
|
if (at_most < 0)
|
|
|
|
return 0;
|
2004-03-14 17:00:52 +01:00
|
|
|
return at_most;
|
|
|
|
}
|
|
|
|
|
2005-10-29 20:19:37 +02:00
|
|
|
/** How many bytes at most can we write onto this connection? */
|
|
|
|
int
|
|
|
|
connection_bucket_write_limit(connection_t *conn)
|
|
|
|
{
|
2005-11-01 18:28:49 +01:00
|
|
|
unsigned int at_most;
|
2005-10-29 20:19:37 +02:00
|
|
|
|
|
|
|
/* do a rudimentary round-robin so one circuit can't hog a connection */
|
|
|
|
if (connection_speaks_cells(conn)) {
|
|
|
|
at_most = 32*(CELL_NETWORK_SIZE);
|
|
|
|
} else {
|
|
|
|
at_most = 32*(RELAY_PAYLOAD_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (at_most > conn->outbuf_flushlen)
|
|
|
|
at_most = conn->outbuf_flushlen;
|
|
|
|
|
|
|
|
#if 0 /* don't enable til we actually do write limiting */
|
|
|
|
if (at_most > global_write_bucket)
|
|
|
|
at_most = global_write_bucket;
|
|
|
|
#endif
|
|
|
|
return at_most;
|
|
|
|
}
|
|
|
|
|
2006-02-12 00:15:40 +01:00
|
|
|
/** Return 1 if the global write bucket has no bytes in it,
|
|
|
|
* or return 0 if it does. */
|
2006-02-12 23:27:09 +01:00
|
|
|
int
|
|
|
|
global_write_bucket_empty(void)
|
2006-02-12 00:15:40 +01:00
|
|
|
{
|
|
|
|
return global_write_bucket <= 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** We just read num_read onto conn. Decrement buckets appropriately. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
connection_read_bucket_decrement(connection_t *conn, int num_read)
|
|
|
|
{
|
2005-12-14 21:40:40 +01:00
|
|
|
global_read_bucket -= num_read;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_speaks_cells(conn) && conn->state == OR_CONN_STATE_OPEN) {
|
2006-07-26 21:07:26 +02:00
|
|
|
TO_OR_CONN(conn)->receiver_bucket -= num_read;
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
2004-11-07 02:33:06 +01:00
|
|
|
}
|
|
|
|
|
2006-01-05 22:23:03 +01:00
|
|
|
/** If we have exhaused our global read bucket, or the read bucket for conn,
|
|
|
|
* stop reading. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
|
|
|
connection_consider_empty_buckets(connection_t *conn)
|
|
|
|
{
|
2005-01-12 11:00:38 +01:00
|
|
|
if (global_read_bucket <= 0) {
|
2005-10-25 09:04:36 +02:00
|
|
|
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,"global bucket exhausted. Pausing."));
|
2004-03-14 17:00:52 +01:00
|
|
|
conn->wants_to_read = 1;
|
|
|
|
connection_stop_reading(conn);
|
|
|
|
return;
|
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_speaks_cells(conn) &&
|
2004-11-28 12:39:53 +01:00
|
|
|
conn->state == OR_CONN_STATE_OPEN &&
|
2006-07-26 21:07:26 +02:00
|
|
|
TO_OR_CONN(conn)->receiver_bucket <= 0) {
|
2005-12-14 21:40:40 +01:00
|
|
|
LOG_FN_CONN(conn,
|
|
|
|
(LOG_DEBUG,LD_NET,"receiver bucket exhausted. Pausing."));
|
2004-11-28 12:39:53 +01:00
|
|
|
conn->wants_to_read = 1;
|
|
|
|
connection_stop_reading(conn);
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-07 11:18:53 +02:00
|
|
|
/** Initialize the global read bucket to options->BandwidthBurst. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_bucket_init(void)
|
|
|
|
{
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2005-12-14 21:40:40 +01:00
|
|
|
/* start it at max traffic */
|
|
|
|
global_read_bucket = (int)options->BandwidthBurst;
|
|
|
|
global_write_bucket = (int)options->BandwidthBurst;
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
|
|
|
|
2004-11-03 17:38:04 +01:00
|
|
|
/** A second has rolled over; increment buckets appropriately. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_bucket_refill(struct timeval *now)
|
|
|
|
{
|
2004-03-14 17:00:52 +01:00
|
|
|
int i, n;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2006-06-05 00:42:13 +02:00
|
|
|
/* Not used, but it should be! We might have rolled over more than one
|
|
|
|
* second! XXXX */
|
|
|
|
(void) now;
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2004-09-08 08:52:33 +02:00
|
|
|
/* refill the global buckets */
|
2005-01-12 11:00:38 +01:00
|
|
|
if (global_read_bucket < (int)options->BandwidthBurst) {
|
2004-11-22 23:24:10 +01:00
|
|
|
global_read_bucket += (int)options->BandwidthRate;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,"global_read_bucket now %d.", global_read_bucket);
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
2005-01-12 11:00:38 +01:00
|
|
|
if (global_write_bucket < (int)options->BandwidthBurst) {
|
2004-11-22 23:24:10 +01:00
|
|
|
global_write_bucket += (int)options->BandwidthRate;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,"global_write_bucket now %d.", global_write_bucket);
|
2004-09-08 08:52:33 +02:00
|
|
|
}
|
2004-03-14 17:00:52 +01:00
|
|
|
|
|
|
|
/* refill the per-connection buckets */
|
|
|
|
get_connection_array(&carray,&n);
|
2004-11-28 10:05:49 +01:00
|
|
|
for (i=0;i<n;i++) {
|
2004-03-14 17:00:52 +01:00
|
|
|
conn = carray[i];
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (connection_speaks_cells(conn)) {
|
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
|
|
|
if (connection_receiver_bucket_should_increase(or_conn)) {
|
|
|
|
or_conn->receiver_bucket += or_conn->bandwidthrate;
|
|
|
|
if (or_conn->receiver_bucket > or_conn->bandwidthburst)
|
|
|
|
or_conn->receiver_bucket = or_conn->bandwidthburst;
|
|
|
|
//log_fn(LOG_DEBUG,"Receiver bucket %d now %d.", i,
|
|
|
|
// conn->receiver_bucket);
|
|
|
|
}
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->wants_to_read == 1 /* it's marked to turn reading back on now */
|
2004-11-28 12:39:53 +01:00
|
|
|
&& global_read_bucket > 0 /* and we're allowed to read */
|
|
|
|
&& global_write_bucket > 0 /* and we're allowed to write (XXXX,
|
|
|
|
* not the best place to check this.) */
|
|
|
|
&& (!connection_speaks_cells(conn) ||
|
|
|
|
conn->state != OR_CONN_STATE_OPEN ||
|
2006-07-26 21:07:26 +02:00
|
|
|
TO_OR_CONN(conn)->receiver_bucket > 0)) {
|
2004-03-14 17:00:52 +01:00
|
|
|
/* and either a non-cell conn or a cell conn with non-empty bucket */
|
2005-10-25 09:04:36 +02:00
|
|
|
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,"waking up conn (fd %d)",conn->s));
|
2004-03-14 17:00:52 +01:00
|
|
|
conn->wants_to_read = 0;
|
|
|
|
connection_start_reading(conn);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->wants_to_write == 1) {
|
2004-03-14 17:00:52 +01:00
|
|
|
conn->wants_to_write = 0;
|
|
|
|
connection_start_writing(conn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Is the receiver bucket for connection <b>conn</b> low enough that we
|
|
|
|
* should add another pile of tokens to it?
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_receiver_bucket_should_increase(or_connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->_base.state != OR_CONN_STATE_OPEN)
|
2004-03-14 17:00:52 +01:00
|
|
|
return 0; /* only open connections play the rate limiting game */
|
2006-06-07 11:18:53 +02:00
|
|
|
if (conn->receiver_bucket >= conn->bandwidthburst)
|
2004-03-14 17:00:52 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-05-17 19:01:36 +02:00
|
|
|
/** Read bytes from conn-\>s and process them.
|
2004-05-10 03:32:57 +02:00
|
|
|
*
|
|
|
|
* This function gets called from conn_read() in main.c, either
|
|
|
|
* when poll() has declared that conn wants to read, or (for OR conns)
|
|
|
|
* when there are pending TLS bytes.
|
|
|
|
*
|
|
|
|
* It calls connection_read_to_buf() to bring in any new bytes,
|
|
|
|
* and then calls connection_process_inbuf() to process them.
|
|
|
|
*
|
|
|
|
* Mark the connection and return -1 if you want to close it, else
|
|
|
|
* return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_handle_read(connection_t *conn)
|
|
|
|
{
|
2004-11-21 08:43:12 +01:00
|
|
|
int max_to_read=-1, try_to_read;
|
2003-09-05 08:04:03 +02:00
|
|
|
|
2005-06-08 06:55:06 +02:00
|
|
|
if (conn->marked_for_close)
|
|
|
|
return 0; /* do nothing */
|
|
|
|
|
2003-10-04 05:29:09 +02:00
|
|
|
conn->timestamp_lastread = time(NULL);
|
2003-09-05 08:04:03 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (conn->type) {
|
2003-09-05 08:04:03 +02:00
|
|
|
case CONN_TYPE_OR_LISTENER:
|
2003-09-08 12:59:00 +02:00
|
|
|
return connection_handle_listener_read(conn, CONN_TYPE_OR);
|
2003-09-05 08:04:03 +02:00
|
|
|
case CONN_TYPE_AP_LISTENER:
|
2006-08-10 11:01:37 +02:00
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER:
|
2003-09-08 12:59:00 +02:00
|
|
|
return connection_handle_listener_read(conn, CONN_TYPE_AP);
|
2003-09-05 08:04:03 +02:00
|
|
|
case CONN_TYPE_DIR_LISTENER:
|
2003-09-08 12:59:00 +02:00
|
|
|
return connection_handle_listener_read(conn, CONN_TYPE_DIR);
|
2004-11-03 02:32:26 +01:00
|
|
|
case CONN_TYPE_CONTROL_LISTENER:
|
|
|
|
return connection_handle_listener_read(conn, CONN_TYPE_CONTROL);
|
2003-09-08 12:59:00 +02:00
|
|
|
}
|
2003-09-05 08:04:03 +02:00
|
|
|
|
2004-11-21 08:43:12 +01:00
|
|
|
loop_again:
|
|
|
|
try_to_read = max_to_read;
|
|
|
|
tor_assert(!conn->marked_for_close);
|
|
|
|
if (connection_read_to_buf(conn, &max_to_read) < 0) {
|
2004-07-12 22:39:40 +02:00
|
|
|
/* There's a read error; kill the connection.*/
|
|
|
|
connection_close_immediate(conn); /* Don't flush; connection is dead. */
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn)) {
|
2006-07-26 21:07:26 +02:00
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
|
|
|
connection_edge_end_errno(edge_conn, edge_conn->cpath_layer);
|
|
|
|
if (edge_conn->socks_request) /* broken, don't send a socks reply back */
|
|
|
|
edge_conn->socks_request->has_finished = 1;
|
2004-10-14 11:28:31 +02:00
|
|
|
}
|
2004-07-12 22:39:40 +02:00
|
|
|
connection_mark_for_close(conn);
|
2003-09-08 12:59:00 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
if (CONN_IS_EDGE(conn) && try_to_read != max_to_read) {
|
2004-11-21 08:43:12 +01:00
|
|
|
/* instruct it not to try to package partial cells. */
|
|
|
|
if (connection_process_inbuf(conn, 0) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2004-11-24 07:41:58 +01:00
|
|
|
if (!conn->marked_for_close &&
|
|
|
|
connection_is_reading(conn) &&
|
2005-01-12 11:00:38 +01:00
|
|
|
!conn->inbuf_reached_eof &&
|
|
|
|
max_to_read > 0)
|
2004-11-21 08:43:12 +01:00
|
|
|
goto loop_again; /* try reading again, in case more is here now */
|
|
|
|
}
|
|
|
|
/* one last try, packaging partial cells and all. */
|
2004-11-24 07:41:58 +01:00
|
|
|
if (!conn->marked_for_close &&
|
|
|
|
connection_process_inbuf(conn, 1) < 0) {
|
2003-09-08 12:59:00 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-11-24 07:41:58 +01:00
|
|
|
if (!conn->marked_for_close &&
|
|
|
|
conn->inbuf_reached_eof &&
|
|
|
|
connection_reached_eof(conn) < 0) {
|
2004-11-21 11:14:57 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2003-09-07 12:24:40 +02:00
|
|
|
return 0;
|
2003-09-05 08:04:03 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Pull in new bytes from conn-\>s onto conn-\>inbuf, either
|
2004-05-10 03:32:57 +02:00
|
|
|
* directly or via TLS. Reduce the token buckets by the number of
|
|
|
|
* bytes read.
|
|
|
|
*
|
2004-11-21 08:43:12 +01:00
|
|
|
* If *max_to_read is -1, then decide it ourselves, else go with the
|
|
|
|
* value passed to us. When returning, if it's changed, subtract the
|
|
|
|
* number of bytes we read from *max_to_read.
|
|
|
|
*
|
2004-05-10 03:32:57 +02:00
|
|
|
* Return -1 if we want to break conn, else return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
connection_read_to_buf(connection_t *conn, int *max_to_read)
|
|
|
|
{
|
2004-11-21 08:43:12 +01:00
|
|
|
int result, at_most = *max_to_read;
|
2005-05-03 01:17:08 +02:00
|
|
|
size_t bytes_in_buf, more_to_read;
|
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-11-28 10:05:49 +01:00
|
|
|
if (at_most == -1) { /* we need to initialize it */
|
2004-11-21 08:43:12 +01:00
|
|
|
/* how many bytes are we allowed to read? */
|
|
|
|
at_most = connection_bucket_read_limit(conn);
|
|
|
|
}
|
2002-10-02 01:37:31 +02:00
|
|
|
|
2005-05-03 01:17:08 +02:00
|
|
|
bytes_in_buf = buf_capacity(conn->inbuf) - buf_datalen(conn->inbuf);
|
|
|
|
again:
|
2005-05-07 07:55:06 +02:00
|
|
|
if ((size_t)at_most > bytes_in_buf && bytes_in_buf >= 1024) {
|
2005-05-03 01:17:08 +02:00
|
|
|
more_to_read = at_most - bytes_in_buf;
|
|
|
|
at_most = bytes_in_buf;
|
|
|
|
} else {
|
|
|
|
more_to_read = 0;
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
if (connection_speaks_cells(conn) &&
|
|
|
|
conn->state > OR_CONN_STATE_PROXY_READING) {
|
2005-01-12 07:42:32 +01:00
|
|
|
int pending;
|
2006-07-26 21:07:26 +02:00
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->state == OR_CONN_STATE_HANDSHAKING) {
|
2004-03-14 18:06:29 +01:00
|
|
|
/* continue handshaking even if global token bucket is empty */
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_tls_continue_handshake(or_conn);
|
2004-03-14 18:06:29 +01:00
|
|
|
}
|
2003-09-08 12:59:00 +02:00
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,
|
|
|
|
"%d: starting, inbuf_datalen %d (%d pending in tls object)."
|
|
|
|
" at_most %d.",
|
|
|
|
conn->s,(int)buf_datalen(conn->inbuf),
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_tls_get_pending_bytes(or_conn->tls), at_most);
|
2004-04-26 23:15:06 +02:00
|
|
|
|
2003-09-08 12:59:00 +02:00
|
|
|
/* else open, or closing */
|
2006-07-26 21:07:26 +02:00
|
|
|
result = read_to_buf_tls(or_conn->tls, at_most, conn->inbuf);
|
2003-09-07 12:24:40 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (result) {
|
2003-09-07 12:24:40 +02:00
|
|
|
case TOR_TLS_CLOSE:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,"TLS connection closed on read. Closing. "
|
|
|
|
"(Nickname %s, address %s",
|
2006-07-26 21:07:26 +02:00
|
|
|
or_conn->nickname ? or_conn->nickname : "not set",
|
|
|
|
conn->address);
|
2004-11-13 17:53:48 +01:00
|
|
|
return -1;
|
|
|
|
case TOR_TLS_ERROR:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,"tls error. breaking (nickname %s, address %s).",
|
2006-07-26 21:07:26 +02:00
|
|
|
or_conn->nickname ? or_conn->nickname : "not set",
|
|
|
|
conn->address);
|
2004-11-13 17:53:48 +01:00
|
|
|
return -1;
|
2003-09-08 12:59:00 +02:00
|
|
|
case TOR_TLS_WANTWRITE:
|
2003-09-07 12:24:40 +02:00
|
|
|
connection_start_writing(conn);
|
|
|
|
return 0;
|
2003-09-08 12:59:00 +02:00
|
|
|
case TOR_TLS_WANTREAD: /* we're already reading */
|
2003-09-07 12:24:40 +02:00
|
|
|
case TOR_TLS_DONE: /* no data read, so nothing to process */
|
2004-03-14 18:06:29 +01:00
|
|
|
result = 0;
|
|
|
|
break; /* so we call bucket_decrement below */
|
2005-01-12 07:42:32 +01:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
pending = tor_tls_get_pending_bytes(or_conn->tls);
|
2005-01-12 07:42:32 +01:00
|
|
|
if (pending) {
|
|
|
|
/* XXXX If we have any pending bytes, read them now. This *can*
|
2005-06-11 08:07:22 +02:00
|
|
|
* take us over our read allotment, but really we shouldn't be
|
2005-01-12 07:42:32 +01:00
|
|
|
* believing that SSL bytes are the same as TCP bytes anyway. */
|
2006-07-26 21:07:26 +02:00
|
|
|
int r2 = read_to_buf_tls(or_conn->tls, pending, conn->inbuf);
|
2005-01-12 07:42:32 +01:00
|
|
|
if (r2<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Bug: apparently, reading pending bytes can fail.");
|
2005-01-12 11:00:38 +01:00
|
|
|
return -1;
|
2005-01-12 07:42:32 +01:00
|
|
|
} else {
|
|
|
|
result += r2;
|
|
|
|
}
|
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
|
|
|
}
|
2005-01-12 07:42:32 +01:00
|
|
|
|
2003-09-16 23:20:09 +02:00
|
|
|
} else {
|
2006-07-28 17:11:20 +02:00
|
|
|
int reached_eof = 0;
|
2005-07-13 07:14:42 +02:00
|
|
|
CONN_LOG_PROTECT(conn,
|
2006-07-28 17:11:20 +02:00
|
|
|
result = read_to_buf(conn->s, at_most, conn->inbuf, &reached_eof));
|
|
|
|
if (reached_eof)
|
|
|
|
conn->inbuf_reached_eof = 1;
|
2003-09-25 07:17:11 +02:00
|
|
|
|
2004-12-22 03:55:26 +01:00
|
|
|
// log_fn(LOG_DEBUG,"read_to_buf returned %d.",read_result);
|
2003-09-07 12:24:40 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (result < 0)
|
2003-09-07 12:24:40 +02:00
|
|
|
return -1;
|
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-11-21 08:43:12 +01:00
|
|
|
if (result > 0) { /* change *max_to_read */
|
|
|
|
*max_to_read = at_most - result;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (result > 0 && !is_local_IP(conn->addr)) { /* remember it */
|
2004-07-13 18:58:01 +02:00
|
|
|
rep_hist_note_bytes_read(result, time(NULL));
|
2004-11-07 02:33:06 +01:00
|
|
|
connection_read_bucket_decrement(conn, result);
|
2004-07-13 18:58:01 +02:00
|
|
|
}
|
|
|
|
|
2005-05-03 01:17:08 +02:00
|
|
|
if (more_to_read && result == at_most) {
|
|
|
|
bytes_in_buf = buf_capacity(conn->inbuf) - buf_datalen(conn->inbuf);
|
|
|
|
tor_assert(bytes_in_buf < 1024);
|
|
|
|
at_most = more_to_read;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
|
2004-11-03 11:18:31 +01:00
|
|
|
/* Call even if result is 0, since the global read bucket may
|
|
|
|
* have reached 0 on a different conn, and this guy needs to
|
|
|
|
* know to stop reading. */
|
2004-11-07 02:33:06 +01:00
|
|
|
connection_consider_empty_buckets(conn);
|
2004-11-03 11:18:31 +01:00
|
|
|
|
2003-09-07 12:24:40 +02:00
|
|
|
return 0;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** A pass-through to fetch_from_buf. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_fetch_from_buf(char *string, size_t len, connection_t *conn)
|
|
|
|
{
|
2003-09-25 07:17:11 +02:00
|
|
|
return fetch_from_buf(string, len, conn->inbuf);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Return conn-\>outbuf_flushlen: how many bytes conn wants to flush
|
2004-05-10 03:32:57 +02:00
|
|
|
* from its outbuf. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_wants_to_flush(connection_t *conn)
|
|
|
|
{
|
2002-07-18 08:37:58 +02:00
|
|
|
return conn->outbuf_flushlen;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Are there too many bytes on edge connection <b>conn</b>'s outbuf to
|
|
|
|
* send back a relay-level sendme yet? Return 1 if so, 0 if not. Used by
|
|
|
|
* connection_edge_consider_sending_sendme().
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_outbuf_too_full(connection_t *conn)
|
|
|
|
{
|
2002-07-18 08:37:58 +02:00
|
|
|
return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE);
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Try to flush more bytes onto conn-\>s.
|
2004-05-10 03:32:57 +02:00
|
|
|
*
|
|
|
|
* This function gets called either from conn_write() in main.c
|
|
|
|
* when poll() has declared that conn wants to write, or below
|
|
|
|
* from connection_write_to_buf() when an entire TLS record is ready.
|
|
|
|
*
|
2004-05-10 06:34:48 +02:00
|
|
|
* Update conn-\>timestamp_lastwritten to now, and call flush_buf
|
2004-05-10 03:32:57 +02:00
|
|
|
* or flush_buf_tls appropriately. If it succeeds and there no more
|
|
|
|
* more bytes on conn->outbuf, then call connection_finished_flushing
|
|
|
|
* on it too.
|
|
|
|
*
|
|
|
|
* Mark the connection and return -1 if you want to close it, else
|
|
|
|
* return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_handle_write(connection_t *conn)
|
|
|
|
{
|
2005-05-07 07:55:06 +02:00
|
|
|
int e;
|
|
|
|
socklen_t len=sizeof(e);
|
2004-07-13 09:42:20 +02:00
|
|
|
int result;
|
2005-10-29 20:19:37 +02:00
|
|
|
int max_to_write;
|
2004-07-13 09:42:20 +02:00
|
|
|
time_t now = time(NULL);
|
2003-09-05 08:04:03 +02:00
|
|
|
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(!connection_is_listener(conn));
|
2002-10-02 01:37:31 +02:00
|
|
|
|
2005-06-08 06:55:06 +02:00
|
|
|
if (conn->marked_for_close)
|
|
|
|
return 0; /* do nothing */
|
|
|
|
|
2004-07-13 09:42:20 +02:00
|
|
|
conn->timestamp_lastwritten = now;
|
2003-09-05 08:04:03 +02:00
|
|
|
|
2004-12-01 04:48:14 +01:00
|
|
|
/* Sometimes, "writable" means "connected". */
|
2004-05-12 21:17:09 +02:00
|
|
|
if (connection_state_is_connecting(conn)) {
|
|
|
|
if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG,
|
|
|
|
"getsockopt() syscall failed?! Please report to tor-ops.");
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn))
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_end_errno(TO_EDGE_CONN(conn),
|
|
|
|
TO_EDGE_CONN(conn)->cpath_layer);
|
2004-07-20 01:26:21 +02:00
|
|
|
connection_mark_for_close(conn);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-11-28 10:05:49 +01:00
|
|
|
if (e) {
|
2004-07-20 01:26:21 +02:00
|
|
|
/* some sort of error, but maybe just inprogress still */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!ERRNO_IS_CONN_EINPROGRESS(e)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,"in-progress connect failed. Removing.");
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn))
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_end_errno(TO_EDGE_CONN(conn),
|
|
|
|
TO_EDGE_CONN(conn)->cpath_layer);
|
2005-02-23 21:35:26 +01:00
|
|
|
|
2004-05-12 21:17:09 +02:00
|
|
|
connection_close_immediate(conn);
|
2004-05-12 23:12:33 +02:00
|
|
|
connection_mark_for_close(conn);
|
2006-03-18 02:24:04 +01:00
|
|
|
/* it's safe to pass OPs to router_set_status(), since it just
|
2004-07-12 20:19:55 +02:00
|
|
|
* ignores unrecognized routers
|
|
|
|
*/
|
2005-03-25 11:55:06 +01:00
|
|
|
if (conn->type == CONN_TYPE_OR && !get_options()->HttpsProxy)
|
2006-07-26 21:07:26 +02:00
|
|
|
router_set_status(TO_OR_CONN(conn)->identity_digest, 0);
|
2004-05-12 21:17:09 +02:00
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
return 0; /* no change, see if next time is better */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* The connection is successful. */
|
2005-02-22 04:02:33 +01:00
|
|
|
if (connection_finished_connecting(conn)<0)
|
|
|
|
return -1;
|
2004-05-12 21:17:09 +02:00
|
|
|
}
|
|
|
|
|
2005-10-29 20:19:37 +02:00
|
|
|
max_to_write = connection_bucket_write_limit(conn);
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
if (connection_speaks_cells(conn) &&
|
|
|
|
conn->state > OR_CONN_STATE_PROXY_READING) {
|
2006-07-26 21:07:26 +02:00
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
2004-02-28 05:11:53 +01:00
|
|
|
if (conn->state == OR_CONN_STATE_HANDSHAKING) {
|
2003-09-11 22:06:55 +02:00
|
|
|
connection_stop_writing(conn);
|
2006-07-26 21:07:26 +02:00
|
|
|
if (connection_tls_continue_handshake(or_conn) < 0) {
|
2005-12-14 21:40:40 +01:00
|
|
|
/* Don't flush; connection is dead. */
|
|
|
|
connection_close_immediate(conn);
|
2004-05-12 23:12:33 +02:00
|
|
|
connection_mark_for_close(conn);
|
2004-03-03 08:26:34 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2003-09-11 22:06:55 +02:00
|
|
|
}
|
2003-09-05 08:04:03 +02:00
|
|
|
|
2003-09-08 12:59:00 +02:00
|
|
|
/* else open, or closing */
|
2006-07-26 21:07:26 +02:00
|
|
|
result = flush_buf_tls(or_conn->tls, conn->outbuf,
|
2005-10-29 20:19:37 +02:00
|
|
|
max_to_write, &conn->outbuf_flushlen);
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (result) {
|
2003-09-07 12:24:40 +02:00
|
|
|
case TOR_TLS_ERROR:
|
|
|
|
case TOR_TLS_CLOSE:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,result==TOR_TLS_ERROR?
|
|
|
|
"tls error. breaking.":"TLS connection closed on flush");
|
2005-12-14 21:40:40 +01:00
|
|
|
/* Don't flush; connection is dead. */
|
|
|
|
connection_close_immediate(conn);
|
2004-05-12 23:12:33 +02:00
|
|
|
connection_mark_for_close(conn);
|
2004-11-13 17:53:48 +01:00
|
|
|
return -1;
|
2003-09-08 12:59:00 +02:00
|
|
|
case TOR_TLS_WANTWRITE:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,"wanted write.");
|
2003-09-07 12:24:40 +02:00
|
|
|
/* we're already writing */
|
|
|
|
return 0;
|
2003-09-08 12:59:00 +02:00
|
|
|
case TOR_TLS_WANTREAD:
|
2003-09-07 12:24:40 +02:00
|
|
|
/* Make sure to avoid a loop if the receive buckets are empty. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_NET,"wanted read.");
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!connection_is_reading(conn)) {
|
2003-09-07 12:24:40 +02:00
|
|
|
connection_stop_writing(conn);
|
|
|
|
conn->wants_to_write = 1;
|
|
|
|
/* we'll start reading again when the next second arrives,
|
|
|
|
* and then also start writing again.
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
/* else no problem, we're already reading */
|
|
|
|
return 0;
|
2003-09-14 04:58:50 +02:00
|
|
|
/* case TOR_TLS_DONE:
|
|
|
|
* for TOR_TLS_DONE, fall through to check if the flushlen
|
2003-09-07 12:24:40 +02:00
|
|
|
* is empty, so we can stop writing.
|
2003-12-17 22:09:31 +01:00
|
|
|
*/
|
2003-09-07 12:24:40 +02:00
|
|
|
}
|
2003-09-16 23:20:09 +02:00
|
|
|
} else {
|
2005-07-13 07:14:42 +02:00
|
|
|
CONN_LOG_PROTECT(conn,
|
2005-10-29 20:19:37 +02:00
|
|
|
result = flush_buf(conn->s, conn->outbuf,
|
|
|
|
max_to_write, &conn->outbuf_flushlen));
|
2004-07-13 09:42:20 +02:00
|
|
|
if (result < 0) {
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn))
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_edge_end_errno(TO_EDGE_CONN(conn),
|
|
|
|
TO_EDGE_CONN(conn)->cpath_layer);
|
2005-03-01 23:42:31 +01:00
|
|
|
|
2004-03-03 08:26:34 +01:00
|
|
|
connection_close_immediate(conn); /* Don't flush; connection is dead. */
|
2004-05-12 23:12:33 +02:00
|
|
|
connection_mark_for_close(conn);
|
2003-09-07 12:24:40 +02:00
|
|
|
return -1;
|
2004-02-28 05:11:53 +01:00
|
|
|
}
|
2003-09-05 08:04:03 +02:00
|
|
|
}
|
|
|
|
|
2006-06-18 09:38:55 +02:00
|
|
|
if (result > 0) {
|
|
|
|
if (!is_local_IP(conn->addr)) { /* remember it */
|
|
|
|
rep_hist_note_bytes_written(result, time(NULL));
|
|
|
|
global_write_bucket -= result;
|
|
|
|
}
|
|
|
|
if (connection_flushed_some(conn) < 0)
|
|
|
|
connection_mark_for_close(conn);
|
2004-07-13 09:42:20 +02:00
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!connection_wants_to_flush(conn)) { /* it's done flushing */
|
|
|
|
if (connection_finished_flushing(conn) < 0) {
|
2004-04-26 00:23:54 +02:00
|
|
|
/* already marked */
|
2003-09-07 12:24:40 +02:00
|
|
|
return -1;
|
2004-04-26 00:23:54 +02:00
|
|
|
}
|
2004-05-12 21:49:48 +02:00
|
|
|
}
|
2003-09-07 12:24:40 +02:00
|
|
|
|
|
|
|
return 0;
|
2003-09-05 08:04:03 +02:00
|
|
|
}
|
|
|
|
|
2005-10-29 20:19:37 +02:00
|
|
|
/* A controller event has just happened with such urgency that we
|
|
|
|
* need to write it onto controller <b>conn</b> immediately. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2006-07-26 21:07:26 +02:00
|
|
|
_connection_controller_force_write(control_connection_t *control_conn)
|
2005-04-08 05:36:39 +02:00
|
|
|
{
|
|
|
|
/* XXX This is hideous code duplication, but raising it seems a little
|
|
|
|
* tricky for now. Think more about this one. We only call it for
|
|
|
|
* EVENT_ERR_MSG, so messing with buckets a little isn't such a big problem.
|
|
|
|
*/
|
|
|
|
int result;
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_t *conn;
|
|
|
|
tor_assert(control_conn);
|
|
|
|
conn = TO_CONN(control_conn);
|
|
|
|
|
2005-04-08 05:36:39 +02:00
|
|
|
if (conn->marked_for_close || conn->s < 0)
|
|
|
|
return;
|
|
|
|
|
2005-07-13 07:14:42 +02:00
|
|
|
CONN_LOG_PROTECT(conn,
|
2005-10-29 20:19:37 +02:00
|
|
|
result = flush_buf(conn->s, conn->outbuf,
|
|
|
|
conn->outbuf_flushlen, &conn->outbuf_flushlen));
|
2005-04-08 05:36:39 +02:00
|
|
|
if (result < 0) {
|
|
|
|
connection_close_immediate(conn); /* Don't flush; connection is dead. */
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-06-18 09:38:55 +02:00
|
|
|
if (result > 0) {
|
|
|
|
if (!is_local_IP(conn->addr)) { /* remember it */
|
|
|
|
rep_hist_note_bytes_written(result, time(NULL));
|
|
|
|
global_write_bucket -= result;
|
|
|
|
}
|
|
|
|
if (connection_flushed_some(conn) < 0)
|
|
|
|
connection_mark_for_close(conn);
|
2005-04-08 05:36:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!connection_wants_to_flush(conn)) { /* it's done flushing */
|
|
|
|
if (connection_finished_flushing(conn) < 0) {
|
|
|
|
/* already marked */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Append <b>len</b> bytes of <b>string</b> onto <b>conn</b>'s
|
2004-05-13 00:56:26 +02:00
|
|
|
* outbuf, and ask it to start writing.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_write_to_buf(const char *string, size_t len, connection_t *conn)
|
|
|
|
{
|
2005-07-13 07:14:42 +02:00
|
|
|
int r;
|
2004-12-04 08:13:37 +01:00
|
|
|
if (!len)
|
|
|
|
return;
|
|
|
|
/* if it's marked for close, only allow write if we mean to flush it */
|
|
|
|
if (conn->marked_for_close && !conn->hold_open_until_flushed)
|
2003-10-04 04:38:18 +02:00
|
|
|
return;
|
major overhaul: dns slave subsystem, topics
on startup, it forks off a master dns handler, which forks off dns
slaves (like the apache model). slaves as spawned as load increases,
and then reused. excess slaves are not ever killed, currently.
implemented topics. each topic has a receive window in each direction
at each edge of the circuit, and sends sendme's at the data level, as
per before. each circuit also has receive windows in each direction at
each hop; an edge sends a circuit-level sendme as soon as enough data
cells have arrived (regardless of whether the data cells were flushed
to the exit conns). removed the 'connected' cell type, since it's now
a topic command within data cells.
at the edge of the circuit, there can be multiple connections associated
with a single circuit. you find them via the linked list conn->next_topic.
currently each new ap connection starts its own circuit, so we ought
to see comparable performance to what we had before. but that's only
because i haven't written the code to reattach to old circuits. please
try to break it as-is, and then i'll make it reuse the same circuit and
we'll try to break that.
svn:r152
2003-01-26 10:02:24 +01:00
|
|
|
|
2005-07-13 07:14:42 +02:00
|
|
|
CONN_LOG_PROTECT(conn, r = write_to_buf(string, len, conn->outbuf));
|
|
|
|
if (r < 0) {
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn)) {
|
2004-05-13 00:56:26 +02:00
|
|
|
/* if it failed, it means we have our package/delivery windows set
|
|
|
|
wrong compared to our max outbuf size. close the whole circuit. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,
|
|
|
|
"write_to_buf failed. Closing circuit (fd %d).", conn->s);
|
2006-07-26 21:07:26 +02:00
|
|
|
circuit_mark_for_close(circuit_get_by_edge_conn(TO_EDGE_CONN(conn)),
|
2006-01-05 22:23:03 +01:00
|
|
|
END_CIRC_REASON_INTERNAL);
|
2004-05-13 00:56:26 +02:00
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,
|
|
|
|
"write_to_buf failed. Closing connection (fd %d).", conn->s);
|
2004-05-13 00:56:26 +02:00
|
|
|
connection_mark_for_close(conn);
|
|
|
|
}
|
2003-11-30 10:35:26 +01:00
|
|
|
return;
|
2003-10-04 04:38:18 +02:00
|
|
|
}
|
2003-11-30 10:35:26 +01:00
|
|
|
|
|
|
|
connection_start_writing(conn);
|
2004-05-13 00:56:26 +02:00
|
|
|
conn->outbuf_flushlen += len;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2006-06-18 10:46:55 +02:00
|
|
|
void
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_write_to_buf_zlib(dir_connection_t *dir_conn,
|
2006-06-18 10:46:55 +02:00
|
|
|
const char *data, size_t data_len,
|
|
|
|
int done)
|
|
|
|
{
|
|
|
|
int r;
|
2006-06-18 10:53:09 +02:00
|
|
|
size_t old_datalen;
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_t *conn;
|
2006-06-18 10:46:55 +02:00
|
|
|
if (!data_len)
|
|
|
|
return;
|
2006-07-26 21:07:26 +02:00
|
|
|
conn = TO_CONN(dir_conn);
|
2006-06-18 10:46:55 +02:00
|
|
|
/* if it's marked for close, only allow write if we mean to flush it */
|
|
|
|
if (conn->marked_for_close && !conn->hold_open_until_flushed)
|
|
|
|
return;
|
|
|
|
|
2006-06-18 10:53:09 +02:00
|
|
|
old_datalen = buf_datalen(conn->outbuf);
|
2006-06-18 10:46:55 +02:00
|
|
|
/* XXXX TOO much duplicate code! XXXX012NM */
|
|
|
|
CONN_LOG_PROTECT(conn, r = write_to_buf_zlib(
|
2006-08-14 01:38:30 +02:00
|
|
|
conn->outbuf, dir_conn->zlib_state,
|
|
|
|
data, data_len, done));
|
2006-06-18 10:46:55 +02:00
|
|
|
if (r < 0) {
|
2006-07-26 21:07:26 +02:00
|
|
|
log_warn(LD_NET,
|
|
|
|
"write_to_buf failed. Closing connection (fd %d).", conn->s);
|
|
|
|
connection_mark_for_close(conn);
|
2006-06-18 10:46:55 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
connection_start_writing(conn);
|
2006-06-18 10:53:09 +02:00
|
|
|
conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen;
|
2006-06-18 10:46:55 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Return the conn to addr/port that has the most recent
|
|
|
|
* timestamp_created, or NULL if no such conn exists. */
|
2006-07-26 21:07:26 +02:00
|
|
|
or_connection_t *
|
2005-06-11 20:52:12 +02:00
|
|
|
connection_or_exact_get_by_addr_port(uint32_t addr, uint16_t port)
|
|
|
|
{
|
2003-09-30 21:06:22 +02:00
|
|
|
int i, n;
|
2006-07-26 21:07:26 +02:00
|
|
|
connection_t *conn;
|
|
|
|
or_connection_t *best=NULL;
|
2003-09-30 21:06:22 +02:00
|
|
|
connection_t **carray;
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2003-09-30 21:06:22 +02:00
|
|
|
get_connection_array(&carray,&n);
|
2004-11-28 10:05:49 +01:00
|
|
|
for (i=0;i<n;i++) {
|
2003-09-30 21:06:22 +02:00
|
|
|
conn = carray[i];
|
2005-04-06 17:19:32 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR &&
|
|
|
|
conn->addr == addr &&
|
|
|
|
conn->port == port &&
|
|
|
|
!conn->marked_for_close &&
|
2006-07-26 21:07:26 +02:00
|
|
|
(!best || best->_base.timestamp_created < conn->timestamp_created))
|
|
|
|
best = TO_OR_CONN(conn);
|
2003-09-30 21:06:22 +02:00
|
|
|
}
|
2004-04-25 06:49:11 +02:00
|
|
|
return best;
|
2003-09-30 21:06:22 +02:00
|
|
|
}
|
|
|
|
|
2005-11-19 07:57:44 +01:00
|
|
|
/** Return a connection with given type, address, port, and purpose;
|
|
|
|
* or NULL if no such connection exists. */
|
2005-09-12 08:56:42 +02:00
|
|
|
connection_t *
|
2005-12-14 21:40:40 +01:00
|
|
|
connection_get_by_type_addr_port_purpose(int type,
|
|
|
|
uint32_t addr, uint16_t port,
|
2005-09-12 08:56:42 +02:00
|
|
|
int purpose)
|
|
|
|
{
|
|
|
|
int i, n;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
|
|
|
|
|
|
|
get_connection_array(&carray,&n);
|
|
|
|
for (i=0;i<n;i++) {
|
|
|
|
conn = carray[i];
|
|
|
|
if (conn->type == type &&
|
|
|
|
conn->addr == addr &&
|
|
|
|
conn->port == port &&
|
|
|
|
conn->purpose == purpose &&
|
|
|
|
!conn->marked_for_close)
|
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/** Return the connection with id <b>id</b> if it is not already marked for
|
|
|
|
* close.
|
2005-03-12 05:22:01 +01:00
|
|
|
*/
|
2006-07-28 17:11:11 +02:00
|
|
|
edge_connection_t *
|
2005-06-11 20:52:12 +02:00
|
|
|
connection_get_by_global_id(uint32_t id)
|
|
|
|
{
|
2005-03-12 05:22:01 +01:00
|
|
|
int i, n;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
|
|
|
|
|
|
|
get_connection_array(&carray,&n);
|
|
|
|
for (i=0;i<n;i++) {
|
|
|
|
conn = carray[i];
|
2006-07-28 17:11:11 +02:00
|
|
|
if (CONN_IS_EDGE(conn) && TO_EDGE_CONN(conn)->global_identifier == id) {
|
2005-03-12 05:22:01 +01:00
|
|
|
if (!conn->marked_for_close)
|
2006-07-28 17:11:11 +02:00
|
|
|
return TO_EDGE_CONN(conn);
|
2005-03-12 05:22:01 +01:00
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/** Return a connection of type <b>type</b> that is not marked for close.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
connection_t *
|
|
|
|
connection_get_by_type(int type)
|
|
|
|
{
|
2003-09-30 21:06:22 +02:00
|
|
|
int i, n;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2003-09-30 21:06:22 +02:00
|
|
|
get_connection_array(&carray,&n);
|
2004-11-28 10:05:49 +01:00
|
|
|
for (i=0;i<n;i++) {
|
2003-09-30 21:06:22 +02:00
|
|
|
conn = carray[i];
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->type == type && !conn->marked_for_close)
|
2003-09-30 21:06:22 +02:00
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Return a connection of type <b>type</b> that is in state <b>state</b>,
|
|
|
|
* and that is not marked for close.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
connection_t *
|
|
|
|
connection_get_by_type_state(int type, int state)
|
|
|
|
{
|
2003-09-30 21:06:22 +02:00
|
|
|
int i, n;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2003-09-30 21:25:16 +02:00
|
|
|
get_connection_array(&carray,&n);
|
2004-11-28 10:05:49 +01:00
|
|
|
for (i=0;i<n;i++) {
|
2003-09-30 21:06:22 +02:00
|
|
|
conn = carray[i];
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->type == type && conn->state == state && !conn->marked_for_close)
|
2003-09-30 21:06:22 +02:00
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Return the connection of type <b>type</b> that is in state
|
|
|
|
* <b>state</b>, that was written to least recently, and that is not
|
|
|
|
* marked for close.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
connection_t *
|
|
|
|
connection_get_by_type_state_lastwritten(int type, int state)
|
|
|
|
{
|
2003-09-30 21:06:22 +02:00
|
|
|
int i, n;
|
|
|
|
connection_t *conn, *best=NULL;
|
|
|
|
connection_t **carray;
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2003-09-30 21:25:16 +02:00
|
|
|
get_connection_array(&carray,&n);
|
2004-11-28 10:05:49 +01:00
|
|
|
for (i=0;i<n;i++) {
|
2003-09-30 21:06:22 +02:00
|
|
|
conn = carray[i];
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->type == type && conn->state == state && !conn->marked_for_close)
|
|
|
|
if (!best || conn->timestamp_lastwritten < best->timestamp_lastwritten)
|
2003-09-30 21:06:22 +02:00
|
|
|
best = conn;
|
|
|
|
}
|
|
|
|
return best;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Return a connection of type <b>type</b> that has rendquery equal
|
2005-01-20 00:15:59 +01:00
|
|
|
* to <b>rendquery</b>, and that is not marked for close. If state
|
|
|
|
* is non-zero, conn must be of that state too.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-01-20 00:15:59 +01:00
|
|
|
connection_t *
|
2005-12-14 21:40:40 +01:00
|
|
|
connection_get_by_type_state_rendquery(int type, int state,
|
|
|
|
const char *rendquery)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2004-04-05 02:47:48 +02:00
|
|
|
int i, n;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(type == CONN_TYPE_DIR ||
|
|
|
|
type == CONN_TYPE_AP || type == CONN_TYPE_EXIT);
|
|
|
|
|
2004-04-05 02:47:48 +02:00
|
|
|
get_connection_array(&carray,&n);
|
2004-11-28 10:05:49 +01:00
|
|
|
for (i=0;i<n;i++) {
|
2004-04-05 02:47:48 +02:00
|
|
|
conn = carray[i];
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->type == type &&
|
2004-11-28 12:39:53 +01:00
|
|
|
!conn->marked_for_close &&
|
2006-07-26 21:07:26 +02:00
|
|
|
(!state || state == conn->state)) {
|
|
|
|
if (type == CONN_TYPE_DIR &&
|
|
|
|
rend_cmp_service_ids(rendquery, TO_DIR_CONN(conn)->rend_query))
|
|
|
|
return conn;
|
|
|
|
else if (CONN_IS_EDGE(conn) &&
|
|
|
|
rend_cmp_service_ids(rendquery, TO_EDGE_CONN(conn)->rend_query))
|
|
|
|
return conn;
|
|
|
|
}
|
2004-04-05 02:47:48 +02:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-09-12 08:56:42 +02:00
|
|
|
/** Return an open, non-marked connection of a given type and purpose, or NULL
|
|
|
|
* if no such connection exists. */
|
|
|
|
connection_t *
|
|
|
|
connection_get_by_type_purpose(int type, int purpose)
|
|
|
|
{
|
|
|
|
int i, n;
|
|
|
|
connection_t *conn;
|
|
|
|
connection_t **carray;
|
|
|
|
|
|
|
|
get_connection_array(&carray,&n);
|
|
|
|
for (i=0;i<n;i++) {
|
|
|
|
conn = carray[i];
|
|
|
|
if (conn->type == type &&
|
|
|
|
!conn->marked_for_close &&
|
|
|
|
(purpose == conn->purpose))
|
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Return 1 if <b>conn</b> is a listener conn, else return 0. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_is_listener(connection_t *conn)
|
|
|
|
{
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->type == CONN_TYPE_OR_LISTENER ||
|
2004-11-28 12:39:53 +01:00
|
|
|
conn->type == CONN_TYPE_AP_LISTENER ||
|
2006-08-10 11:01:37 +02:00
|
|
|
conn->type == CONN_TYPE_AP_TRANS_LISTENER ||
|
2004-11-28 12:39:53 +01:00
|
|
|
conn->type == CONN_TYPE_DIR_LISTENER ||
|
|
|
|
conn->type == CONN_TYPE_CONTROL_LISTENER)
|
2002-09-22 00:41:48 +02:00
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Return 1 if <b>conn</b> is in state "open" and is not marked
|
2004-05-10 03:32:57 +02:00
|
|
|
* for close, else return 0.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_state_is_open(connection_t *conn)
|
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
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-11-28 10:05:49 +01:00
|
|
|
if (conn->marked_for_close)
|
2003-11-18 11:17:52 +01:00
|
|
|
return 0;
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if ((conn->type == CONN_TYPE_OR && conn->state == OR_CONN_STATE_OPEN) ||
|
2004-11-28 12:39:53 +01:00
|
|
|
(conn->type == CONN_TYPE_AP && conn->state == AP_CONN_STATE_OPEN) ||
|
|
|
|
(conn->type == CONN_TYPE_EXIT && conn->state == EXIT_CONN_STATE_OPEN) ||
|
2005-06-17 20:49:55 +02:00
|
|
|
(conn->type == CONN_TYPE_CONTROL &&
|
|
|
|
(conn->state == CONTROL_CONN_STATE_OPEN_V0 ||
|
|
|
|
conn->state == CONTROL_CONN_STATE_OPEN_V1)))
|
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;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
/** Return 1 if conn is in 'connecting' state, else return 0. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
connection_state_is_connecting(connection_t *conn)
|
|
|
|
{
|
2004-05-12 21:17:09 +02:00
|
|
|
tor_assert(conn);
|
|
|
|
|
|
|
|
if (conn->marked_for_close)
|
|
|
|
return 0;
|
|
|
|
switch (conn->type)
|
|
|
|
{
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
return conn->state == OR_CONN_STATE_CONNECTING;
|
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
return conn->state == EXIT_CONN_STATE_CONNECTING;
|
|
|
|
case CONN_TYPE_DIR:
|
|
|
|
return conn->state == DIR_CONN_STATE_CONNECTING;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-05-20 10:51:45 +02:00
|
|
|
/** Alloocates a base64'ed authenticator for use in http or https
|
|
|
|
* auth, based on the input string <b>authenticator</b>. Returns it
|
|
|
|
* if success, else returns NULL. */
|
|
|
|
char *
|
2005-06-11 20:52:12 +02:00
|
|
|
alloc_http_authenticator(const char *authenticator)
|
|
|
|
{
|
2005-05-20 10:51:45 +02:00
|
|
|
/* an authenticator in Basic authentication
|
|
|
|
* is just the string "username:password" */
|
|
|
|
const int authenticator_length = strlen(authenticator);
|
|
|
|
/* The base64_encode function needs a minimum buffer length
|
|
|
|
* of 66 bytes. */
|
|
|
|
const int base64_authenticator_length = (authenticator_length/48+1)*66;
|
|
|
|
char *base64_authenticator = tor_malloc(base64_authenticator_length);
|
|
|
|
if (base64_encode(base64_authenticator, base64_authenticator_length,
|
|
|
|
authenticator, authenticator_length) < 0) {
|
|
|
|
tor_free(base64_authenticator); /* free and set to null */
|
|
|
|
} else {
|
|
|
|
/* remove extra \n at end of encoding */
|
|
|
|
base64_authenticator[strlen(base64_authenticator) - 1] = 0;
|
|
|
|
}
|
|
|
|
return base64_authenticator;
|
|
|
|
}
|
|
|
|
|
2006-01-05 22:23:03 +01:00
|
|
|
/** Given a socket handle, check whether the local address (sockname) of the
|
|
|
|
* socket is one that we've connected from before. If so, double-check
|
|
|
|
* whether our address has changed and we need to generate keys. If we do,
|
|
|
|
* call init_keys().
|
2005-08-03 22:42:17 +02:00
|
|
|
*/
|
2006-01-05 22:23:03 +01:00
|
|
|
/* XXXX Handle IPv6, eventually. */
|
2005-08-03 22:42:17 +02:00
|
|
|
static void
|
|
|
|
client_check_address_changed(int sock)
|
|
|
|
{
|
|
|
|
uint32_t iface_ip, ip_out;
|
|
|
|
struct sockaddr_in out_addr;
|
|
|
|
socklen_t out_addr_len = sizeof(out_addr);
|
|
|
|
uint32_t *ip;
|
|
|
|
|
|
|
|
if (!last_interface_ip)
|
2006-09-09 21:20:27 +02:00
|
|
|
get_interface_address(LOG_INFO, &last_interface_ip);
|
2005-08-03 22:42:17 +02:00
|
|
|
if (!outgoing_addrs)
|
|
|
|
outgoing_addrs = smartlist_create();
|
|
|
|
|
|
|
|
if (getsockname(sock, (struct sockaddr*)&out_addr, &out_addr_len)<0) {
|
|
|
|
int e = tor_socket_errno(sock);
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET, "getsockname() failed: %s", tor_socket_strerror(e));
|
2005-08-03 22:42:17 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Okay. If we've used this address previously, we're okay. */
|
|
|
|
ip_out = ntohl(out_addr.sin_addr.s_addr);
|
|
|
|
SMARTLIST_FOREACH(outgoing_addrs, uint32_t*, ip,
|
|
|
|
if (*ip == ip_out) return;
|
|
|
|
);
|
|
|
|
|
|
|
|
/* Uh-oh. We haven't connected from this address before. Has the interface
|
|
|
|
* address changed? */
|
2006-09-09 21:20:27 +02:00
|
|
|
if (get_interface_address(LOG_INFO, &iface_ip)<0)
|
2005-08-03 22:42:17 +02:00
|
|
|
return;
|
|
|
|
ip = tor_malloc(sizeof(uint32_t));
|
|
|
|
*ip = ip_out;
|
|
|
|
|
|
|
|
if (iface_ip == last_interface_ip) {
|
|
|
|
/* Nope, it hasn't changed. Add this address to the list. */
|
|
|
|
smartlist_add(outgoing_addrs, ip);
|
|
|
|
} else {
|
|
|
|
/* The interface changed. We're a client, so we need to regenerate our
|
|
|
|
* keys. First, reset the state. */
|
2005-11-11 18:03:35 +01:00
|
|
|
log(LOG_NOTICE, LD_NET, "Our IP has changed. Rotating keys...");
|
2005-08-03 22:42:17 +02:00
|
|
|
last_interface_ip = iface_ip;
|
|
|
|
SMARTLIST_FOREACH(outgoing_addrs, void*, ip, tor_free(ip));
|
|
|
|
smartlist_clear(outgoing_addrs);
|
|
|
|
smartlist_add(outgoing_addrs, ip);
|
|
|
|
/* Okay, now change our keys. */
|
|
|
|
init_keys(); /* XXXX NM return value-- safe to ignore? */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Process new bytes that have arrived on conn-\>inbuf.
|
2004-05-10 03:32:57 +02:00
|
|
|
*
|
|
|
|
* This function just passes conn to the connection-specific
|
2004-11-21 08:43:12 +01:00
|
|
|
* connection_*_process_inbuf() function. It also passes in
|
|
|
|
* package_partial if wanted.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
connection_process_inbuf(connection_t *conn, int package_partial)
|
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (conn->type) {
|
2002-06-27 00:45:49 +02:00
|
|
|
case CONN_TYPE_OR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_or_process_inbuf(TO_OR_CONN(conn));
|
2002-06-30 09:37:49 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
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
|
|
|
case CONN_TYPE_AP:
|
2006-07-26 21:07:37 +02:00
|
|
|
return connection_edge_process_inbuf(TO_EDGE_CONN(conn),
|
|
|
|
package_partial);
|
2002-09-26 14:09:10 +02:00
|
|
|
case CONN_TYPE_DIR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_dir_process_inbuf(TO_DIR_CONN(conn));
|
2003-06-17 16:31:05 +02:00
|
|
|
case CONN_TYPE_DNSWORKER:
|
2003-12-17 22:09:31 +01:00
|
|
|
return connection_dns_process_inbuf(conn);
|
2003-08-21 01:05:22 +02:00
|
|
|
case CONN_TYPE_CPUWORKER:
|
2003-12-17 22:09:31 +01:00
|
|
|
return connection_cpu_process_inbuf(conn);
|
2004-11-03 02:32:26 +01:00
|
|
|
case CONN_TYPE_CONTROL:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_control_process_inbuf(TO_CONTROL_CONN(conn));
|
2002-06-27 00:45:49 +02:00
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,"Bug: got unexpected conn type %d.", conn->type);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-18 09:38:55 +02:00
|
|
|
/** Called whenever we've written data on a connection. */
|
|
|
|
static int
|
|
|
|
connection_flushed_some(connection_t *conn)
|
|
|
|
{
|
|
|
|
if (conn->type == CONN_TYPE_DIR &&
|
|
|
|
conn->state == DIR_CONN_STATE_SERVER_WRITING)
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_dirserv_flushed_some(TO_DIR_CONN(conn));
|
2006-06-18 09:38:55 +02:00
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** We just finished flushing bytes from conn-\>outbuf, and there
|
2004-05-10 03:32:57 +02:00
|
|
|
* are no more bytes remaining.
|
|
|
|
*
|
|
|
|
* This function just passes conn to the connection-specific
|
|
|
|
* connection_*_finished_flushing() function.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
connection_finished_flushing(connection_t *conn)
|
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-06-18 00:18:26 +02:00
|
|
|
// log_fn(LOG_DEBUG,"entered. Socket %u.", conn->s);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (conn->type) {
|
2002-06-27 00:45:49 +02:00
|
|
|
case CONN_TYPE_OR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_or_finished_flushing(TO_OR_CONN(conn));
|
2003-04-12 00:11:11 +02:00
|
|
|
case CONN_TYPE_AP:
|
2002-06-30 09:37:49 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_edge_finished_flushing(TO_EDGE_CONN(conn));
|
2002-09-26 14:09:10 +02:00
|
|
|
case CONN_TYPE_DIR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_dir_finished_flushing(TO_DIR_CONN(conn));
|
2003-06-17 16:31:05 +02:00
|
|
|
case CONN_TYPE_DNSWORKER:
|
major overhaul: dns slave subsystem, topics
on startup, it forks off a master dns handler, which forks off dns
slaves (like the apache model). slaves as spawned as load increases,
and then reused. excess slaves are not ever killed, currently.
implemented topics. each topic has a receive window in each direction
at each edge of the circuit, and sends sendme's at the data level, as
per before. each circuit also has receive windows in each direction at
each hop; an edge sends a circuit-level sendme as soon as enough data
cells have arrived (regardless of whether the data cells were flushed
to the exit conns). removed the 'connected' cell type, since it's now
a topic command within data cells.
at the edge of the circuit, there can be multiple connections associated
with a single circuit. you find them via the linked list conn->next_topic.
currently each new ap connection starts its own circuit, so we ought
to see comparable performance to what we had before. but that's only
because i haven't written the code to reattach to old circuits. please
try to break it as-is, and then i'll make it reuse the same circuit and
we'll try to break that.
svn:r152
2003-01-26 10:02:24 +01:00
|
|
|
return connection_dns_finished_flushing(conn);
|
2003-08-21 01:05:22 +02:00
|
|
|
case CONN_TYPE_CPUWORKER:
|
|
|
|
return connection_cpu_finished_flushing(conn);
|
2004-11-03 02:32:26 +01:00
|
|
|
case CONN_TYPE_CONTROL:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_control_finished_flushing(TO_CONTROL_CONN(conn));
|
2002-06-27 00:45:49 +02:00
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,"Bug: got unexpected conn type %d.", conn->type);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-12 21:17:09 +02:00
|
|
|
/** Called when our attempt to connect() to another server has just
|
|
|
|
* succeeded.
|
|
|
|
*
|
|
|
|
* This function just passes conn to the connection-specific
|
|
|
|
* connection_*_finished_connecting() function.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
connection_finished_connecting(connection_t *conn)
|
2004-05-12 21:17:09 +02:00
|
|
|
{
|
|
|
|
tor_assert(conn);
|
|
|
|
switch (conn->type)
|
|
|
|
{
|
|
|
|
case CONN_TYPE_OR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_or_finished_connecting(TO_OR_CONN(conn));
|
2004-05-12 21:17:09 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_edge_finished_connecting(TO_EDGE_CONN(conn));
|
2004-05-12 21:17:09 +02:00
|
|
|
case CONN_TYPE_DIR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_dir_finished_connecting(TO_DIR_CONN(conn));
|
2004-05-12 21:17:09 +02:00
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,"Bug: got unexpected conn type %d.", conn->type);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2004-11-21 11:14:57 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/** Callback: invoked when a connection reaches an EOF event. */
|
|
|
|
static int
|
|
|
|
connection_reached_eof(connection_t *conn)
|
2004-11-21 11:14:57 +01:00
|
|
|
{
|
|
|
|
switch (conn->type) {
|
|
|
|
case CONN_TYPE_OR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_or_reached_eof(TO_OR_CONN(conn));
|
2004-11-21 11:14:57 +01:00
|
|
|
case CONN_TYPE_AP:
|
|
|
|
case CONN_TYPE_EXIT:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_edge_reached_eof(TO_EDGE_CONN(conn));
|
2004-11-21 11:14:57 +01:00
|
|
|
case CONN_TYPE_DIR:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_dir_reached_eof(TO_DIR_CONN(conn));
|
2004-11-21 11:14:57 +01:00
|
|
|
case CONN_TYPE_DNSWORKER:
|
|
|
|
return connection_dns_reached_eof(conn);
|
|
|
|
case CONN_TYPE_CPUWORKER:
|
|
|
|
return connection_cpu_reached_eof(conn);
|
|
|
|
case CONN_TYPE_CONTROL:
|
2006-07-26 21:07:26 +02:00
|
|
|
return connection_control_reached_eof(TO_CONTROL_CONN(conn));
|
2004-11-21 11:14:57 +01:00
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,"Bug: got unexpected conn type %d.", conn->type);
|
2005-04-26 20:52:16 +02:00
|
|
|
tor_fragile_assert();
|
2004-05-12 21:17:09 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 03:32:57 +02:00
|
|
|
/** Verify that connection <b>conn</b> has all of its invariants
|
|
|
|
* correct. Trigger an assert if anything is invalid.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
assert_connection_ok(connection_t *conn, time_t now)
|
2003-09-16 21:36:19 +02:00
|
|
|
{
|
2006-06-05 00:42:13 +02:00
|
|
|
(void) now; /* XXXX unused. */
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn);
|
|
|
|
tor_assert(conn->type >= _CONN_TYPE_MIN);
|
|
|
|
tor_assert(conn->type <= _CONN_TYPE_MAX);
|
2006-07-26 21:07:26 +02:00
|
|
|
switch (conn->type) {
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
tor_assert(conn->magic == OR_CONNECTION_MAGIC);
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP:
|
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
tor_assert(conn->magic == EDGE_CONNECTION_MAGIC);
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
|
|
|
tor_assert(conn->magic == DIR_CONNECTION_MAGIC);
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
tor_assert(conn->magic == CONTROL_CONNECTION_MAGIC);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
tor_assert(conn->magic == BASE_CONNECTION_MAGIC);
|
|
|
|
break;
|
|
|
|
}
|
2003-09-16 21:36:19 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->outbuf_flushlen > 0) {
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(connection_is_writing(conn) || conn->wants_to_write);
|
2004-02-27 05:42:14 +01:00
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->hold_open_until_flushed)
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn->marked_for_close);
|
2004-03-03 07:26:34 +01:00
|
|
|
|
2006-07-27 07:03:57 +02:00
|
|
|
/* XXX check: wants_to_read, wants_to_write, s, conn_array_index,
|
2003-09-16 21:36:19 +02:00
|
|
|
* marked_for_close. */
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2003-09-16 21:36:19 +02:00
|
|
|
/* buffers */
|
2003-11-23 19:14:19 +01:00
|
|
|
if (!connection_is_listener(conn)) {
|
2004-03-03 23:49:15 +01:00
|
|
|
assert_buf_ok(conn->inbuf);
|
|
|
|
assert_buf_ok(conn->outbuf);
|
2003-11-23 19:14:19 +01:00
|
|
|
}
|
2003-09-16 21:36:19 +02:00
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
/* XXX Fix this; no longer so.*/
|
|
|
|
#if 0
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->type != CONN_TYPE_OR && conn->type != CONN_TYPE_DIR)
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(!conn->pkey);
|
cleanups, bugfixes, more verbose logs
Fixed up the assert_*_ok funcs some (more work remains)
Changed config so it reads either /etc/torrc or the -f arg, never both
Finally tracked down a nasty bug with our use of tls:
It turns out that if you ask SSL_read() for no more than n bytes, it
will read the entire record from the network (and maybe part of the next
record, I'm not sure), give you n bytes of it, and keep the remaining
bytes internally. This is fine, except our poll-for-read looks at the
network, and there are no bytes pending on the network, so we never know
to ask SSL_read() for more bytes. Currently I've hacked it so if we ask
for n bytes and it returns n bytes, then it reads again right then. This
will interact poorly with our rate limiting; we need a cleaner solution.
svn:r481
2003-09-24 23:24:52 +02:00
|
|
|
/* pkey is set if we're a dir client, or if we're an OR in state OPEN
|
|
|
|
* connected to another OR.
|
|
|
|
*/
|
2003-09-25 07:17:11 +02:00
|
|
|
#endif
|
cleanups, bugfixes, more verbose logs
Fixed up the assert_*_ok funcs some (more work remains)
Changed config so it reads either /etc/torrc or the -f arg, never both
Finally tracked down a nasty bug with our use of tls:
It turns out that if you ask SSL_read() for no more than n bytes, it
will read the entire record from the network (and maybe part of the next
record, I'm not sure), give you n bytes of it, and keep the remaining
bytes internally. This is fine, except our poll-for-read looks at the
network, and there are no bytes pending on the network, so we never know
to ask SSL_read() for more bytes. Currently I've hacked it so if we ask
for n bytes and it returns n bytes, then it reads again right then. This
will interact poorly with our rate limiting; we need a cleaner solution.
svn:r481
2003-09-24 23:24:52 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR) {
|
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->state == OR_CONN_STATE_OPEN) {
|
2004-04-25 22:37:37 +02:00
|
|
|
/* tor_assert(conn->bandwidth > 0); */
|
2004-02-28 08:48:28 +01:00
|
|
|
/* the above isn't necessarily true: if we just did a TLS
|
|
|
|
* handshake but we didn't recognize the other peer, or it
|
|
|
|
* gave a bad cert/etc, then we won't have assigned bandwidth,
|
|
|
|
* yet it will be open. -RD
|
|
|
|
*/
|
2005-01-12 11:00:38 +01:00
|
|
|
// tor_assert(conn->receiver_bucket >= 0);
|
2003-09-27 23:09:56 +02:00
|
|
|
}
|
2005-03-23 21:42:37 +01:00
|
|
|
// tor_assert(conn->addr && conn->port);
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn->address);
|
2005-03-23 23:11:59 +01:00
|
|
|
if (conn->state > OR_CONN_STATE_PROXY_READING)
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(or_conn->tls);
|
2003-09-16 21:36:19 +02:00
|
|
|
}
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
if (CONN_IS_EDGE(conn)) {
|
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
2004-02-24 23:33:30 +01:00
|
|
|
/* XXX unchecked: package window, deliver window. */
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->type == CONN_TYPE_AP) {
|
|
|
|
|
|
|
|
tor_assert(edge_conn->socks_request);
|
|
|
|
if (conn->state == AP_CONN_STATE_OPEN) {
|
|
|
|
tor_assert(edge_conn->socks_request->has_finished);
|
|
|
|
if (!conn->marked_for_close) {
|
|
|
|
tor_assert(edge_conn->cpath_layer);
|
|
|
|
assert_cpath_layer_ok(edge_conn->cpath_layer);
|
|
|
|
}
|
2005-03-23 03:52:55 +01:00
|
|
|
}
|
2004-03-27 06:45:52 +01:00
|
|
|
}
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->type == CONN_TYPE_EXIT) {
|
|
|
|
tor_assert(conn->purpose == EXIT_PURPOSE_CONNECT ||
|
|
|
|
conn->purpose == EXIT_PURPOSE_RESOLVE);
|
|
|
|
}
|
2006-07-27 06:10:51 +02:00
|
|
|
} else if (conn->type != CONN_TYPE_DIR) {
|
|
|
|
/* Purpose is only used for dir and exit types currently */
|
|
|
|
tor_assert(!conn->purpose);
|
2005-09-08 23:21:54 +02:00
|
|
|
}
|
2003-09-16 21:36:19 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (conn->type)
|
2003-09-16 21:36:19 +02:00
|
|
|
{
|
|
|
|
case CONN_TYPE_OR_LISTENER:
|
|
|
|
case CONN_TYPE_AP_LISTENER:
|
2006-08-10 11:01:37 +02:00
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER:
|
2003-09-16 21:36:19 +02:00
|
|
|
case CONN_TYPE_DIR_LISTENER:
|
2004-11-03 02:32:26 +01:00
|
|
|
case CONN_TYPE_CONTROL_LISTENER:
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(conn->state == LISTENER_STATE_READY);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_OR:
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn->state >= _OR_CONN_STATE_MIN);
|
|
|
|
tor_assert(conn->state <= _OR_CONN_STATE_MAX);
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(TO_OR_CONN(conn)->n_circuits >= 0);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_EXIT:
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn->state >= _EXIT_CONN_STATE_MIN);
|
|
|
|
tor_assert(conn->state <= _EXIT_CONN_STATE_MAX);
|
2006-03-13 00:31:16 +01:00
|
|
|
tor_assert(conn->purpose >= _EXIT_PURPOSE_MIN);
|
|
|
|
tor_assert(conn->purpose <= _EXIT_PURPOSE_MAX);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP:
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn->state >= _AP_CONN_STATE_MIN);
|
|
|
|
tor_assert(conn->state <= _AP_CONN_STATE_MAX);
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(TO_EDGE_CONN(conn)->socks_request);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn->state >= _DIR_CONN_STATE_MIN);
|
|
|
|
tor_assert(conn->state <= _DIR_CONN_STATE_MAX);
|
|
|
|
tor_assert(conn->purpose >= _DIR_PURPOSE_MIN);
|
|
|
|
tor_assert(conn->purpose <= _DIR_PURPOSE_MAX);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_DNSWORKER:
|
2006-03-13 00:31:16 +01:00
|
|
|
tor_assert(conn->state >= _DNSWORKER_STATE_MIN);
|
|
|
|
tor_assert(conn->state <= _DNSWORKER_STATE_MAX);
|
2004-02-24 23:33:30 +01:00
|
|
|
break;
|
2003-09-16 21:36:19 +02:00
|
|
|
case CONN_TYPE_CPUWORKER:
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(conn->state >= _CPUWORKER_STATE_MIN);
|
|
|
|
tor_assert(conn->state <= _CPUWORKER_STATE_MAX);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
2004-11-03 02:32:26 +01:00
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
tor_assert(conn->state >= _CONTROL_CONN_STATE_MIN);
|
|
|
|
tor_assert(conn->state <= _CONTROL_CONN_STATE_MAX);
|
|
|
|
break;
|
2003-09-16 21:36:19 +02:00
|
|
|
default:
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(0);
|
2003-09-16 21:36:19 +02:00
|
|
|
}
|
|
|
|
}
|
2005-06-09 21:03:31 +02:00
|
|
|
|