2006-02-09 06:46:49 +01:00
|
|
|
/* Copyright (c) 2001 Matej Pfajfar.
|
|
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
2007-12-12 22:09:01 +01:00
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
2012-06-05 02:58:17 +02:00
|
|
|
* Copyright (c) 2007-2012, The Tor Project, Inc. */
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
/* See LICENSE for licensing information */
|
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"
|
2010-07-22 00:46:18 +02:00
|
|
|
#include "buffers.h"
|
2012-08-01 13:18:42 +02:00
|
|
|
/*
|
|
|
|
* Define this so we get channel internal functions, since we're implementing
|
|
|
|
* part of a subclass (channel_tls_t).
|
|
|
|
*/
|
2012-10-12 18:22:13 +02:00
|
|
|
#define TOR_CHANNEL_INTERNAL_
|
2012-08-01 13:18:42 +02:00
|
|
|
#include "channel.h"
|
|
|
|
#include "channeltls.h"
|
2010-07-22 01:21:00 +02:00
|
|
|
#include "circuitbuild.h"
|
2010-07-22 09:46:23 +02:00
|
|
|
#include "circuitlist.h"
|
2010-07-22 10:03:40 +02:00
|
|
|
#include "circuituse.h"
|
2010-07-22 10:22:51 +02:00
|
|
|
#include "config.h"
|
2010-07-22 10:32:52 +02:00
|
|
|
#include "connection.h"
|
2010-07-22 10:43:02 +02:00
|
|
|
#include "connection_edge.h"
|
2010-07-22 10:50:34 +02:00
|
|
|
#include "connection_or.h"
|
2010-07-22 11:35:09 +02:00
|
|
|
#include "control.h"
|
2010-07-22 11:40:39 +02:00
|
|
|
#include "cpuworker.h"
|
2010-07-22 11:54:50 +02:00
|
|
|
#include "directory.h"
|
2010-07-22 12:09:49 +02:00
|
|
|
#include "dirserv.h"
|
2010-07-22 12:24:25 +02:00
|
|
|
#include "dns.h"
|
2010-07-21 12:26:18 +02:00
|
|
|
#include "dnsserv.h"
|
2012-10-15 20:48:34 +02:00
|
|
|
#include "entrynodes.h"
|
2010-07-21 14:38:52 +02:00
|
|
|
#include "geoip.h"
|
2010-07-23 19:58:06 +02:00
|
|
|
#include "main.h"
|
2010-07-23 20:51:25 +02:00
|
|
|
#include "policies.h"
|
2010-07-23 21:08:30 +02:00
|
|
|
#include "reasons.h"
|
2010-07-23 21:53:11 +02:00
|
|
|
#include "relay.h"
|
2010-07-22 00:13:51 +02:00
|
|
|
#include "rendclient.h"
|
2010-07-21 17:52:54 +02:00
|
|
|
#include "rendcommon.h"
|
2010-07-23 22:57:20 +02:00
|
|
|
#include "rephist.h"
|
2010-07-21 16:17:10 +02:00
|
|
|
#include "router.h"
|
2012-07-12 15:28:43 +02:00
|
|
|
#include "transports.h"
|
2010-07-23 23:23:43 +02:00
|
|
|
#include "routerparse.h"
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2009-08-14 20:34:16 +02:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
|
|
|
#include <event2/event.h>
|
|
|
|
#endif
|
|
|
|
|
2011-09-07 18:51:24 +02:00
|
|
|
#ifdef HAVE_PWD_H
|
|
|
|
#include <pwd.h>
|
|
|
|
#endif
|
|
|
|
|
2012-01-18 21:53:30 +01:00
|
|
|
static connection_t *connection_listener_new(
|
2011-05-02 21:05:10 +02:00
|
|
|
const struct sockaddr *listensockaddr,
|
2008-12-27 01:20:06 +01:00
|
|
|
socklen_t listensocklen, int type,
|
2011-07-06 22:03:47 +02:00
|
|
|
const char *address,
|
|
|
|
const port_cfg_t *portcfg);
|
2008-09-06 00:09:44 +02:00
|
|
|
static void connection_init(time_t now, connection_t *conn, int type,
|
|
|
|
int socket_family);
|
2006-08-10 11:01:37 +02:00
|
|
|
static int connection_init_accepted_conn(connection_t *conn,
|
2011-07-06 22:03:47 +02:00
|
|
|
const listener_connection_t *listener);
|
2003-10-09 20:45:14 +02:00
|
|
|
static int connection_handle_listener_read(connection_t *conn, int new_type);
|
2010-02-22 19:59:34 +01:00
|
|
|
#ifndef USE_BUFFEREVENTS
|
2009-12-30 04:25:02 +01:00
|
|
|
static int connection_bucket_should_increase(int bucket,
|
|
|
|
or_connection_t *conn);
|
2010-02-22 19:59:34 +01:00
|
|
|
#endif
|
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);
|
2011-03-25 21:45:25 +01:00
|
|
|
static int connection_read_to_buf(connection_t *conn, ssize_t *max_to_read,
|
2008-09-14 10:35:41 +02:00
|
|
|
int *socket_error);
|
2004-11-21 08:43:12 +01:00
|
|
|
static int connection_process_inbuf(connection_t *conn, int package_partial);
|
2011-05-23 06:17:48 +02:00
|
|
|
static void client_check_address_changed(tor_socket_t sock);
|
|
|
|
static void set_constrained_socket_buffers(tor_socket_t sock, int size);
|
2005-08-03 22:42:17 +02:00
|
|
|
|
2009-06-19 01:59:18 +02:00
|
|
|
static const char *connection_proxy_state_to_string(int state);
|
|
|
|
static int connection_read_https_proxy_response(connection_t *conn);
|
|
|
|
static void connection_send_socks5_connect(connection_t *conn);
|
2011-06-14 03:27:07 +02:00
|
|
|
static const char *proxy_type_to_string(int proxy_type);
|
2011-06-22 23:28:11 +02:00
|
|
|
static int get_proxy_type(void);
|
2009-06-19 01:59:18 +02:00
|
|
|
|
2012-03-30 22:43:52 +02:00
|
|
|
/** The last addresses that our network interface seemed to have been
|
|
|
|
* binding to. We use this as one way to detect when our IP changes.
|
|
|
|
*
|
|
|
|
* XXX024 We should really use the entire list of interfaces here.
|
|
|
|
**/
|
|
|
|
static tor_addr_t *last_interface_ipv4 = NULL;
|
2012-06-05 01:51:00 +02:00
|
|
|
/* DOCDOC last_interface_ipv6 */
|
2012-03-30 22:43:52 +02:00
|
|
|
static tor_addr_t *last_interface_ipv6 = NULL;
|
|
|
|
/** A list of tor_addr_t for addresses we've used in outgoing connections.
|
2008-12-26 18:35:08 +01:00
|
|
|
* Used to detect IP address changes. */
|
2005-08-03 22:42:17 +02:00
|
|
|
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
|
|
|
|
2011-07-05 23:11:22 +02:00
|
|
|
#define CASE_ANY_LISTENER_TYPE \
|
|
|
|
case CONN_TYPE_OR_LISTENER: \
|
|
|
|
case CONN_TYPE_AP_LISTENER: \
|
|
|
|
case CONN_TYPE_DIR_LISTENER: \
|
|
|
|
case CONN_TYPE_CONTROL_LISTENER: \
|
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER: \
|
|
|
|
case CONN_TYPE_AP_NATD_LISTENER: \
|
|
|
|
case CONN_TYPE_AP_DNS_LISTENER
|
|
|
|
|
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-11-14 01:06:31 +01:00
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER:
|
|
|
|
return "Transparent pf/netfilter listener";
|
|
|
|
case CONN_TYPE_AP_NATD_LISTENER: return "Transparent natd listener";
|
2007-05-24 22:31:30 +02:00
|
|
|
case CONN_TYPE_AP_DNS_LISTENER: return "DNS 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_CPUWORKER: return "CPU worker";
|
|
|
|
case CONN_TYPE_CONTROL_LISTENER: return "Control listener";
|
|
|
|
case CONN_TYPE_CONTROL: return "Control";
|
|
|
|
default:
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_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) {
|
2011-07-05 23:11:22 +02:00
|
|
|
CASE_ANY_LISTENER_TYPE:
|
2005-04-07 22:25:22 +02:00
|
|
|
if (state == LISTENER_STATE_READY)
|
|
|
|
return "ready";
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
switch (state) {
|
|
|
|
case OR_CONN_STATE_CONNECTING: return "connect()ing";
|
2009-06-19 01:59:18 +02:00
|
|
|
case OR_CONN_STATE_PROXY_HANDSHAKING: return "handshaking (proxy)";
|
2007-11-05 19:15:44 +01:00
|
|
|
case OR_CONN_STATE_TLS_HANDSHAKING: return "handshaking (TLS)";
|
2008-01-13 01:20:47 +01:00
|
|
|
case OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING:
|
2011-09-13 16:03:09 +02:00
|
|
|
return "renegotiating (TLS, v2 handshake)";
|
2008-01-13 01:20:47 +01:00
|
|
|
case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
|
2011-09-13 16:03:09 +02:00
|
|
|
return "waiting for renegotiation or V3 handshake";
|
|
|
|
case OR_CONN_STATE_OR_HANDSHAKING_V2:
|
|
|
|
return "handshaking (Tor, v2 handshake)";
|
|
|
|
case OR_CONN_STATE_OR_HANDSHAKING_V3:
|
|
|
|
return "handshaking (Tor, v3 handshake)";
|
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) {
|
2007-02-11 03:15:42 +01:00
|
|
|
case AP_CONN_STATE_SOCKS_WAIT: return "waiting for socks info";
|
2006-11-14 01:06:31 +01:00
|
|
|
case AP_CONN_STATE_NATD_WAIT: return "waiting for natd dest info";
|
2005-04-07 22:25:22 +02:00
|
|
|
case AP_CONN_STATE_RENDDESC_WAIT: return "waiting for rendezvous desc";
|
|
|
|
case AP_CONN_STATE_CONTROLLER_WAIT: return "waiting for controller";
|
2007-02-11 03:15:42 +01:00
|
|
|
case AP_CONN_STATE_CIRCUIT_WAIT: return "waiting for circuit";
|
|
|
|
case AP_CONN_STATE_CONNECT_WAIT: return "waiting for connect response";
|
|
|
|
case AP_CONN_STATE_RESOLVE_WAIT: return "waiting for resolve response";
|
2005-04-07 22:25:22 +02:00
|
|
|
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";
|
2007-04-21 19:26:12 +02:00
|
|
|
case DIR_CONN_STATE_CLIENT_FINISHED: return "client finished";
|
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_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) {
|
2007-03-04 22:08:28 +01:00
|
|
|
case CONTROL_CONN_STATE_OPEN: return "open (protocol v1)";
|
|
|
|
case CONTROL_CONN_STATE_NEEDAUTH:
|
2005-06-17 20:49:55 +02:00
|
|
|
return "waiting for authentication (protocol v1)";
|
2005-04-07 22:25:22 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_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;
|
|
|
|
}
|
|
|
|
|
2009-08-09 19:53:06 +02:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
|
|
|
/** Return true iff the connection's type is one that can use a
|
|
|
|
bufferevent-based implementation. */
|
|
|
|
int
|
|
|
|
connection_type_uses_bufferevent(connection_t *conn)
|
|
|
|
{
|
|
|
|
switch (conn->type) {
|
|
|
|
case CONN_TYPE_AP:
|
2009-08-11 21:03:43 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
2009-08-11 21:16:16 +02:00
|
|
|
case CONN_TYPE_DIR:
|
2009-08-12 01:14:50 +02:00
|
|
|
case CONN_TYPE_CONTROL:
|
2009-08-14 20:34:16 +02:00
|
|
|
case CONN_TYPE_OR:
|
2010-02-22 19:59:34 +01:00
|
|
|
case CONN_TYPE_CPUWORKER:
|
2009-08-11 21:03:43 +02:00
|
|
|
return 1;
|
2009-08-09 19:53:06 +02:00
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Allocate and return a new dir_connection_t, initialized as by
|
|
|
|
* connection_init(). */
|
2008-09-06 00:09:44 +02:00
|
|
|
dir_connection_t *
|
|
|
|
dir_connection_new(int socket_family)
|
|
|
|
{
|
|
|
|
dir_connection_t *dir_conn = tor_malloc_zero(sizeof(dir_connection_t));
|
|
|
|
connection_init(time(NULL), TO_CONN(dir_conn), CONN_TYPE_DIR, socket_family);
|
|
|
|
return dir_conn;
|
|
|
|
}
|
2008-12-22 18:53:04 +01:00
|
|
|
|
|
|
|
/** Allocate and return a new or_connection_t, initialized as by
|
2012-08-27 16:53:40 +02:00
|
|
|
* connection_init().
|
2012-08-02 22:15:23 +02:00
|
|
|
*
|
|
|
|
* Set timestamp_last_added_nonpadding to now.
|
|
|
|
*
|
|
|
|
* Assign a pseudorandom next_circ_id between 0 and 2**15.
|
|
|
|
*
|
|
|
|
* Initialize active_circuit_pqueue.
|
|
|
|
*
|
|
|
|
* Set active_circuit_pqueue_last_recalibrated to current cell_ewma tick.
|
|
|
|
*/
|
2008-09-06 00:09:44 +02:00
|
|
|
or_connection_t *
|
|
|
|
or_connection_new(int socket_family)
|
|
|
|
{
|
|
|
|
or_connection_t *or_conn = tor_malloc_zero(sizeof(or_connection_t));
|
|
|
|
time_t now = time(NULL);
|
|
|
|
connection_init(now, TO_CONN(or_conn), CONN_TYPE_OR, socket_family);
|
|
|
|
|
|
|
|
or_conn->timestamp_last_added_nonpadding = time(NULL);
|
|
|
|
|
|
|
|
return or_conn;
|
|
|
|
}
|
2008-12-22 18:53:04 +01:00
|
|
|
|
2011-07-20 18:38:13 +02:00
|
|
|
/** Allocate and return a new entry_connection_t, initialized as by
|
2012-08-02 22:15:23 +02:00
|
|
|
* connection_init().
|
|
|
|
*
|
|
|
|
* Allocate space to store the socks_request.
|
|
|
|
*/
|
2011-07-20 18:38:13 +02:00
|
|
|
entry_connection_t *
|
|
|
|
entry_connection_new(int type, int socket_family)
|
|
|
|
{
|
|
|
|
entry_connection_t *entry_conn = tor_malloc_zero(sizeof(entry_connection_t));
|
|
|
|
tor_assert(type == CONN_TYPE_AP);
|
|
|
|
connection_init(time(NULL), ENTRY_TO_CONN(entry_conn), type, socket_family);
|
2011-07-20 18:55:42 +02:00
|
|
|
entry_conn->socks_request = socks_request_new();
|
2011-07-20 18:38:13 +02:00
|
|
|
return entry_conn;
|
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Allocate and return a new edge_connection_t, initialized as by
|
|
|
|
* connection_init(). */
|
2008-09-06 00:09:44 +02:00
|
|
|
edge_connection_t *
|
|
|
|
edge_connection_new(int type, int socket_family)
|
|
|
|
{
|
|
|
|
edge_connection_t *edge_conn = tor_malloc_zero(sizeof(edge_connection_t));
|
2011-07-20 18:38:13 +02:00
|
|
|
tor_assert(type == CONN_TYPE_EXIT);
|
2008-09-06 00:09:44 +02:00
|
|
|
connection_init(time(NULL), TO_CONN(edge_conn), type, socket_family);
|
|
|
|
return edge_conn;
|
|
|
|
}
|
2008-12-22 18:53:04 +01:00
|
|
|
|
|
|
|
/** Allocate and return a new control_connection_t, initialized as by
|
|
|
|
* connection_init(). */
|
2008-09-06 00:09:44 +02:00
|
|
|
control_connection_t *
|
|
|
|
control_connection_new(int socket_family)
|
|
|
|
{
|
|
|
|
control_connection_t *control_conn =
|
|
|
|
tor_malloc_zero(sizeof(control_connection_t));
|
|
|
|
connection_init(time(NULL),
|
|
|
|
TO_CONN(control_conn), CONN_TYPE_CONTROL, socket_family);
|
2010-01-02 02:14:02 +01:00
|
|
|
log_notice(LD_CONTROL, "New control connection opened.");
|
2008-09-06 00:09:44 +02:00
|
|
|
return control_conn;
|
|
|
|
}
|
|
|
|
|
2011-07-05 23:11:22 +02:00
|
|
|
/** Allocate and return a new listener_connection_t, initialized as by
|
|
|
|
* connection_init(). */
|
|
|
|
listener_connection_t *
|
|
|
|
listener_connection_new(int type, int socket_family)
|
|
|
|
{
|
|
|
|
listener_connection_t *listener_conn =
|
|
|
|
tor_malloc_zero(sizeof(listener_connection_t));
|
|
|
|
connection_init(time(NULL), TO_CONN(listener_conn), type, socket_family);
|
|
|
|
return listener_conn;
|
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Allocate, initialize, and return a new connection_t subtype of <b>type</b>
|
|
|
|
* to make or receive connections of address family <b>socket_family</b>. The
|
|
|
|
* type should be one of the CONN_TYPE_* constants. */
|
2008-09-06 00:09:44 +02:00
|
|
|
connection_t *
|
|
|
|
connection_new(int type, int socket_family)
|
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
return TO_CONN(or_connection_new(socket_family));
|
|
|
|
|
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
return TO_CONN(edge_connection_new(type, socket_family));
|
|
|
|
|
2011-07-20 18:38:13 +02:00
|
|
|
case CONN_TYPE_AP:
|
|
|
|
return ENTRY_TO_CONN(entry_connection_new(type, socket_family));
|
|
|
|
|
2008-09-06 00:09:44 +02:00
|
|
|
case CONN_TYPE_DIR:
|
|
|
|
return TO_CONN(dir_connection_new(socket_family));
|
|
|
|
|
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
return TO_CONN(control_connection_new(socket_family));
|
|
|
|
|
2011-07-05 23:11:22 +02:00
|
|
|
CASE_ANY_LISTENER_TYPE:
|
|
|
|
return TO_CONN(listener_connection_new(type, socket_family));
|
|
|
|
|
2008-09-06 00:09:44 +02:00
|
|
|
default: {
|
|
|
|
connection_t *conn = tor_malloc_zero(sizeof(connection_t));
|
|
|
|
connection_init(time(NULL), conn, type, socket_family);
|
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Initializes conn. (you must call connection_add() to link it into the main
|
|
|
|
* array).
|
2004-05-09 18:33:04 +02:00
|
|
|
*
|
2012-08-02 22:15:23 +02:00
|
|
|
* Set conn-\>magic to the correct value.
|
|
|
|
*
|
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.
|
|
|
|
*
|
|
|
|
* Initialize conn's timestamps to now.
|
|
|
|
*/
|
2008-09-06 00:09:44 +02:00
|
|
|
static void
|
|
|
|
connection_init(time_t now, connection_t *conn, int type, int socket_family)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2008-08-15 15:55:01 +02:00
|
|
|
static uint64_t n_connections_allocated = 1;
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
switch (type) {
|
|
|
|
case CONN_TYPE_OR:
|
2008-09-06 00:09:44 +02:00
|
|
|
conn->magic = OR_CONNECTION_MAGIC;
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_EXIT:
|
2008-09-06 00:09:44 +02:00
|
|
|
conn->magic = EDGE_CONNECTION_MAGIC;
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP:
|
2011-07-20 18:55:42 +02:00
|
|
|
conn->magic = ENTRY_CONNECTION_MAGIC;
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
2008-09-06 00:09:44 +02:00
|
|
|
conn->magic = DIR_CONNECTION_MAGIC;
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_CONTROL:
|
2008-09-06 00:09:44 +02:00
|
|
|
conn->magic = CONTROL_CONNECTION_MAGIC;
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
2011-07-05 23:11:22 +02:00
|
|
|
CASE_ANY_LISTENER_TYPE:
|
|
|
|
conn->magic = LISTENER_CONNECTION_MAGIC;
|
2011-07-20 18:58:26 +02:00
|
|
|
break;
|
2006-07-26 21:07:26 +02:00
|
|
|
default:
|
2008-09-06 00:09:44 +02:00
|
|
|
conn->magic = BASE_CONNECTION_MAGIC;
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-01-17 22:35:07 +01:00
|
|
|
conn->s = TOR_INVALID_SOCKET; /* 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' */
|
2008-08-15 15:55:01 +02:00
|
|
|
conn->global_identifier = n_connections_allocated++;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
conn->type = type;
|
2007-06-08 23:14:58 +02:00
|
|
|
conn->socket_family = socket_family;
|
2010-02-02 23:49:42 +01:00
|
|
|
#ifndef USE_BUFFEREVENTS
|
2009-08-09 19:53:06 +02: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();
|
|
|
|
}
|
2010-02-02 23:49:42 +01:00
|
|
|
#endif
|
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-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2007-05-25 21:41:31 +02:00
|
|
|
/** Create a link between <b>conn_a</b> and <b>conn_b</b>. */
|
2007-04-21 19:26:12 +02:00
|
|
|
void
|
|
|
|
connection_link_connections(connection_t *conn_a, connection_t *conn_b)
|
|
|
|
{
|
2012-01-17 22:35:07 +01:00
|
|
|
tor_assert(! SOCKET_OK(conn_a->s));
|
|
|
|
tor_assert(! SOCKET_OK(conn_b->s));
|
2007-04-21 19:26:12 +02:00
|
|
|
|
|
|
|
conn_a->linked = 1;
|
|
|
|
conn_b->linked = 1;
|
|
|
|
conn_a->linked_conn = conn_b;
|
|
|
|
conn_b->linked_conn = conn_a;
|
|
|
|
}
|
|
|
|
|
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
|
2012-10-12 18:22:13 +02:00
|
|
|
connection_free_(connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-07-26 21:07:26 +02:00
|
|
|
void *mem;
|
2008-02-07 17:10:33 +01:00
|
|
|
size_t memlen;
|
2009-09-28 16:37:01 +02:00
|
|
|
if (!conn)
|
|
|
|
return;
|
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
switch (conn->type) {
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
tor_assert(conn->magic == OR_CONNECTION_MAGIC);
|
|
|
|
mem = TO_OR_CONN(conn);
|
2008-02-07 17:10:33 +01:00
|
|
|
memlen = sizeof(or_connection_t);
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP:
|
2011-07-20 18:38:13 +02:00
|
|
|
tor_assert(conn->magic == ENTRY_CONNECTION_MAGIC);
|
|
|
|
mem = TO_ENTRY_CONN(conn);
|
|
|
|
memlen = sizeof(entry_connection_t);
|
|
|
|
break;
|
2006-07-26 21:07:26 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
tor_assert(conn->magic == EDGE_CONNECTION_MAGIC);
|
|
|
|
mem = TO_EDGE_CONN(conn);
|
2008-02-07 17:10:33 +01:00
|
|
|
memlen = sizeof(edge_connection_t);
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
|
|
|
tor_assert(conn->magic == DIR_CONNECTION_MAGIC);
|
|
|
|
mem = TO_DIR_CONN(conn);
|
2008-02-07 17:10:33 +01:00
|
|
|
memlen = sizeof(dir_connection_t);
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
tor_assert(conn->magic == CONTROL_CONNECTION_MAGIC);
|
|
|
|
mem = TO_CONTROL_CONN(conn);
|
2008-02-07 17:10:33 +01:00
|
|
|
memlen = sizeof(control_connection_t);
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
2011-07-05 23:11:22 +02:00
|
|
|
CASE_ANY_LISTENER_TYPE:
|
|
|
|
tor_assert(conn->magic == LISTENER_CONNECTION_MAGIC);
|
|
|
|
mem = TO_LISTENER_CONN(conn);
|
|
|
|
memlen = sizeof(listener_connection_t);
|
|
|
|
break;
|
2006-07-26 21:07:26 +02:00
|
|
|
default:
|
|
|
|
tor_assert(conn->magic == BASE_CONNECTION_MAGIC);
|
|
|
|
mem = conn;
|
2008-02-07 17:10:33 +01:00
|
|
|
memlen = sizeof(connection_t);
|
2006-07-26 21:07:26 +02:00
|
|
|
break;
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked) {
|
2007-10-11 00:59:34 +02:00
|
|
|
log_info(LD_GENERAL, "Freeing linked %s connection [%s] with %d "
|
|
|
|
"bytes on inbuf, %d on outbuf.",
|
|
|
|
conn_type_to_string(conn->type),
|
|
|
|
conn_state_to_string(conn->type, conn->state),
|
2009-07-31 17:39:31 +02:00
|
|
|
(int)connection_get_inbuf_len(conn),
|
|
|
|
(int)connection_get_outbuf_len(conn));
|
2007-04-21 19:26:12 +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);
|
2007-06-05 22:54:49 +02:00
|
|
|
} else {
|
2007-06-08 23:14:58 +02:00
|
|
|
if (conn->socket_family == AF_UNIX) {
|
2009-05-27 23:55:51 +02:00
|
|
|
/* For now only control ports can be Unix domain sockets
|
2007-06-05 22:54:49 +02:00
|
|
|
* and listeners at the same time */
|
|
|
|
tor_assert(conn->type == CONN_TYPE_CONTROL_LISTENER);
|
|
|
|
|
|
|
|
if (unlink(conn->address) < 0 && errno != ENOENT) {
|
|
|
|
log_warn(LD_NET, "Could not unlink %s: %s", conn->address,
|
|
|
|
strerror(errno));
|
|
|
|
}
|
|
|
|
}
|
2003-10-14 05:06:48 +02:00
|
|
|
}
|
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);
|
2009-12-12 08:07:59 +01:00
|
|
|
tor_tls_free(or_conn->tls);
|
|
|
|
or_conn->tls = NULL;
|
|
|
|
or_handshake_state_free(or_conn->handshake_state);
|
|
|
|
or_conn->handshake_state = NULL;
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_free(or_conn->nickname);
|
|
|
|
}
|
2011-07-20 18:55:42 +02:00
|
|
|
if (conn->type == CONN_TYPE_AP) {
|
|
|
|
entry_connection_t *entry_conn = TO_ENTRY_CONN(conn);
|
|
|
|
tor_free(entry_conn->chosen_exit_name);
|
|
|
|
tor_free(entry_conn->original_dest_address);
|
|
|
|
if (entry_conn->socks_request)
|
|
|
|
socks_request_free(entry_conn->socks_request);
|
|
|
|
if (entry_conn->pending_optimistic_data) {
|
|
|
|
generic_buffer_free(entry_conn->pending_optimistic_data);
|
2011-07-18 21:38:05 +02:00
|
|
|
}
|
2011-07-20 18:55:42 +02:00
|
|
|
if (entry_conn->sending_optimistic_data) {
|
|
|
|
generic_buffer_free(entry_conn->sending_optimistic_data);
|
2011-07-18 21:38:05 +02:00
|
|
|
}
|
2011-07-20 18:55:42 +02:00
|
|
|
}
|
|
|
|
if (CONN_IS_EDGE(conn)) {
|
|
|
|
rend_data_free(TO_EDGE_CONN(conn)->rend_data);
|
2006-07-26 21:07:26 +02:00
|
|
|
}
|
|
|
|
if (conn->type == CONN_TYPE_CONTROL) {
|
|
|
|
control_connection_t *control_conn = TO_CONTROL_CONN(conn);
|
2012-02-06 19:49:45 +01:00
|
|
|
tor_free(control_conn->safecookie_client_hash);
|
2006-07-26 21:07:26 +02:00
|
|
|
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. */
|
2009-07-31 17:11:45 +02:00
|
|
|
IF_HAS_BUFFEREVENT(conn, {
|
2010-04-10 00:45:08 +02:00
|
|
|
/* This was a workaround to handle bugs in some old versions of libevent
|
|
|
|
* where callbacks can occur after calling bufferevent_free(). Setting
|
|
|
|
* the callbacks to NULL prevented this. It shouldn't be necessary any
|
|
|
|
* more, but let's not tempt fate for now. */
|
2010-02-22 19:59:34 +01:00
|
|
|
bufferevent_setcb(conn->bufev, NULL, NULL, NULL, NULL);
|
2009-07-31 17:11:45 +02:00
|
|
|
bufferevent_free(conn->bufev);
|
|
|
|
conn->bufev = NULL;
|
|
|
|
});
|
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);
|
2009-12-12 08:07:59 +01:00
|
|
|
|
|
|
|
tor_zlib_free(dir_conn->zlib_state);
|
2006-07-26 21:07:26 +02:00
|
|
|
if (dir_conn->fingerprint_stack) {
|
|
|
|
SMARTLIST_FOREACH(dir_conn->fingerprint_stack, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(dir_conn->fingerprint_stack);
|
|
|
|
}
|
2009-12-12 08:07:59 +01:00
|
|
|
|
|
|
|
cached_dir_decref(dir_conn->cached_dir);
|
|
|
|
rend_data_free(dir_conn->rend_data);
|
2006-07-26 21:07:26 +02:00
|
|
|
}
|
2005-02-25 06:42:01 +01:00
|
|
|
|
2011-05-23 06:17:48 +02:00
|
|
|
if (SOCKET_OK(conn->s)) {
|
|
|
|
log_debug(LD_NET,"closing fd %d.",(int)conn->s);
|
2005-02-10 00:16:31 +01:00
|
|
|
tor_close_socket(conn->s);
|
2012-01-17 22:35:07 +01:00
|
|
|
conn->s = TOR_INVALID_SOCKET;
|
2005-02-10 00:16:31 +01:00
|
|
|
}
|
|
|
|
|
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
|
|
|
}
|
2010-02-22 19:59:34 +01:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
|
|
|
if (conn->type == CONN_TYPE_OR && TO_OR_CONN(conn)->bucket_cfg) {
|
|
|
|
ev_token_bucket_cfg_free(TO_OR_CONN(conn)->bucket_cfg);
|
2011-09-01 12:24:05 +02:00
|
|
|
TO_OR_CONN(conn)->bucket_cfg = NULL;
|
2010-02-22 19:59:34 +01:00
|
|
|
}
|
|
|
|
#endif
|
2005-11-30 04:01:16 +01:00
|
|
|
|
2012-11-07 22:09:58 +01:00
|
|
|
memwipe(mem, 0xCC, memlen); /* 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)
|
|
|
|
{
|
2009-09-28 16:37:01 +02:00
|
|
|
if (!conn)
|
|
|
|
return;
|
2005-01-31 02:02:20 +01:00
|
|
|
tor_assert(!connection_is_on_closeable_list(conn));
|
|
|
|
tor_assert(!connection_in_array(conn));
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked_conn) {
|
|
|
|
log_err(LD_BUG, "Called with conn->linked_conn still set.");
|
|
|
|
tor_fragile_assert();
|
|
|
|
conn->linked_conn->linked_conn = NULL;
|
|
|
|
if (! conn->linked_conn->marked_for_close &&
|
|
|
|
conn->linked_conn->reading_from_linked_conn)
|
|
|
|
connection_start_reading(conn->linked_conn);
|
|
|
|
conn->linked_conn = NULL;
|
|
|
|
}
|
2005-04-06 02:46:57 +02:00
|
|
|
if (connection_speaks_cells(conn)) {
|
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) {
|
2011-05-20 01:27:51 +02:00
|
|
|
connection_control_closed(TO_CONTROL_CONN(conn));
|
2005-08-07 21:20:55 +02:00
|
|
|
}
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_unregister_events(conn);
|
2012-10-12 18:22:13 +02:00
|
|
|
connection_free_(conn);
|
2005-01-31 02:02:20 +01:00
|
|
|
}
|
|
|
|
|
2011-06-22 19:57:19 +02:00
|
|
|
/**
|
|
|
|
* Called when we're about to finally unlink and free a connection:
|
|
|
|
* perform necessary accounting and cleanup
|
2004-11-15 08:50:15 +01:00
|
|
|
* - 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.
|
2006-12-04 06:55:40 +01:00
|
|
|
* - OR and edge connections need to be unlinked from circuits.
|
2004-11-15 08:50:15 +01:00
|
|
|
*/
|
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
|
|
|
{
|
2007-06-05 03:09:09 +02:00
|
|
|
tor_assert(conn->marked_for_close);
|
2004-06-02 20:32:24 +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:
|
2011-06-22 19:57:19 +02:00
|
|
|
connection_dir_about_to_close(TO_DIR_CONN(conn));
|
2004-05-12 23:12:33 +02:00
|
|
|
break;
|
2004-05-20 01:32:20 +02:00
|
|
|
case CONN_TYPE_OR:
|
2011-06-22 19:57:19 +02:00
|
|
|
connection_or_about_to_close(TO_OR_CONN(conn));
|
2004-05-20 01:32:20 +02:00
|
|
|
break;
|
2004-05-12 23:12:33 +02:00
|
|
|
case CONN_TYPE_AP:
|
2011-07-20 18:55:42 +02:00
|
|
|
connection_ap_about_to_close(TO_ENTRY_CONN(conn));
|
2004-05-20 01:32:20 +02:00
|
|
|
break;
|
2004-05-12 23:12:33 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
2011-06-22 19:57:19 +02:00
|
|
|
connection_exit_about_to_close(TO_EDGE_CONN(conn));
|
2004-05-20 01:32:20 +02:00
|
|
|
break;
|
2004-05-12 23:12:33 +02:00
|
|
|
}
|
2004-05-12 22:36:44 +02:00
|
|
|
}
|
|
|
|
|
2007-10-12 00:19:18 +02:00
|
|
|
/** Return true iff connection_close_immediate() has been called on this
|
|
|
|
* connection. */
|
2007-10-11 22:45:26 +02:00
|
|
|
#define CONN_IS_CLOSED(c) \
|
2012-01-17 22:35:07 +01:00
|
|
|
((c)->linked ? ((c)->linked_conn_is_closed) : (! SOCKET_OK(c->s)))
|
2007-10-11 22:45:26 +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);
|
2007-10-11 22:45:26 +02:00
|
|
|
if (CONN_IS_CLOSED(conn)) {
|
2007-03-04 21:11:46 +01:00
|
|
|
log_err(LD_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.",
|
2011-05-23 06:17:48 +02:00
|
|
|
(int)conn->s, conn_type_to_string(conn->type),
|
2006-02-13 10:02:35 +01:00
|
|
|
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
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
connection_unregister_events(conn);
|
2005-02-25 06:42:01 +01:00
|
|
|
|
2011-05-23 06:17:48 +02:00
|
|
|
if (SOCKET_OK(conn->s))
|
2007-04-21 19:26:12 +02:00
|
|
|
tor_close_socket(conn->s);
|
2012-01-17 22:35:07 +01:00
|
|
|
conn->s = TOR_INVALID_SOCKET;
|
2007-10-11 22:45:26 +02:00
|
|
|
if (conn->linked)
|
|
|
|
conn->linked_conn_is_closed = 1;
|
2009-08-11 23:45:01 +02:00
|
|
|
if (conn->outbuf)
|
2004-03-03 02:58:45 +01:00
|
|
|
buf_clear(conn->outbuf);
|
2009-08-11 23:45:01 +02:00
|
|
|
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
|
2012-10-12 18:22:13 +02:00
|
|
|
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);
|
2008-02-20 01:46:09 +01:00
|
|
|
tor_assert(line < 1<<16); /* marked_for_close can only fit a uint16_t. */
|
2005-04-03 07:22:33 +02:00
|
|
|
tor_assert(file);
|
2004-02-27 23:00:26 +01:00
|
|
|
|
2012-11-09 23:06:54 +01:00
|
|
|
if (conn->type == CONN_TYPE_OR) {
|
|
|
|
/*
|
|
|
|
* An or_connection should have been closed through one of the channel-
|
|
|
|
* aware functions in connection_or.c. We'll assume this is an error
|
|
|
|
* close and do that, and log a bug warning.
|
|
|
|
*/
|
|
|
|
log_warn(LD_CHANNEL | LD_BUG,
|
|
|
|
"Something tried to close an or_connection_t without going "
|
|
|
|
"through channels at %s:%d",
|
|
|
|
file, line);
|
|
|
|
connection_or_close_for_error(TO_OR_CONN(conn), 0);
|
|
|
|
} else {
|
|
|
|
/* Pass it down to the real function */
|
|
|
|
connection_mark_for_close_internal_(conn, line, file);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Mark <b>conn</b> to be closed next time we loop through
|
|
|
|
* conn_close_if_marked() in main.c; the _internal version bypasses the
|
|
|
|
* CONN_TYPE_OR checks; this should be called when you either are sure that
|
|
|
|
* if this is an or_connection_t the controlling channel has been notified
|
|
|
|
* (e.g. with connection_or_notify_error()), or you actually are the
|
|
|
|
* connection_or_close_for_error() or connection_or_close_normally function.
|
|
|
|
* For all other cases, use connection_mark_and_flush() instead, which
|
|
|
|
* checks for or_connection_t properly, instead. See below.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
connection_mark_for_close_internal_(connection_t *conn,
|
|
|
|
int line, const char *file)
|
|
|
|
{
|
|
|
|
assert_connection_ok(conn,0);
|
|
|
|
tor_assert(line);
|
|
|
|
tor_assert(line < 1<<16); /* marked_for_close can only fit a uint16_t. */
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2012-08-01 13:18:42 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR) {
|
|
|
|
/*
|
|
|
|
* Bad news if this happens without telling the controlling channel; do
|
|
|
|
* this so we can find things that call this wrongly when the asserts hit.
|
|
|
|
*/
|
|
|
|
log_debug(LD_CHANNEL,
|
2012-11-09 23:06:54 +01:00
|
|
|
"Calling connection_mark_for_close_internal_() on an OR conn "
|
|
|
|
"at %s:%d",
|
2012-08-01 13:18:42 +02:00
|
|
|
file, line);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
|
|
|
time_t now;
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
2004-03-03 06:08:01 +01:00
|
|
|
|
|
|
|
now = time(NULL);
|
|
|
|
|
2012-07-17 15:33:38 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) {
|
2004-03-03 06:08:01 +01:00
|
|
|
/* 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).",
|
2011-05-23 06:17:48 +02:00
|
|
|
(int)conn->s, conn_type_to_string(conn->type),
|
2005-04-07 22:25:22 +02:00
|
|
|
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
|
|
|
}
|
2012-07-17 15:33:38 +02:00
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
2004-03-03 06:08:01 +01:00
|
|
|
}
|
|
|
|
|
2012-06-05 01:51:00 +02:00
|
|
|
#if defined(HAVE_SYS_UN_H) || defined(RUNNING_DOXYGEN)
|
2007-06-05 22:54:49 +02:00
|
|
|
/** Create an AF_UNIX listenaddr struct.
|
2009-05-27 23:55:51 +02:00
|
|
|
* <b>listenaddress</b> provides the path to the Unix socket.
|
2007-06-05 22:54:49 +02:00
|
|
|
*
|
|
|
|
* Eventually <b>listenaddress</b> will also optionally contain user, group,
|
|
|
|
* and file permissions for the new socket. But not yet. XXX
|
|
|
|
* Also, since we do not create the socket here the information doesn't help
|
|
|
|
* here.
|
|
|
|
*
|
2009-05-27 23:55:51 +02:00
|
|
|
* If not NULL <b>readable_address</b> will contain a copy of the path part of
|
2007-06-05 22:54:49 +02:00
|
|
|
* <b>listenaddress</b>.
|
|
|
|
*
|
|
|
|
* The listenaddr struct has to be freed by the caller.
|
|
|
|
*/
|
|
|
|
static struct sockaddr_un *
|
2008-12-27 16:46:13 +01:00
|
|
|
create_unix_sockaddr(const char *listenaddress, char **readable_address,
|
|
|
|
socklen_t *len_out)
|
2007-06-05 22:54:49 +02:00
|
|
|
{
|
|
|
|
struct sockaddr_un *sockaddr = NULL;
|
|
|
|
|
|
|
|
sockaddr = tor_malloc_zero(sizeof(struct sockaddr_un));
|
|
|
|
sockaddr->sun_family = AF_UNIX;
|
2011-07-01 18:06:54 +02:00
|
|
|
if (strlcpy(sockaddr->sun_path, listenaddress, sizeof(sockaddr->sun_path))
|
|
|
|
>= sizeof(sockaddr->sun_path)) {
|
|
|
|
log_warn(LD_CONFIG, "Unix socket path '%s' is too long to fit.",
|
|
|
|
escaped(listenaddress));
|
|
|
|
tor_free(sockaddr);
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-06-05 22:54:49 +02:00
|
|
|
|
|
|
|
if (readable_address)
|
|
|
|
*readable_address = tor_strdup(listenaddress);
|
|
|
|
|
2008-12-27 16:46:13 +01:00
|
|
|
*len_out = sizeof(struct sockaddr_un);
|
2007-06-05 22:54:49 +02:00
|
|
|
return sockaddr;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static struct sockaddr *
|
2008-12-27 16:46:13 +01:00
|
|
|
create_unix_sockaddr(const char *listenaddress, char **readable_address,
|
|
|
|
socklen_t *len_out)
|
2007-06-05 22:54:49 +02:00
|
|
|
{
|
2007-08-17 23:46:34 +02:00
|
|
|
(void)listenaddress;
|
|
|
|
(void)readable_address;
|
2007-06-05 22:54:49 +02:00
|
|
|
log_fn(LOG_ERR, LD_BUG,
|
|
|
|
"Unix domain sockets not supported, yet we tried to create one.");
|
2008-12-27 16:46:13 +01:00
|
|
|
*len_out = 0;
|
2012-06-05 16:36:34 +02:00
|
|
|
tor_fragile_assert();
|
2012-05-14 19:07:27 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2007-06-05 22:54:49 +02:00
|
|
|
#endif /* HAVE_SYS_UN_H */
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Warn that an accept or a connect has failed because we're running up
|
|
|
|
* against our ulimit. Rate-limit these warnings so that we don't spam
|
|
|
|
* the log. */
|
2008-08-09 17:13:28 +02:00
|
|
|
static void
|
|
|
|
warn_too_many_conns(void)
|
|
|
|
{
|
|
|
|
#define WARN_TOO_MANY_CONNS_INTERVAL (6*60*60)
|
2010-08-18 21:55:49 +02:00
|
|
|
static ratelim_t last_warned = RATELIM_INIT(WARN_TOO_MANY_CONNS_INTERVAL);
|
|
|
|
char *m;
|
|
|
|
if ((m = rate_limit_log(&last_warned, approx_time()))) {
|
|
|
|
int n_conns = get_n_open_sockets();
|
2008-08-09 17:13:28 +02:00
|
|
|
log_warn(LD_NET,"Failing because we have %d connections already. Please "
|
2010-08-18 21:55:49 +02:00
|
|
|
"raise your ulimit -n.%s", n_conns, m);
|
|
|
|
tor_free(m);
|
2010-01-31 21:54:04 +01:00
|
|
|
control_event_general_status(LOG_WARN, "TOO_MANY_CONNECTIONS CURRENT=%d",
|
|
|
|
n_conns);
|
2008-08-09 17:13:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-13 21:46:53 +02:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
/** Check whether we should be willing to open an AF_UNIX socket in
|
|
|
|
* <b>path</b>. Return 0 if we should go ahead and -1 if we shouldn't. */
|
|
|
|
static int
|
2011-06-14 19:01:38 +02:00
|
|
|
check_location_for_unix_socket(const or_options_t *options, const char *path)
|
2011-05-13 21:46:53 +02:00
|
|
|
{
|
|
|
|
int r = -1;
|
|
|
|
char *p = tor_strdup(path);
|
|
|
|
cpd_check_t flags = CPD_CHECK_MODE_ONLY;
|
|
|
|
if (get_parent_directory(p)<0)
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
if (options->ControlSocketsGroupWritable)
|
|
|
|
flags |= CPD_GROUP_OK;
|
|
|
|
|
2011-06-14 18:18:32 +02:00
|
|
|
if (check_private_dir(p, flags, options->User) < 0) {
|
2011-05-13 21:46:53 +02:00
|
|
|
char *escpath, *escdir;
|
|
|
|
escpath = esc_for_log(path);
|
|
|
|
escdir = esc_for_log(p);
|
|
|
|
log_warn(LD_GENERAL, "Before Tor can create a control socket in %s, the "
|
|
|
|
"directory %s needs to exist, and to be accessible only by the "
|
|
|
|
"user%s account that is running Tor. (On some Unix systems, "
|
2011-12-30 18:06:41 +01:00
|
|
|
"anybody who can list a socket can connect to it, so Tor is "
|
2011-05-13 21:46:53 +02:00
|
|
|
"being careful.)", escpath, escdir,
|
|
|
|
options->ControlSocketsGroupWritable ? " and group" : "");
|
|
|
|
tor_free(escpath);
|
|
|
|
tor_free(escdir);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = 0;
|
|
|
|
done:
|
|
|
|
tor_free(p);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-05-04 04:22:20 +02:00
|
|
|
/** Tell the TCP stack that it shouldn't wait for a long time after
|
|
|
|
* <b>sock</b> has closed before reusing its port. */
|
|
|
|
static void
|
2011-05-23 06:17:48 +02:00
|
|
|
make_socket_reuseable(tor_socket_t sock)
|
2011-05-04 04:22:20 +02:00
|
|
|
{
|
2012-01-31 16:59:42 +01:00
|
|
|
#ifdef _WIN32
|
2011-05-04 04:22:20 +02:00
|
|
|
(void) sock;
|
|
|
|
#else
|
|
|
|
int one=1;
|
|
|
|
|
|
|
|
/* REUSEADDR on normal places means you can rebind to the port
|
|
|
|
* right after somebody else has let it go. But REUSEADDR on win32
|
|
|
|
* means you can bind to the port _even when somebody else
|
|
|
|
* already has it bound_. So, don't do that on Win32. */
|
|
|
|
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &one,
|
|
|
|
(socklen_t)sizeof(one));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2007-06-05 22:54:49 +02:00
|
|
|
/** Bind a new non-blocking socket listening to the socket described
|
|
|
|
* by <b>listensockaddr</b>.
|
|
|
|
*
|
|
|
|
* <b>address</b> is only used for logging purposes and to add the information
|
|
|
|
* to the conn.
|
|
|
|
*/
|
|
|
|
static connection_t *
|
2012-01-18 21:53:30 +01:00
|
|
|
connection_listener_new(const struct sockaddr *listensockaddr,
|
2011-05-02 21:05:10 +02:00
|
|
|
socklen_t socklen,
|
2011-07-06 22:03:47 +02:00
|
|
|
int type, const char *address,
|
|
|
|
const port_cfg_t *port_cfg)
|
2007-06-05 22:54:49 +02:00
|
|
|
{
|
2011-07-06 22:03:47 +02:00
|
|
|
listener_connection_t *lis_conn;
|
2007-06-05 22:54:49 +02:00
|
|
|
connection_t *conn;
|
2011-05-23 06:17:48 +02:00
|
|
|
tor_socket_t s; /* the socket we're going to make */
|
2011-09-07 18:51:24 +02:00
|
|
|
or_options_t const *options = get_options();
|
|
|
|
#if defined(HAVE_PWD_H) && defined(HAVE_SYS_UN_H)
|
|
|
|
struct passwd *pw = NULL;
|
|
|
|
#endif
|
2011-05-02 21:05:10 +02:00
|
|
|
uint16_t usePort = 0, gotPort = 0;
|
2007-06-05 22:54:49 +02:00
|
|
|
int start_reading = 0;
|
2011-07-08 21:54:30 +02:00
|
|
|
static int global_next_session_group = SESSION_GROUP_FIRST_AUTO;
|
2011-07-20 19:11:29 +02:00
|
|
|
tor_addr_t addr;
|
2005-07-15 01:04:31 +02:00
|
|
|
|
2012-10-12 18:22:13 +02:00
|
|
|
if (get_n_open_sockets() >= get_options()->ConnLimit_-1) {
|
2008-08-09 17:13:28 +02:00
|
|
|
warn_too_many_conns();
|
2007-04-21 19:24:18 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-11-24 19:01:56 +01:00
|
|
|
if (listensockaddr->sa_family == AF_INET ||
|
|
|
|
listensockaddr->sa_family == AF_INET6) {
|
2007-06-05 22:54:49 +02:00
|
|
|
int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER);
|
|
|
|
if (is_tcp)
|
|
|
|
start_reading = 1;
|
|
|
|
|
2011-05-02 21:05:10 +02:00
|
|
|
tor_addr_from_sockaddr(&addr, listensockaddr, &usePort);
|
2007-06-05 22:54:49 +02:00
|
|
|
|
2012-10-07 06:25:25 +02:00
|
|
|
log_notice(LD_NET, "Opening %s on %s",
|
|
|
|
conn_type_to_string(type), fmt_addrport(&addr, usePort));
|
2007-06-05 22:54:49 +02:00
|
|
|
|
2011-11-24 19:01:56 +01:00
|
|
|
s = tor_open_socket(tor_addr_family(&addr),
|
2007-06-05 22:54:49 +02:00
|
|
|
is_tcp ? SOCK_STREAM : SOCK_DGRAM,
|
|
|
|
is_tcp ? IPPROTO_TCP: IPPROTO_UDP);
|
2011-05-23 06:17:48 +02:00
|
|
|
if (!SOCKET_OK(s)) {
|
2011-09-15 15:51:48 +02:00
|
|
|
log_warn(LD_NET,"Socket creation failed: %s",
|
|
|
|
tor_socket_strerror(tor_socket_errno(-1)));
|
2007-06-05 22:54:49 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2011-05-04 04:22:20 +02:00
|
|
|
make_socket_reuseable(s);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2012-01-31 22:09:49 +01:00
|
|
|
#ifdef IPV6_V6ONLY
|
|
|
|
if (listensockaddr->sa_family == AF_INET6) {
|
|
|
|
#ifdef _WIN32
|
|
|
|
/* In Redmond, this kind of thing passes for standards-conformance. */
|
|
|
|
DWORD one = 1;
|
|
|
|
#else
|
|
|
|
int one = 1;
|
|
|
|
#endif
|
|
|
|
/* We need to set IPV6_V6ONLY so that this socket can't get used for
|
|
|
|
* IPv4 connections. */
|
2012-03-28 15:02:15 +02:00
|
|
|
if (setsockopt(s,IPPROTO_IPV6, IPV6_V6ONLY,
|
|
|
|
(void*)&one, sizeof(one))<0) {
|
2012-01-31 22:09:49 +01:00
|
|
|
int e = tor_socket_errno(s);
|
|
|
|
log_warn(LD_NET, "Error setting IPV6_V6ONLY flag: %s",
|
|
|
|
tor_socket_strerror(e));
|
|
|
|
/* Keep going; probably not harmful. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-12-27 01:20:06 +01:00
|
|
|
if (bind(s,listensockaddr,socklen) < 0) {
|
2007-06-05 22:54:49 +02:00
|
|
|
const char *helpfulhint = "";
|
|
|
|
int e = tor_socket_errno(s);
|
|
|
|
if (ERRNO_IS_EADDRINUSE(e))
|
|
|
|
helpfulhint = ". Is Tor already running?";
|
|
|
|
log_warn(LD_NET, "Could not bind to %s:%u: %s%s", address, usePort,
|
|
|
|
tor_socket_strerror(e), helpfulhint);
|
|
|
|
tor_close_socket(s);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_tcp) {
|
|
|
|
if (listen(s,SOMAXCONN) < 0) {
|
|
|
|
log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort,
|
|
|
|
tor_socket_strerror(tor_socket_errno(s)));
|
|
|
|
tor_close_socket(s);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2011-05-02 21:05:10 +02:00
|
|
|
|
|
|
|
if (usePort != 0) {
|
|
|
|
gotPort = usePort;
|
|
|
|
} else {
|
|
|
|
tor_addr_t addr2;
|
|
|
|
struct sockaddr_storage ss;
|
|
|
|
socklen_t ss_len=sizeof(ss);
|
|
|
|
if (getsockname(s, (struct sockaddr*)&ss, &ss_len)<0) {
|
|
|
|
log_warn(LD_NET, "getsockname() couldn't learn address for %s: %s",
|
|
|
|
conn_type_to_string(type),
|
|
|
|
tor_socket_strerror(tor_socket_errno(s)));
|
|
|
|
gotPort = 0;
|
|
|
|
}
|
|
|
|
tor_addr_from_sockaddr(&addr2, (struct sockaddr*)&ss, &gotPort);
|
|
|
|
}
|
2007-06-05 22:54:49 +02:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
} else if (listensockaddr->sa_family == AF_UNIX) {
|
|
|
|
start_reading = 1;
|
|
|
|
|
2009-05-27 23:55:51 +02:00
|
|
|
/* For now only control ports can be Unix domain sockets
|
2007-06-05 22:54:49 +02:00
|
|
|
* and listeners at the same time */
|
|
|
|
tor_assert(type == CONN_TYPE_CONTROL_LISTENER);
|
|
|
|
|
2011-09-07 18:51:24 +02:00
|
|
|
if (check_location_for_unix_socket(options, address) < 0)
|
2011-05-13 21:46:53 +02:00
|
|
|
goto err;
|
|
|
|
|
2007-06-05 22:54:49 +02:00
|
|
|
log_notice(LD_NET, "Opening %s on %s",
|
|
|
|
conn_type_to_string(type), address);
|
|
|
|
|
2011-07-20 19:11:29 +02:00
|
|
|
tor_addr_make_unspec(&addr);
|
|
|
|
|
2007-06-05 22:54:49 +02:00
|
|
|
if (unlink(address) < 0 && errno != ENOENT) {
|
|
|
|
log_warn(LD_NET, "Could not unlink %s: %s", address,
|
|
|
|
strerror(errno));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
s = tor_open_socket(AF_UNIX, SOCK_STREAM, 0);
|
2012-01-17 22:35:07 +01:00
|
|
|
if (! SOCKET_OK(s)) {
|
2007-06-05 22:54:49 +02:00
|
|
|
log_warn(LD_NET,"Socket creation failed: %s.", strerror(errno));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2008-02-24 23:11:00 +01:00
|
|
|
if (bind(s, listensockaddr, (socklen_t)sizeof(struct sockaddr_un)) == -1) {
|
2007-06-05 22:54:49 +02:00
|
|
|
log_warn(LD_NET,"Bind to %s failed: %s.", address,
|
|
|
|
tor_socket_strerror(tor_socket_errno(s)));
|
|
|
|
goto err;
|
|
|
|
}
|
2011-09-07 18:51:24 +02:00
|
|
|
#ifdef HAVE_PWD_H
|
|
|
|
if (options->User) {
|
|
|
|
pw = getpwnam(options->User);
|
|
|
|
if (pw == NULL) {
|
|
|
|
log_warn(LD_NET,"Unable to chown() %s socket: user %s not found.",
|
|
|
|
address, options->User);
|
|
|
|
} else if (chown(address, pw->pw_uid, pw->pw_gid) < 0) {
|
2011-09-08 02:26:58 +02:00
|
|
|
log_warn(LD_NET,"Unable to chown() %s socket: %s.",
|
|
|
|
address, strerror(errno));
|
2011-09-07 18:51:24 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (options->ControlSocketsGroupWritable) {
|
2011-05-13 21:15:41 +02:00
|
|
|
/* We need to use chmod; fchmod doesn't work on sockets on all
|
|
|
|
* platforms. */
|
2011-04-23 02:35:02 +02:00
|
|
|
if (chmod(address, 0660) < 0) {
|
2011-04-23 02:57:53 +02:00
|
|
|
log_warn(LD_FS,"Unable to make %s group-writable.", address);
|
2011-04-23 02:35:02 +02:00
|
|
|
tor_close_socket(s);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-05-24 22:31:30 +02:00
|
|
|
if (listen(s,SOMAXCONN) < 0) {
|
2007-06-05 22:54:49 +02:00
|
|
|
log_warn(LD_NET, "Could not listen on %s: %s", address,
|
2007-05-24 22:31:30 +02:00
|
|
|
tor_socket_strerror(tor_socket_errno(s)));
|
|
|
|
tor_close_socket(s);
|
|
|
|
goto err;
|
|
|
|
}
|
2011-11-15 13:29:32 +01:00
|
|
|
#else
|
|
|
|
(void)options;
|
2007-06-05 22:54:49 +02:00
|
|
|
#endif /* HAVE_SYS_UN_H */
|
|
|
|
} else {
|
|
|
|
log_err(LD_BUG,"Got unexpected address family %d.",
|
|
|
|
listensockaddr->sa_family);
|
|
|
|
tor_assert(0);
|
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
|
|
|
|
2011-07-06 22:03:47 +02:00
|
|
|
lis_conn = listener_connection_new(type, listensockaddr->sa_family);
|
|
|
|
conn = TO_CONN(lis_conn);
|
2007-06-08 23:14:58 +02:00
|
|
|
conn->socket_family = listensockaddr->sa_family;
|
2002-06-27 00:45:49 +02:00
|
|
|
conn->s = s;
|
2007-06-05 22:54:49 +02:00
|
|
|
conn->address = tor_strdup(address);
|
2011-05-02 21:05:10 +02:00
|
|
|
conn->port = gotPort;
|
2011-07-20 19:11:29 +02:00
|
|
|
tor_addr_copy(&conn->addr, &addr);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2011-07-06 22:03:47 +02:00
|
|
|
if (port_cfg->isolation_flags) {
|
|
|
|
lis_conn->isolation_flags = port_cfg->isolation_flags;
|
|
|
|
if (port_cfg->session_group >= 0) {
|
|
|
|
lis_conn->session_group = port_cfg->session_group;
|
|
|
|
} else {
|
2012-06-15 23:08:25 +02:00
|
|
|
/* This can wrap after around INT_MAX listeners are opened. But I don't
|
2012-06-15 16:05:21 +02:00
|
|
|
* believe that matters, since you would need to open a ridiculous
|
|
|
|
* number of listeners while keeping the early ones open before you ever
|
|
|
|
* hit this. An OR with a dozen ports open, for example, would have to
|
2012-06-16 02:34:16 +02:00
|
|
|
* close and re-open its listeners every second for 4 years nonstop.
|
2012-06-15 16:05:21 +02:00
|
|
|
*/
|
2011-07-06 22:03:47 +02:00
|
|
|
lis_conn->session_group = global_next_session_group--;
|
|
|
|
}
|
|
|
|
}
|
2012-10-31 16:08:38 +01:00
|
|
|
if (type == CONN_TYPE_AP) {
|
|
|
|
lis_conn->socks_ipv4_traffic = port_cfg->ipv4_traffic;
|
|
|
|
lis_conn->socks_ipv6_traffic = port_cfg->ipv6_traffic;
|
2012-11-14 16:09:06 +01:00
|
|
|
lis_conn->socks_prefer_ipv6 = port_cfg->prefer_ipv6;
|
2012-10-31 16:08:38 +01:00
|
|
|
} else {
|
|
|
|
lis_conn->socks_ipv4_traffic = 1;
|
|
|
|
lis_conn->socks_ipv6_traffic = 1;
|
|
|
|
}
|
2011-07-06 22:03:47 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (connection_add(conn) < 0) { /* no space, forget it */
|
2006-09-30 00:33:34 +02:00
|
|
|
log_warn(LD_NET,"connection_add for listener 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
|
|
|
}
|
|
|
|
|
2011-05-02 21:05:10 +02:00
|
|
|
log_fn(usePort==gotPort ? LOG_DEBUG : LOG_NOTICE, LD_NET,
|
|
|
|
"%s listening on port %u.",
|
|
|
|
conn_type_to_string(type), gotPort);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
conn->state = LISTENER_STATE_READY;
|
2007-06-05 22:54:49 +02:00
|
|
|
if (start_reading) {
|
2007-05-24 22:31:30 +02:00
|
|
|
connection_start_reading(conn);
|
|
|
|
} else {
|
|
|
|
tor_assert(type == CONN_TYPE_AP_DNS_LISTENER);
|
|
|
|
dnsserv_configure_listener(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:
|
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
|
2011-12-19 20:37:52 +01:00
|
|
|
* if it looks ok, else return -1.
|
|
|
|
*
|
|
|
|
* Notably, some TCP stacks can erroneously have accept() return successfully
|
|
|
|
* with socklen 0, when the client sends an RST before the accept call (as
|
|
|
|
* nmap does). We want to detect that, and not go on with the connection.
|
|
|
|
*/
|
2005-04-06 17:42:35 +02:00
|
|
|
static int
|
2012-08-02 21:29:38 +02:00
|
|
|
check_sockaddr(const struct sockaddr *sa, int len, int level)
|
2005-04-06 17:42:35 +02:00
|
|
|
{
|
|
|
|
int ok = 1;
|
|
|
|
|
2008-08-05 22:08:19 +02:00
|
|
|
if (sa->sa_family == AF_INET) {
|
|
|
|
struct sockaddr_in *sin=(struct sockaddr_in*)sa;
|
|
|
|
if (len != sizeof(struct sockaddr_in)) {
|
|
|
|
log_fn(level, LD_NET, "Length of address not as expected: %d vs %d",
|
|
|
|
len,(int)sizeof(struct sockaddr_in));
|
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
if (sin->sin_addr.s_addr == 0 || sin->sin_port == 0) {
|
|
|
|
log_fn(level, LD_NET,
|
|
|
|
"Address for new connection has address/port equal to zero.");
|
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
} else if (sa->sa_family == AF_INET6) {
|
|
|
|
struct sockaddr_in6 *sin6=(struct sockaddr_in6*)sa;
|
|
|
|
if (len != sizeof(struct sockaddr_in6)) {
|
|
|
|
log_fn(level, LD_NET, "Length of address not as expected: %d vs %d",
|
|
|
|
len,(int)sizeof(struct sockaddr_in6));
|
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
if (tor_mem_is_zero((void*)sin6->sin6_addr.s6_addr, 16) ||
|
|
|
|
sin6->sin6_port == 0) {
|
|
|
|
log_fn(level, LD_NET,
|
|
|
|
"Address for new connection has address/port equal to zero.");
|
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
} else {
|
2005-04-06 17:42:35 +02:00
|
|
|
ok = 0;
|
|
|
|
}
|
|
|
|
return ok ? 0 : -1;
|
|
|
|
}
|
|
|
|
|
2008-12-29 20:57:17 +01:00
|
|
|
/** Check whether the socket family from an accepted socket <b>got</b> is the
|
|
|
|
* same as the one that <b>listener</b> is waiting for. If it isn't, log
|
|
|
|
* a useful message and return -1. Else return 0.
|
|
|
|
*
|
|
|
|
* This is annoying, but can apparently happen on some Darwins. */
|
|
|
|
static int
|
|
|
|
check_sockaddr_family_match(sa_family_t got, connection_t *listener)
|
|
|
|
{
|
|
|
|
if (got != listener->socket_family) {
|
|
|
|
log_info(LD_BUG, "A listener connection returned a socket with a "
|
|
|
|
"mismatched family. %s for addr_family %d gave us a socket "
|
|
|
|
"with address family %d. Dropping.",
|
|
|
|
conn_type_to_string(listener->type),
|
|
|
|
(int)listener->socket_family,
|
|
|
|
(int)got);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
{
|
2011-05-23 06:17:48 +02:00
|
|
|
tor_socket_t news; /* the new socket */
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_t *newconn;
|
2004-10-14 04:47:09 +02:00
|
|
|
/* information about the remote peer when connecting to other routers */
|
2011-12-21 17:23:13 +01:00
|
|
|
struct sockaddr_storage addrbuf;
|
|
|
|
struct sockaddr *remote = (struct sockaddr*)&addrbuf;
|
2005-05-07 07:55:06 +02:00
|
|
|
/* length of the remote address. Must be whatever accept() needs. */
|
2008-02-24 23:10:08 +01:00
|
|
|
socklen_t remotelen = (socklen_t)sizeof(addrbuf);
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options = get_options();
|
2007-07-16 18:23:34 +02:00
|
|
|
|
2005-04-08 05:26:44 +02:00
|
|
|
tor_assert((size_t)remotelen >= sizeof(struct sockaddr_in));
|
2011-12-21 17:23:13 +01:00
|
|
|
memset(&addrbuf, 0, sizeof(addrbuf));
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2008-08-05 22:08:19 +02:00
|
|
|
news = tor_accept_socket(conn->s,remote,&remotelen);
|
2011-05-23 06:17:48 +02:00
|
|
|
if (!SOCKET_OK(news)) { /* 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)) {
|
2008-09-04 17:22:55 +02:00
|
|
|
warn_too_many_conns();
|
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).",
|
2011-05-23 06:17:48 +02:00
|
|
|
(int)news,(int)conn->s);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2011-05-04 04:22:20 +02:00
|
|
|
make_socket_reuseable(news);
|
2003-08-12 05:08:41 +02:00
|
|
|
set_socket_nonblocking(news);
|
2002-07-16 04:12:58 +02:00
|
|
|
|
2007-07-16 18:23:36 +02:00
|
|
|
if (options->ConstrainedSockets)
|
|
|
|
set_constrained_socket_buffers(news, (int)options->ConstrainedSockSize);
|
2007-07-16 18:23:34 +02:00
|
|
|
|
2008-12-29 20:57:17 +01:00
|
|
|
if (check_sockaddr_family_match(remote->sa_family, conn) < 0) {
|
2007-08-20 16:59:05 +02:00
|
|
|
tor_close_socket(news);
|
|
|
|
return 0;
|
|
|
|
}
|
2007-06-05 22:54:49 +02:00
|
|
|
|
2008-08-05 22:08:19 +02:00
|
|
|
if (conn->socket_family == AF_INET || conn->socket_family == AF_INET6) {
|
|
|
|
tor_addr_t addr;
|
|
|
|
uint16_t port;
|
|
|
|
if (check_sockaddr(remote, remotelen, LOG_INFO)<0) {
|
2007-06-05 22:54:49 +02:00
|
|
|
log_info(LD_NET,
|
2011-12-19 20:37:52 +01:00
|
|
|
"accept() returned a strange address; closing connection.");
|
|
|
|
tor_close_socket(news);
|
|
|
|
return 0;
|
2007-06-05 22:54:49 +02:00
|
|
|
}
|
2008-08-05 22:08:19 +02:00
|
|
|
|
2008-08-07 21:13:35 +02:00
|
|
|
tor_addr_from_sockaddr(&addr, remote, &port);
|
2007-06-05 22:54:49 +02:00
|
|
|
|
|
|
|
/* process entrance policies here, before we even create the connection */
|
|
|
|
if (new_type == CONN_TYPE_AP) {
|
|
|
|
/* check sockspolicy to see if we should accept it */
|
2008-08-05 22:08:19 +02:00
|
|
|
if (socks_policy_permits_address(&addr) == 0) {
|
2007-06-05 22:54:49 +02:00
|
|
|
log_notice(LD_APP,
|
|
|
|
"Denying socks connection from untrusted address %s.",
|
2012-10-07 05:30:58 +02:00
|
|
|
fmt_and_decorate_addr(&addr));
|
2005-04-06 17:42:35 +02:00
|
|
|
tor_close_socket(news);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2007-06-05 22:54:49 +02:00
|
|
|
if (new_type == CONN_TYPE_DIR) {
|
|
|
|
/* check dirpolicy to see if we should accept it */
|
2008-08-05 22:08:19 +02:00
|
|
|
if (dir_policy_permits_address(&addr) == 0) {
|
2007-06-05 22:54:49 +02:00
|
|
|
log_notice(LD_DIRSERV,"Denying dir connection from address %s.",
|
2012-10-07 05:30:58 +02:00
|
|
|
fmt_and_decorate_addr(&addr));
|
2007-06-05 22:54:49 +02:00
|
|
|
tor_close_socket(news);
|
|
|
|
return 0;
|
|
|
|
}
|
2004-10-25 08:16:26 +02:00
|
|
|
}
|
2004-08-06 11:56:36 +02:00
|
|
|
|
2007-06-08 23:14:58 +02:00
|
|
|
newconn = connection_new(new_type, conn->socket_family);
|
2007-06-05 22:54:49 +02:00
|
|
|
newconn->s = news;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2007-06-05 22:54:49 +02:00
|
|
|
/* remember the remote address */
|
2008-08-05 22:08:19 +02:00
|
|
|
tor_addr_copy(&newconn->addr, &addr);
|
|
|
|
newconn->port = port;
|
|
|
|
newconn->address = tor_dup_addr(&addr);
|
2007-06-05 22:54:49 +02:00
|
|
|
|
2007-06-08 23:14:58 +02:00
|
|
|
} else if (conn->socket_family == AF_UNIX) {
|
2009-05-27 23:55:51 +02:00
|
|
|
/* For now only control ports can be Unix domain sockets
|
2007-06-05 22:54:49 +02:00
|
|
|
* and listeners at the same time */
|
|
|
|
tor_assert(conn->type == CONN_TYPE_CONTROL_LISTENER);
|
|
|
|
|
2007-06-08 23:14:58 +02:00
|
|
|
newconn = connection_new(new_type, conn->socket_family);
|
2007-06-05 22:54:49 +02:00
|
|
|
newconn->s = news;
|
|
|
|
|
|
|
|
/* remember the remote address -- do we have anything sane to put here? */
|
2008-08-05 22:08:19 +02:00
|
|
|
tor_addr_make_unspec(&newconn->addr);
|
2007-06-05 22:54:49 +02:00
|
|
|
newconn->port = 1;
|
|
|
|
newconn->address = tor_strdup(conn->address);
|
|
|
|
} else {
|
|
|
|
tor_assert(0);
|
|
|
|
};
|
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
|
|
|
}
|
|
|
|
|
2011-07-06 22:03:47 +02:00
|
|
|
if (connection_init_accepted_conn(newconn, TO_LISTENER_CONN(conn)) < 0) {
|
2011-03-14 23:52:15 +01:00
|
|
|
if (! newconn->marked_for_close)
|
2011-01-26 01:07:03 +01: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>.
|
2009-05-27 23:55:51 +02:00
|
|
|
* If conn is an OR, start the TLS handshake.
|
2006-11-14 01:06:02 +01:00
|
|
|
* If conn is a transparent AP, get its original destination
|
|
|
|
* and place it in circuit_wait.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
2011-07-06 22:03:47 +02:00
|
|
|
connection_init_accepted_conn(connection_t *conn,
|
|
|
|
const listener_connection_t *listener)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2012-08-01 13:18:42 +02:00
|
|
|
int rv;
|
|
|
|
|
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:
|
2007-01-15 22:13:37 +01:00
|
|
|
control_event_or_conn_status(TO_OR_CONN(conn), OR_CONN_EVENT_NEW, 0);
|
2012-08-01 13:18:42 +02:00
|
|
|
rv = connection_tls_start_handshake(TO_OR_CONN(conn), 1);
|
|
|
|
if (rv < 0) {
|
|
|
|
connection_or_close_for_error(TO_OR_CONN(conn), 0);
|
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
break;
|
2003-09-08 12:59:00 +02:00
|
|
|
case CONN_TYPE_AP:
|
2011-07-20 18:55:42 +02:00
|
|
|
TO_ENTRY_CONN(conn)->isolation_flags = listener->isolation_flags;
|
|
|
|
TO_ENTRY_CONN(conn)->session_group = listener->session_group;
|
|
|
|
TO_ENTRY_CONN(conn)->nym_epoch = get_signewnym_epoch();
|
2012-10-12 18:22:13 +02:00
|
|
|
TO_ENTRY_CONN(conn)->socks_request->listener_type = listener->base_.type;
|
2012-10-31 16:08:38 +01:00
|
|
|
TO_ENTRY_CONN(conn)->ipv4_traffic_ok = listener->socks_ipv4_traffic;
|
|
|
|
TO_ENTRY_CONN(conn)->ipv6_traffic_ok = listener->socks_ipv6_traffic;
|
2012-11-14 16:09:06 +01:00
|
|
|
TO_ENTRY_CONN(conn)->prefer_ipv6_traffic = listener->socks_prefer_ipv6;
|
2011-07-06 22:03:47 +02:00
|
|
|
switch (TO_CONN(listener)->type) {
|
2006-08-10 11:01:37 +02:00
|
|
|
case CONN_TYPE_AP_LISTENER:
|
|
|
|
conn->state = AP_CONN_STATE_SOCKS_WAIT;
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP_TRANS_LISTENER:
|
2011-07-20 18:55:42 +02:00
|
|
|
TO_ENTRY_CONN(conn)->is_transparent_ap = 1;
|
2006-11-14 01:06:02 +01:00
|
|
|
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2011-07-20 18:55:42 +02:00
|
|
|
return connection_ap_process_transparent(TO_ENTRY_CONN(conn));
|
2006-11-14 01:06:31 +01:00
|
|
|
case CONN_TYPE_AP_NATD_LISTENER:
|
2011-07-20 18:55:42 +02:00
|
|
|
TO_ENTRY_CONN(conn)->is_transparent_ap = 1;
|
2006-11-14 01:06:31 +01:00
|
|
|
conn->state = AP_CONN_STATE_NATD_WAIT;
|
|
|
|
break;
|
2006-08-10 11:01:37 +02:00
|
|
|
}
|
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:
|
2007-03-04 22:08:28 +01:00
|
|
|
conn->state = CONTROL_CONN_STATE_NEEDAUTH;
|
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
|
2008-06-11 03:14:23 +02:00
|
|
|
* addr:port (they arrive in *host order*). If fail, return -1 and if
|
|
|
|
* applicable put your best guess about errno into *<b>socket_error</b>.
|
|
|
|
* Else 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
|
2007-01-30 23:19:41 +01:00
|
|
|
connection_connect(connection_t *conn, const char *address,
|
2008-08-05 22:08:19 +02:00
|
|
|
const tor_addr_t *addr, uint16_t port, int *socket_error)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2011-05-23 06:17:48 +02:00
|
|
|
tor_socket_t s;
|
|
|
|
int inprogress = 0;
|
2011-12-21 17:23:13 +01:00
|
|
|
struct sockaddr_storage addrbuf;
|
2011-04-26 04:45:48 +02:00
|
|
|
struct sockaddr *dest_addr;
|
2010-10-15 17:36:16 +02:00
|
|
|
int dest_addr_len;
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options = get_options();
|
2008-08-05 22:08:19 +02:00
|
|
|
int protocol_family;
|
2003-09-16 03:58:46 +02:00
|
|
|
|
2012-10-12 18:22:13 +02:00
|
|
|
if (get_n_open_sockets() >= get_options()->ConnLimit_-1) {
|
2008-08-09 17:13:28 +02:00
|
|
|
warn_too_many_conns();
|
2012-07-05 11:01:00 +02:00
|
|
|
*socket_error = SOCK_ERRNO(ENOBUFS);
|
2007-04-21 19:24:18 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-08-05 22:08:19 +02:00
|
|
|
if (tor_addr_family(addr) == AF_INET6)
|
|
|
|
protocol_family = PF_INET6;
|
|
|
|
else
|
|
|
|
protocol_family = PF_INET;
|
|
|
|
|
2011-11-28 21:44:10 +01:00
|
|
|
if (get_options()->DisableNetwork) {
|
|
|
|
/* We should never even try to connect anyplace if DisableNetwork is set.
|
|
|
|
* Warn if we do, and refuse to make the connection. */
|
|
|
|
static ratelim_t disablenet_violated = RATELIM_INIT(30*60);
|
|
|
|
char *m;
|
2012-01-31 16:59:42 +01:00
|
|
|
#ifdef _WIN32
|
2011-11-28 21:44:10 +01:00
|
|
|
*socket_error = WSAENETUNREACH;
|
|
|
|
#else
|
|
|
|
*socket_error = ENETUNREACH;
|
|
|
|
#endif
|
|
|
|
if ((m = rate_limit_log(&disablenet_violated, approx_time()))) {
|
|
|
|
log_warn(LD_BUG, "Tried to open a socket with DisableNetwork set.%s", m);
|
|
|
|
tor_free(m);
|
|
|
|
}
|
|
|
|
tor_fragile_assert();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-08-05 22:08:19 +02:00
|
|
|
s = tor_open_socket(protocol_family,SOCK_STREAM,IPPROTO_TCP);
|
2012-01-17 22:35:07 +01:00
|
|
|
if (! SOCKET_OK(s)) {
|
2008-06-11 03:14:23 +02:00
|
|
|
*socket_error = tor_socket_errno(-1);
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"Error creating network socket: %s",
|
2008-06-11 03:14:23 +02:00
|
|
|
tor_socket_strerror(*socket_error));
|
2003-09-16 03:58:46 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-08-16 13:43:18 +02:00
|
|
|
|
2012-01-23 21:54:02 +01:00
|
|
|
make_socket_reuseable(s);
|
|
|
|
|
2012-09-20 17:09:25 +02:00
|
|
|
if (!tor_addr_is_loopback(addr)) {
|
|
|
|
const tor_addr_t *ext_addr = NULL;
|
|
|
|
if (protocol_family == AF_INET &&
|
2012-10-12 18:22:13 +02:00
|
|
|
!tor_addr_is_null(&options->OutboundBindAddressIPv4_))
|
|
|
|
ext_addr = &options->OutboundBindAddressIPv4_;
|
2012-09-20 17:09:25 +02:00
|
|
|
else if (protocol_family == AF_INET6 &&
|
2012-10-12 18:22:13 +02:00
|
|
|
!tor_addr_is_null(&options->OutboundBindAddressIPv6_))
|
|
|
|
ext_addr = &options->OutboundBindAddressIPv6_;
|
2012-09-20 17:09:25 +02:00
|
|
|
if (ext_addr) {
|
|
|
|
struct sockaddr_storage ext_addr_sa;
|
|
|
|
socklen_t ext_addr_len = 0;
|
|
|
|
memset(&ext_addr_sa, 0, sizeof(ext_addr_sa));
|
|
|
|
ext_addr_len = tor_addr_to_sockaddr(ext_addr, 0,
|
|
|
|
(struct sockaddr *) &ext_addr_sa,
|
|
|
|
sizeof(ext_addr_sa));
|
|
|
|
if (ext_addr_len == 0) {
|
|
|
|
log_warn(LD_NET,
|
|
|
|
"Error converting OutboundBindAddress %s into sockaddr. "
|
2012-10-07 05:30:58 +02:00
|
|
|
"Ignoring.", fmt_and_decorate_addr(ext_addr));
|
2012-09-20 17:09:25 +02:00
|
|
|
} else {
|
|
|
|
if (bind(s, (struct sockaddr *) &ext_addr_sa, ext_addr_len) < 0) {
|
|
|
|
*socket_error = tor_socket_errno(s);
|
|
|
|
log_warn(LD_NET,"Error binding network socket to %s: %s",
|
2012-10-07 05:30:58 +02:00
|
|
|
fmt_and_decorate_addr(ext_addr),
|
2012-09-20 17:09:25 +02:00
|
|
|
tor_socket_strerror(*socket_error));
|
|
|
|
tor_close_socket(s);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-08-16 13:43:18 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
set_socket_nonblocking(s);
|
|
|
|
|
2007-07-16 18:23:36 +02:00
|
|
|
if (options->ConstrainedSockets)
|
|
|
|
set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize);
|
2007-07-16 18:23:34 +02:00
|
|
|
|
2011-12-21 17:23:13 +01:00
|
|
|
memset(&addrbuf,0,sizeof(addrbuf));
|
|
|
|
dest_addr = (struct sockaddr*) &addrbuf;
|
2008-08-05 22:08:19 +02:00
|
|
|
dest_addr_len = tor_addr_to_sockaddr(addr, port, dest_addr, sizeof(addrbuf));
|
|
|
|
tor_assert(dest_addr_len > 0);
|
2003-09-16 03:58:46 +02:00
|
|
|
|
2009-09-28 15:08:32 +02:00
|
|
|
log_debug(LD_NET, "Connecting to %s:%u.",
|
2009-12-15 23:23:36 +01:00
|
|
|
escaped_safe_str_client(address), port);
|
2003-09-16 03:58:46 +02:00
|
|
|
|
2010-10-15 17:36:16 +02:00
|
|
|
if (connect(s, dest_addr, (socklen_t)dest_addr_len) < 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. */
|
2008-06-11 03:14:23 +02:00
|
|
|
*socket_error = e;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_NET,
|
2009-09-28 15:08:32 +02:00
|
|
|
"connect() to %s:%u failed: %s",
|
2009-12-15 23:23:36 +01:00
|
|
|
escaped_safe_str_client(address),
|
2006-03-19 04:55:48 +01:00
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* it succeeded. we're connected. */
|
2005-10-25 09:04:36 +02:00
|
|
|
log_fn(inprogress?LOG_DEBUG:LOG_INFO, LD_NET,
|
2009-09-28 15:08:32 +02:00
|
|
|
"Connection to %s:%u %s (sock %d).",
|
2009-12-15 23:23:36 +01:00
|
|
|
escaped_safe_str_client(address),
|
2006-03-19 04:55:48 +01:00
|
|
|
port, inprogress?"in progress":"established", s);
|
2003-09-16 03:58:46 +02:00
|
|
|
conn->s = s;
|
2012-06-16 01:53:32 +02:00
|
|
|
if (connection_add_connecting(conn) < 0) {
|
|
|
|
/* no space, forget it */
|
2012-07-05 11:01:00 +02:00
|
|
|
*socket_error = SOCK_ERRNO(ENOBUFS);
|
2004-05-05 03:26:57 +02:00
|
|
|
return -1;
|
2012-06-16 01:53:32 +02:00
|
|
|
}
|
2005-08-03 22:42:17 +02:00
|
|
|
return inprogress ? 0 : 1;
|
2003-09-16 03:58:46 +02:00
|
|
|
}
|
|
|
|
|
2009-06-19 01:59:18 +02:00
|
|
|
/** Convert state number to string representation for logging purposes.
|
|
|
|
*/
|
|
|
|
static const char *
|
|
|
|
connection_proxy_state_to_string(int state)
|
|
|
|
{
|
|
|
|
static const char *unknown = "???";
|
|
|
|
static const char *states[] = {
|
|
|
|
"PROXY_NONE",
|
2011-06-14 02:51:59 +02:00
|
|
|
"PROXY_INFANT",
|
2009-06-19 01:59:18 +02:00
|
|
|
"PROXY_HTTPS_WANT_CONNECT_OK",
|
|
|
|
"PROXY_SOCKS4_WANT_CONNECT_OK",
|
|
|
|
"PROXY_SOCKS5_WANT_AUTH_METHOD_NONE",
|
|
|
|
"PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929",
|
|
|
|
"PROXY_SOCKS5_WANT_AUTH_RFC1929_OK",
|
|
|
|
"PROXY_SOCKS5_WANT_CONNECT_OK",
|
|
|
|
"PROXY_CONNECTED",
|
|
|
|
};
|
|
|
|
|
|
|
|
if (state < PROXY_NONE || state > PROXY_CONNECTED)
|
|
|
|
return unknown;
|
|
|
|
|
|
|
|
return states[state];
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Write a proxy request of <b>type</b> (socks4, socks5, https) to conn
|
|
|
|
* for conn->addr:conn->port, authenticating with the auth details given
|
|
|
|
* in the configuration (if available). SOCKS 5 and HTTP CONNECT proxies
|
|
|
|
* support authentication.
|
|
|
|
*
|
|
|
|
* Returns -1 if conn->addr is incompatible with the proxy protocol, and
|
|
|
|
* 0 otherwise.
|
|
|
|
*
|
|
|
|
* Use connection_read_proxy_handshake() to complete the handshake.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
connection_proxy_connect(connection_t *conn, int type)
|
|
|
|
{
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options;
|
2009-06-19 01:59:18 +02:00
|
|
|
|
|
|
|
tor_assert(conn);
|
|
|
|
|
|
|
|
options = get_options();
|
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case PROXY_CONNECT: {
|
|
|
|
char buf[1024];
|
|
|
|
char *base64_authenticator=NULL;
|
2010-10-29 19:41:24 +02:00
|
|
|
const char *authenticator = options->HTTPSProxyAuthenticator;
|
2009-06-19 01:59:18 +02:00
|
|
|
|
|
|
|
/* Send HTTP CONNECT and authentication (if available) in
|
|
|
|
* one request */
|
|
|
|
|
|
|
|
if (authenticator) {
|
|
|
|
base64_authenticator = alloc_http_authenticator(authenticator);
|
|
|
|
if (!base64_authenticator)
|
|
|
|
log_warn(LD_OR, "Encoding https authenticator failed");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (base64_authenticator) {
|
2012-10-07 06:25:25 +02:00
|
|
|
const char *addrport = fmt_addrport(&conn->addr, conn->port);
|
|
|
|
tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.1\r\n"
|
|
|
|
"Host: %s\r\n"
|
2009-06-19 01:59:18 +02:00
|
|
|
"Proxy-Authorization: Basic %s\r\n\r\n",
|
2012-10-07 06:25:25 +02:00
|
|
|
addrport,
|
|
|
|
addrport,
|
2012-04-10 18:00:20 +02:00
|
|
|
base64_authenticator);
|
2009-06-19 01:59:18 +02:00
|
|
|
tor_free(base64_authenticator);
|
|
|
|
} else {
|
2012-10-07 06:25:25 +02:00
|
|
|
tor_snprintf(buf, sizeof(buf), "CONNECT %s HTTP/1.0\r\n\r\n",
|
|
|
|
fmt_addrport(&conn->addr, conn->port));
|
2009-06-19 01:59:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
connection_write_to_buf(buf, strlen(buf), conn);
|
|
|
|
conn->proxy_state = PROXY_HTTPS_WANT_CONNECT_OK;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case PROXY_SOCKS4: {
|
|
|
|
unsigned char buf[9];
|
|
|
|
uint16_t portn;
|
|
|
|
uint32_t ip4addr;
|
|
|
|
|
|
|
|
/* Send a SOCKS4 connect request with empty user id */
|
|
|
|
|
|
|
|
if (tor_addr_family(&conn->addr) != AF_INET) {
|
2009-12-18 12:55:05 +01:00
|
|
|
log_warn(LD_NET, "SOCKS4 client is incompatible with IPv6");
|
2009-06-19 01:59:18 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ip4addr = tor_addr_to_ipv4n(&conn->addr);
|
|
|
|
portn = htons(conn->port);
|
|
|
|
|
|
|
|
buf[0] = 4; /* version */
|
|
|
|
buf[1] = SOCKS_COMMAND_CONNECT; /* command */
|
|
|
|
memcpy(buf + 2, &portn, 2); /* port */
|
|
|
|
memcpy(buf + 4, &ip4addr, 4); /* addr */
|
|
|
|
buf[8] = 0; /* userid (empty) */
|
|
|
|
|
2009-08-25 16:30:54 +02:00
|
|
|
connection_write_to_buf((char *)buf, sizeof(buf), conn);
|
2009-06-19 01:59:18 +02:00
|
|
|
conn->proxy_state = PROXY_SOCKS4_WANT_CONNECT_OK;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case PROXY_SOCKS5: {
|
|
|
|
unsigned char buf[4]; /* fields: vers, num methods, method list */
|
|
|
|
|
|
|
|
/* Send a SOCKS5 greeting (connect request must wait) */
|
|
|
|
|
|
|
|
buf[0] = 5; /* version */
|
|
|
|
|
|
|
|
/* number of auth methods */
|
|
|
|
if (options->Socks5ProxyUsername) {
|
|
|
|
buf[1] = 2;
|
|
|
|
buf[2] = 0x00; /* no authentication */
|
|
|
|
buf[3] = 0x02; /* rfc1929 Username/Passwd auth */
|
|
|
|
conn->proxy_state = PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929;
|
|
|
|
} else {
|
|
|
|
buf[1] = 1;
|
|
|
|
buf[2] = 0x00; /* no authentication */
|
|
|
|
conn->proxy_state = PROXY_SOCKS5_WANT_AUTH_METHOD_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
connection_write_to_buf((char *)buf, 2 + buf[1], conn);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
log_err(LD_BUG, "Invalid proxy protocol, %d", type);
|
|
|
|
tor_fragile_assert();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
log_debug(LD_NET, "set state %s",
|
|
|
|
connection_proxy_state_to_string(conn->proxy_state));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Read conn's inbuf. If the http response from the proxy is all
|
|
|
|
* here, make sure it's good news, then return 1. If it's bad news,
|
|
|
|
* return -1. Else return 0 and hope for better luck next time.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
connection_read_https_proxy_response(connection_t *conn)
|
|
|
|
{
|
|
|
|
char *headers;
|
|
|
|
char *reason=NULL;
|
|
|
|
int status_code;
|
|
|
|
time_t date_header;
|
|
|
|
|
|
|
|
switch (fetch_from_buf_http(conn->inbuf,
|
|
|
|
&headers, MAX_HEADERS_SIZE,
|
|
|
|
NULL, NULL, 10000, 0)) {
|
|
|
|
case -1: /* overflow */
|
|
|
|
log_warn(LD_PROTOCOL,
|
|
|
|
"Your https proxy sent back an oversized response. Closing.");
|
|
|
|
return -1;
|
|
|
|
case 0:
|
|
|
|
log_info(LD_NET,"https proxy response not all here yet. Waiting.");
|
|
|
|
return 0;
|
|
|
|
/* case 1, fall through */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (parse_http_response(headers, &status_code, &date_header,
|
|
|
|
NULL, &reason) < 0) {
|
|
|
|
log_warn(LD_NET,
|
|
|
|
"Unparseable headers from proxy (connecting to '%s'). Closing.",
|
|
|
|
conn->address);
|
|
|
|
tor_free(headers);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (!reason) reason = tor_strdup("[no reason given]");
|
|
|
|
|
|
|
|
if (status_code == 200) {
|
|
|
|
log_info(LD_NET,
|
|
|
|
"HTTPS connect to '%s' successful! (200 %s) Starting TLS.",
|
|
|
|
conn->address, escaped(reason));
|
|
|
|
tor_free(reason);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* else, bad news on the status code */
|
2011-05-12 23:33:09 +02:00
|
|
|
switch (status_code) {
|
|
|
|
case 403:
|
|
|
|
log_warn(LD_NET,
|
|
|
|
"The https proxy refused to allow connection to %s "
|
|
|
|
"(status code %d, %s). Closing.",
|
|
|
|
conn->address, status_code, escaped(reason));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
log_warn(LD_NET,
|
|
|
|
"The https proxy sent back an unexpected status code %d (%s). "
|
|
|
|
"Closing.",
|
|
|
|
status_code, escaped(reason));
|
|
|
|
break;
|
|
|
|
}
|
2009-06-19 01:59:18 +02:00
|
|
|
tor_free(reason);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Send SOCKS5 CONNECT command to <b>conn</b>, copying <b>conn->addr</b>
|
|
|
|
* and <b>conn->port</b> into the request.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
connection_send_socks5_connect(connection_t *conn)
|
|
|
|
{
|
|
|
|
unsigned char buf[1024];
|
|
|
|
size_t reqsize = 6;
|
|
|
|
uint16_t port = htons(conn->port);
|
|
|
|
|
|
|
|
buf[0] = 5; /* version */
|
|
|
|
buf[1] = SOCKS_COMMAND_CONNECT; /* command */
|
|
|
|
buf[2] = 0; /* reserved */
|
|
|
|
|
|
|
|
if (tor_addr_family(&conn->addr) == AF_INET) {
|
|
|
|
uint32_t addr = tor_addr_to_ipv4n(&conn->addr);
|
|
|
|
|
|
|
|
buf[3] = 1;
|
|
|
|
reqsize += 4;
|
|
|
|
memcpy(buf + 4, &addr, 4);
|
|
|
|
memcpy(buf + 8, &port, 2);
|
|
|
|
} else { /* AF_INET6 */
|
|
|
|
buf[3] = 4;
|
|
|
|
reqsize += 16;
|
|
|
|
memcpy(buf + 4, tor_addr_to_in6(&conn->addr), 16);
|
|
|
|
memcpy(buf + 20, &port, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
connection_write_to_buf((char *)buf, reqsize, conn);
|
|
|
|
|
|
|
|
conn->proxy_state = PROXY_SOCKS5_WANT_CONNECT_OK;
|
|
|
|
}
|
|
|
|
|
2012-06-05 00:50:13 +02:00
|
|
|
/** Wrapper around fetch_from_(buf/evbuffer)_socks_client: see those functions
|
|
|
|
* for documentation of its behavior. */
|
2009-08-26 17:55:36 +02:00
|
|
|
static int
|
|
|
|
connection_fetch_from_buf_socks_client(connection_t *conn,
|
|
|
|
int state, char **reason)
|
|
|
|
{
|
|
|
|
IF_HAS_BUFFEREVENT(conn, {
|
|
|
|
struct evbuffer *input = bufferevent_get_input(conn->bufev);
|
|
|
|
return fetch_from_evbuffer_socks_client(input, state, reason);
|
|
|
|
}) ELSE_IF_NO_BUFFEREVENT {
|
|
|
|
return fetch_from_buf_socks_client(conn->inbuf, state, reason);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-06-19 01:59:18 +02:00
|
|
|
/** Call this from connection_*_process_inbuf() to advance the proxy
|
|
|
|
* handshake.
|
|
|
|
*
|
|
|
|
* No matter what proxy protocol is used, if this function returns 1, the
|
|
|
|
* handshake is complete, and the data remaining on inbuf may contain the
|
|
|
|
* start of the communication with the requested server.
|
|
|
|
*
|
|
|
|
* Returns 0 if the current buffer contains an incomplete response, and -1
|
|
|
|
* on error.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
connection_read_proxy_handshake(connection_t *conn)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
char *reason = NULL;
|
|
|
|
|
|
|
|
log_debug(LD_NET, "enter state %s",
|
|
|
|
connection_proxy_state_to_string(conn->proxy_state));
|
|
|
|
|
|
|
|
switch (conn->proxy_state) {
|
|
|
|
case PROXY_HTTPS_WANT_CONNECT_OK:
|
|
|
|
ret = connection_read_https_proxy_response(conn);
|
|
|
|
if (ret == 1)
|
|
|
|
conn->proxy_state = PROXY_CONNECTED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PROXY_SOCKS4_WANT_CONNECT_OK:
|
2009-08-26 17:55:36 +02:00
|
|
|
ret = connection_fetch_from_buf_socks_client(conn,
|
|
|
|
conn->proxy_state,
|
|
|
|
&reason);
|
2009-06-19 01:59:18 +02:00
|
|
|
if (ret == 1)
|
|
|
|
conn->proxy_state = PROXY_CONNECTED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PROXY_SOCKS5_WANT_AUTH_METHOD_NONE:
|
2009-08-26 17:55:36 +02:00
|
|
|
ret = connection_fetch_from_buf_socks_client(conn,
|
|
|
|
conn->proxy_state,
|
|
|
|
&reason);
|
2009-06-19 01:59:18 +02:00
|
|
|
/* no auth needed, do connect */
|
|
|
|
if (ret == 1) {
|
|
|
|
connection_send_socks5_connect(conn);
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929:
|
2009-08-26 17:55:36 +02:00
|
|
|
ret = connection_fetch_from_buf_socks_client(conn,
|
|
|
|
conn->proxy_state,
|
|
|
|
&reason);
|
2009-06-19 01:59:18 +02:00
|
|
|
|
|
|
|
/* send auth if needed, otherwise do connect */
|
|
|
|
if (ret == 1) {
|
|
|
|
connection_send_socks5_connect(conn);
|
|
|
|
ret = 0;
|
|
|
|
} else if (ret == 2) {
|
|
|
|
unsigned char buf[1024];
|
|
|
|
size_t reqsize, usize, psize;
|
|
|
|
const char *user, *pass;
|
|
|
|
|
|
|
|
user = get_options()->Socks5ProxyUsername;
|
|
|
|
pass = get_options()->Socks5ProxyPassword;
|
|
|
|
tor_assert(user && pass);
|
|
|
|
|
|
|
|
/* XXX len of user and pass must be <= 255 !!! */
|
|
|
|
usize = strlen(user);
|
|
|
|
psize = strlen(pass);
|
|
|
|
tor_assert(usize <= 255 && psize <= 255);
|
|
|
|
reqsize = 3 + usize + psize;
|
|
|
|
|
|
|
|
buf[0] = 1; /* negotiation version */
|
|
|
|
buf[1] = usize;
|
|
|
|
memcpy(buf + 2, user, usize);
|
|
|
|
buf[2 + usize] = psize;
|
|
|
|
memcpy(buf + 3 + usize, pass, psize);
|
|
|
|
|
|
|
|
connection_write_to_buf((char *)buf, reqsize, conn);
|
|
|
|
|
|
|
|
conn->proxy_state = PROXY_SOCKS5_WANT_AUTH_RFC1929_OK;
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PROXY_SOCKS5_WANT_AUTH_RFC1929_OK:
|
2009-08-26 17:55:36 +02:00
|
|
|
ret = connection_fetch_from_buf_socks_client(conn,
|
|
|
|
conn->proxy_state,
|
|
|
|
&reason);
|
2009-06-19 01:59:18 +02:00
|
|
|
/* send the connect request */
|
|
|
|
if (ret == 1) {
|
|
|
|
connection_send_socks5_connect(conn);
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PROXY_SOCKS5_WANT_CONNECT_OK:
|
2009-08-26 17:55:36 +02:00
|
|
|
ret = connection_fetch_from_buf_socks_client(conn,
|
|
|
|
conn->proxy_state,
|
|
|
|
&reason);
|
2009-06-19 01:59:18 +02:00
|
|
|
if (ret == 1)
|
|
|
|
conn->proxy_state = PROXY_CONNECTED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
log_err(LD_BUG, "Invalid proxy_state for reading, %d",
|
|
|
|
conn->proxy_state);
|
|
|
|
tor_fragile_assert();
|
|
|
|
ret = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
log_debug(LD_NET, "leaving state %s",
|
|
|
|
connection_proxy_state_to_string(conn->proxy_state));
|
|
|
|
|
|
|
|
if (ret < 0) {
|
|
|
|
if (reason) {
|
|
|
|
log_warn(LD_NET, "Proxy Client: unable to connect to %s:%d (%s)",
|
|
|
|
conn->address, conn->port, escaped(reason));
|
|
|
|
tor_free(reason);
|
|
|
|
} else {
|
|
|
|
log_warn(LD_NET, "Proxy Client: unable to connect to %s:%d",
|
|
|
|
conn->address, conn->port);
|
|
|
|
}
|
|
|
|
} else if (ret == 1) {
|
|
|
|
log_info(LD_NET, "Proxy Client: connection to %s:%d successful",
|
|
|
|
conn->address, conn->port);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
/** Given a list of listener connections in <b>old_conns</b>, and list of
|
|
|
|
* port_cfg_t entries in <b>ports</b>, open a new listener for every port in
|
|
|
|
* <b>ports</b> that does not already have a listener in <b>old_conns</b>.
|
2005-09-14 04:36:29 +02:00
|
|
|
*
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
* Remove from <b>old_conns</b> every connection that has a corresponding
|
|
|
|
* entry in <b>ports</b>. Add to <b>new_conns</b> new every connection we
|
|
|
|
* launch.
|
2008-01-21 22:21:19 +01:00
|
|
|
*
|
2012-05-30 22:53:31 +02:00
|
|
|
* If <b>control_listeners_only</b> is true, then we only open control
|
|
|
|
* listeners, and we do not remove any noncontrol listeners from old_conns.
|
|
|
|
*
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
* Return 0 on success, -1 on failure.
|
|
|
|
**/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
retry_listener_ports(smartlist_t *old_conns,
|
|
|
|
const smartlist_t *ports,
|
2012-04-19 05:32:02 +02:00
|
|
|
smartlist_t *new_conns,
|
2012-05-30 22:53:31 +02:00
|
|
|
int control_listeners_only)
|
2004-05-20 04:42:50 +02:00
|
|
|
{
|
2012-01-18 21:53:30 +01:00
|
|
|
smartlist_t *launch = smartlist_new();
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
int r = 0;
|
2004-10-24 03:22:40 +02:00
|
|
|
|
2012-05-30 22:53:31 +02:00
|
|
|
if (control_listeners_only) {
|
2012-04-19 05:32:02 +02:00
|
|
|
SMARTLIST_FOREACH(ports, port_cfg_t *, p, {
|
|
|
|
if (p->type == CONN_TYPE_CONTROL_LISTENER)
|
|
|
|
smartlist_add(launch, p);
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
smartlist_add_all(launch, ports);
|
|
|
|
}
|
2007-06-05 22:54:49 +02:00
|
|
|
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
/* Iterate through old_conns, comparing it to launch: remove from both lists
|
|
|
|
* each pair of elements that corresponds to the same port. */
|
|
|
|
SMARTLIST_FOREACH_BEGIN(old_conns, connection_t *, conn) {
|
|
|
|
const port_cfg_t *found_port = NULL;
|
2005-09-14 04:36:29 +02:00
|
|
|
|
2005-07-11 19:20:22 +02:00
|
|
|
/* Okay, so this is a listener. Is it configured? */
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(launch, const port_cfg_t *, wanted) {
|
|
|
|
if (conn->type != wanted->type)
|
|
|
|
continue;
|
|
|
|
if ((conn->socket_family != AF_UNIX && wanted->is_unix_addr) ||
|
|
|
|
(conn->socket_family == AF_UNIX && ! wanted->is_unix_addr))
|
|
|
|
continue;
|
|
|
|
|
2011-11-08 22:10:38 +01:00
|
|
|
if (wanted->no_listen)
|
|
|
|
continue; /* We don't want to open a listener for this one */
|
|
|
|
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
if (wanted->is_unix_addr) {
|
|
|
|
if (conn->socket_family == AF_UNIX &&
|
|
|
|
!strcmp(wanted->unix_addr, conn->address)) {
|
|
|
|
found_port = wanted;
|
|
|
|
break;
|
2005-07-11 19:20:22 +02:00
|
|
|
}
|
2005-09-14 04:36:29 +02:00
|
|
|
} else {
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
int port_matches;
|
|
|
|
if (wanted->port == CFG_AUTO_PORT) {
|
|
|
|
port_matches = 1;
|
|
|
|
} else {
|
|
|
|
port_matches = (wanted->port == conn->port);
|
|
|
|
}
|
|
|
|
if (port_matches && tor_addr_eq(&wanted->addr, &conn->addr)) {
|
|
|
|
found_port = wanted;
|
|
|
|
break;
|
|
|
|
}
|
2005-09-14 04:36:29 +02:00
|
|
|
}
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
} SMARTLIST_FOREACH_END(wanted);
|
|
|
|
|
|
|
|
if (found_port) {
|
|
|
|
/* This listener is already running; we don't need to launch it. */
|
2011-07-20 19:11:29 +02:00
|
|
|
//log_debug(LD_NET, "Already have %s on %s:%d",
|
|
|
|
// conn_type_to_string(found_port->type), conn->address, conn->port);
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
smartlist_remove(launch, found_port);
|
|
|
|
/* And we can remove the connection from old_conns too. */
|
|
|
|
SMARTLIST_DEL_CURRENT(old_conns, conn);
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
2005-07-11 19:20:22 +02:00
|
|
|
|
|
|
|
/* Now open all the listeners that are configured but not opened. */
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(launch, const port_cfg_t *, port) {
|
|
|
|
struct sockaddr *listensockaddr;
|
|
|
|
socklen_t listensocklen = 0;
|
2011-07-19 08:36:59 +02:00
|
|
|
char *address=NULL;
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
connection_t *conn;
|
2011-08-16 01:38:15 +02:00
|
|
|
int real_port = port->port == CFG_AUTO_PORT ? 0 : port->port;
|
|
|
|
tor_assert(real_port <= UINT16_MAX);
|
2011-11-08 22:10:38 +01:00
|
|
|
if (port->no_listen)
|
|
|
|
continue;
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
|
|
|
|
if (port->is_unix_addr) {
|
|
|
|
listensockaddr = (struct sockaddr *)
|
|
|
|
create_unix_sockaddr(port->unix_addr,
|
|
|
|
&address, &listensocklen);
|
|
|
|
} else {
|
|
|
|
listensockaddr = tor_malloc(sizeof(struct sockaddr_storage));
|
|
|
|
listensocklen = tor_addr_to_sockaddr(&port->addr,
|
2011-08-16 01:38:15 +02:00
|
|
|
real_port,
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
listensockaddr,
|
|
|
|
sizeof(struct sockaddr_storage));
|
|
|
|
address = tor_dup_addr(&port->addr);
|
|
|
|
}
|
2007-06-05 22:54:49 +02:00
|
|
|
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
if (listensockaddr) {
|
2012-01-18 21:53:30 +01:00
|
|
|
conn = connection_listener_new(listensockaddr, listensocklen,
|
2011-07-06 22:03:47 +02:00
|
|
|
port->type, address, port);
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
tor_free(listensockaddr);
|
|
|
|
tor_free(address);
|
|
|
|
} else {
|
|
|
|
conn = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!conn) {
|
|
|
|
r = -1;
|
|
|
|
} else {
|
|
|
|
if (new_conns)
|
|
|
|
smartlist_add(new_conns, conn);
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(port);
|
|
|
|
|
|
|
|
smartlist_free(launch);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2007-06-04 18:58:57 +02:00
|
|
|
/** Launch listeners for each port you should have open. Only launch
|
|
|
|
* listeners who are not already open, and only close listeners we no longer
|
|
|
|
* want.
|
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>.
|
2012-05-30 22:53:31 +02:00
|
|
|
*
|
|
|
|
* If <b>close_all_noncontrol</b> is true, then we only open control
|
|
|
|
* listeners, and we close all other listeners.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2007-06-04 18:54:42 +02:00
|
|
|
retry_all_listeners(smartlist_t *replaced_conns,
|
2012-04-19 05:32:02 +02:00
|
|
|
smartlist_t *new_conns, int close_all_noncontrol)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2012-01-18 21:53:30 +01:00
|
|
|
smartlist_t *listeners = smartlist_new();
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options = get_options();
|
2011-05-24 17:55:08 +02:00
|
|
|
int retval = 0;
|
|
|
|
const uint16_t old_or_port = router_get_advertised_or_port(options);
|
2011-06-02 13:30:32 +02:00
|
|
|
const uint16_t old_dir_port = router_get_advertised_dir_port(options, 0);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(get_connection_array(), connection_t *, conn) {
|
|
|
|
if (connection_is_listener(conn) && !conn->marked_for_close)
|
|
|
|
smartlist_add(listeners, conn);
|
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
|
|
|
|
2011-11-08 22:10:38 +01:00
|
|
|
if (retry_listener_ports(listeners,
|
|
|
|
get_configured_ports(),
|
2012-04-19 05:32:02 +02:00
|
|
|
new_conns,
|
|
|
|
close_all_noncontrol) < 0)
|
2011-10-06 18:57:07 +02:00
|
|
|
retval = -1;
|
2002-10-02 03:03:00 +02:00
|
|
|
|
Parse prop171 options; refactor listener/port option code
Proposal 171 gives us a new syntax for parsing client port options.
You can now have as many FooPort options as you want (for Foo in
Socks, Trans, DNS, NATD), and they can have address:port arguments,
and you can specify the level of isolation on those ports.
Additionally, this patch refactors the client port parsing logic to
use a new type, port_cfg_t. Previously, ports to be bound were
half-parsed in config.c, and later re-parsed in connection.c when
we're about to bind them. Now, parsing a port means converting it
into a port_cfg_t, and binding it uses only a port_cfg_t, without
needing to parse the user-provided strings at all.
We should do a related refactoring on other port types. For
control ports, that'll be easy enough. For ORPort and DirPort,
we'll want to do this when we solve proposal 118 (letting servers
bind to and advertise multiple ports).
This implements tickets 3514 and 3515.
2011-06-30 20:01:02 +02:00
|
|
|
/* Any members that were still in 'listeners' don't correspond to
|
|
|
|
* any configured port. Kill 'em. */
|
|
|
|
SMARTLIST_FOREACH_BEGIN(listeners, connection_t *, conn) {
|
|
|
|
log_notice(LD_NET, "Closing no-longer-configured %s on %s:%d",
|
|
|
|
conn_type_to_string(conn->type), conn->address, conn->port);
|
|
|
|
if (replaced_conns) {
|
|
|
|
smartlist_add(replaced_conns, conn);
|
|
|
|
} else {
|
|
|
|
connection_close_immediate(conn);
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
|
|
|
|
|
|
|
smartlist_free(listeners);
|
|
|
|
|
2011-11-24 17:40:10 +01:00
|
|
|
/* XXXprop186 should take all advertised ports into account */
|
2011-05-24 17:55:08 +02:00
|
|
|
if (old_or_port != router_get_advertised_or_port(options) ||
|
2011-06-02 13:30:32 +02:00
|
|
|
old_dir_port != router_get_advertised_dir_port(options, 0)) {
|
2011-05-24 17:55:08 +02:00
|
|
|
/* Our chosen ORPort or DirPort is not what it used to be: the
|
|
|
|
* descriptor we had (if any) should be regenerated. (We won't
|
|
|
|
* automatically notice this because of changes in the option,
|
|
|
|
* since the value could be "auto".) */
|
|
|
|
mark_my_descriptor_dirty("Chosen Or/DirPort changed");
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2011-11-29 23:52:16 +01:00
|
|
|
/** Mark every listener of type other than CONTROL_LISTENER to be closed. */
|
2011-11-28 21:44:10 +01:00
|
|
|
void
|
|
|
|
connection_mark_all_noncontrol_listeners(void)
|
|
|
|
{
|
|
|
|
SMARTLIST_FOREACH_BEGIN(get_connection_array(), connection_t *, conn) {
|
|
|
|
if (conn->marked_for_close)
|
|
|
|
continue;
|
|
|
|
if (conn->type == CONN_TYPE_CONTROL_LISTENER)
|
|
|
|
continue;
|
|
|
|
if (connection_is_listener(conn))
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
|
|
|
}
|
|
|
|
|
2011-12-30 18:06:41 +01:00
|
|
|
/** Mark every external connection not used for controllers for close. */
|
2011-11-28 21:44:10 +01:00
|
|
|
void
|
|
|
|
connection_mark_all_noncontrol_connections(void)
|
|
|
|
{
|
|
|
|
SMARTLIST_FOREACH_BEGIN(get_connection_array(), connection_t *, conn) {
|
|
|
|
if (conn->marked_for_close)
|
|
|
|
continue;
|
|
|
|
switch (conn->type) {
|
|
|
|
case CONN_TYPE_CPUWORKER:
|
|
|
|
case CONN_TYPE_CONTROL_LISTENER:
|
|
|
|
case CONN_TYPE_CONTROL:
|
|
|
|
break;
|
|
|
|
case CONN_TYPE_AP:
|
|
|
|
connection_mark_unattached_ap(TO_ENTRY_CONN(conn),
|
|
|
|
END_STREAM_REASON_HIBERNATING);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
|
|
|
}
|
|
|
|
|
2011-07-13 19:06:07 +02:00
|
|
|
/** Return 1 if we should apply rate limiting to <b>conn</b>, and 0
|
|
|
|
* otherwise.
|
|
|
|
* Right now this just checks if it's an internal IP address or an
|
2012-09-09 22:51:34 +02:00
|
|
|
* internal connection. We also should, but don't, check if the connection
|
|
|
|
* uses pluggable transports, since we should then limit it even if it
|
|
|
|
* comes from an internal IP address. */
|
2007-01-26 09:13:53 +01:00
|
|
|
static int
|
|
|
|
connection_is_rate_limited(connection_t *conn)
|
|
|
|
{
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options = get_options();
|
2011-04-05 21:01:19 +02:00
|
|
|
if (conn->linked)
|
|
|
|
return 0; /* Internal connection */
|
2011-04-06 21:24:44 +02:00
|
|
|
else if (! options->CountPrivateBandwidth &&
|
2011-04-05 21:01:19 +02:00
|
|
|
(tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */
|
|
|
|
tor_addr_is_internal(&conn->addr, 0)))
|
|
|
|
return 0; /* Internal address */
|
2007-04-21 19:26:12 +02:00
|
|
|
else
|
|
|
|
return 1;
|
2007-01-26 09:13:53 +01:00
|
|
|
}
|
|
|
|
|
2010-02-22 19:59:34 +01:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
|
|
|
static struct bufferevent_rate_limit_group *global_rate_limit = NULL;
|
|
|
|
#else
|
2004-09-08 08:52:33 +02:00
|
|
|
extern int global_read_bucket, global_write_bucket;
|
2007-03-20 03:55:31 +01:00
|
|
|
extern int global_relayed_read_bucket, global_relayed_write_bucket;
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2007-03-21 16:37:30 +01:00
|
|
|
/** Did either global write bucket run dry last second? If so,
|
2007-03-20 03:55:31 +01:00
|
|
|
* we are likely to run dry again this second, so be stingy with the
|
|
|
|
* tokens we just put in. */
|
|
|
|
static int write_buckets_empty_last_second = 0;
|
2010-02-22 19:59:34 +01:00
|
|
|
#endif
|
2007-03-20 03:55:31 +01:00
|
|
|
|
2007-07-30 00:13:44 +02:00
|
|
|
/** How many seconds of no active local circuits will make the
|
|
|
|
* connection revert to the "relayed" bandwidth class? */
|
|
|
|
#define CLIENT_IDLE_TIME_FOR_PRIORITY 30
|
|
|
|
|
2010-02-22 19:59:34 +01:00
|
|
|
#ifndef USE_BUFFEREVENTS
|
2007-03-20 03:55:31 +01:00
|
|
|
/** Return 1 if <b>conn</b> should use tokens from the "relayed"
|
|
|
|
* bandwidth rates, else 0. Currently, only OR conns with bandwidth
|
|
|
|
* class 1, and directory conns that are serving data out, count.
|
|
|
|
*/
|
|
|
|
static int
|
2007-07-30 00:13:44 +02:00
|
|
|
connection_counts_as_relayed_traffic(connection_t *conn, time_t now)
|
2007-03-20 03:55:31 +01:00
|
|
|
{
|
2007-07-30 00:13:44 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR &&
|
2012-08-01 13:18:42 +02:00
|
|
|
connection_or_client_used(TO_OR_CONN(conn)) +
|
|
|
|
CLIENT_IDLE_TIME_FOR_PRIORITY < now)
|
2007-03-20 03:55:31 +01:00
|
|
|
return 1;
|
|
|
|
if (conn->type == CONN_TYPE_DIR && DIR_CONN_IS_SERVER(conn))
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
2007-01-17 02:29:54 +01:00
|
|
|
|
2007-01-18 04:38:24 +01:00
|
|
|
/** Helper function to decide how many bytes out of <b>global_bucket</b>
|
|
|
|
* we're willing to use for this transaction. <b>base</b> is the size
|
|
|
|
* of a cell on the network; <b>priority</b> says whether we should
|
|
|
|
* write many of them or just a few; and <b>conn_bucket</b> (if
|
|
|
|
* non-negative) provides an upper limit for our answer. */
|
2008-02-24 23:10:08 +01:00
|
|
|
static ssize_t
|
2006-12-23 09:48:16 +01:00
|
|
|
connection_bucket_round_robin(int base, int priority,
|
2008-02-24 23:10:08 +01:00
|
|
|
ssize_t global_bucket, ssize_t conn_bucket)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2008-02-24 23:10:08 +01:00
|
|
|
ssize_t at_most;
|
|
|
|
ssize_t num_bytes_high = (priority ? 32 : 16) * base;
|
|
|
|
ssize_t num_bytes_low = (priority ? 4 : 2) * base;
|
2006-02-04 09:58:51 +01:00
|
|
|
|
|
|
|
/* 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. */
|
2006-12-13 08:08:36 +01:00
|
|
|
at_most = global_bucket / 8;
|
2006-02-04 09:58:51 +01:00
|
|
|
at_most -= (at_most % base); /* round down */
|
2006-12-23 09:48:16 +01:00
|
|
|
if (at_most > num_bytes_high) /* 16 KB, or 8 KB for low-priority */
|
|
|
|
at_most = num_bytes_high;
|
|
|
|
else if (at_most < num_bytes_low) /* 2 KB, or 1 KB for low-priority */
|
|
|
|
at_most = num_bytes_low;
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2006-12-13 08:08:36 +01:00
|
|
|
if (at_most > global_bucket)
|
|
|
|
at_most = global_bucket;
|
2004-09-08 08:52:33 +02:00
|
|
|
|
2006-12-13 08:08:36 +01:00
|
|
|
if (conn_bucket >= 0 && at_most > conn_bucket)
|
|
|
|
at_most = conn_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;
|
|
|
|
}
|
|
|
|
|
2006-12-13 08:08:36 +01:00
|
|
|
/** How many bytes at most can we read onto this connection? */
|
2008-02-24 23:10:08 +01:00
|
|
|
static ssize_t
|
2007-07-30 03:32:12 +02:00
|
|
|
connection_bucket_read_limit(connection_t *conn, time_t now)
|
2006-12-13 08:08:36 +01:00
|
|
|
{
|
|
|
|
int base = connection_speaks_cells(conn) ?
|
|
|
|
CELL_NETWORK_SIZE : RELAY_PAYLOAD_SIZE;
|
2006-12-23 09:48:16 +01:00
|
|
|
int priority = conn->type != CONN_TYPE_DIR;
|
2006-12-13 08:08:36 +01:00
|
|
|
int conn_bucket = -1;
|
2007-03-20 03:55:31 +01:00
|
|
|
int global_bucket = global_read_bucket;
|
|
|
|
|
|
|
|
if (connection_speaks_cells(conn)) {
|
2006-12-13 08:08:36 +01:00
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
2007-03-20 03:55:31 +01:00
|
|
|
if (conn->state == OR_CONN_STATE_OPEN)
|
|
|
|
conn_bucket = or_conn->read_bucket;
|
2006-12-13 08:08:36 +01:00
|
|
|
}
|
2007-03-20 03:55:31 +01:00
|
|
|
|
2007-01-26 09:13:53 +01:00
|
|
|
if (!connection_is_rate_limited(conn)) {
|
2007-01-18 04:38:24 +01:00
|
|
|
/* be willing to read on local conns even if our buckets are empty */
|
2007-01-18 04:42:45 +01:00
|
|
|
return conn_bucket>=0 ? conn_bucket : 1<<14;
|
2007-01-18 04:38:24 +01:00
|
|
|
}
|
2007-03-20 03:55:31 +01:00
|
|
|
|
2007-07-30 03:32:12 +02:00
|
|
|
if (connection_counts_as_relayed_traffic(conn, now) &&
|
2007-03-20 03:55:31 +01:00
|
|
|
global_relayed_read_bucket <= global_read_bucket)
|
|
|
|
global_bucket = global_relayed_read_bucket;
|
|
|
|
|
2006-12-23 09:48:16 +01:00
|
|
|
return connection_bucket_round_robin(base, priority,
|
2007-03-20 03:55:31 +01:00
|
|
|
global_bucket, conn_bucket);
|
2006-12-13 08:08:36 +01:00
|
|
|
}
|
|
|
|
|
2005-10-29 20:19:37 +02:00
|
|
|
/** How many bytes at most can we write onto this connection? */
|
2008-02-24 23:10:08 +01:00
|
|
|
ssize_t
|
2007-07-30 03:32:12 +02:00
|
|
|
connection_bucket_write_limit(connection_t *conn, time_t now)
|
2005-10-29 20:19:37 +02:00
|
|
|
{
|
2006-12-13 08:08:36 +01:00
|
|
|
int base = connection_speaks_cells(conn) ?
|
|
|
|
CELL_NETWORK_SIZE : RELAY_PAYLOAD_SIZE;
|
2006-12-23 09:48:16 +01:00
|
|
|
int priority = conn->type != CONN_TYPE_DIR;
|
2009-12-30 04:25:02 +01:00
|
|
|
int conn_bucket = (int)conn->outbuf_flushlen;
|
2007-03-20 03:55:31 +01:00
|
|
|
int global_bucket = global_write_bucket;
|
2005-10-29 20:19:37 +02:00
|
|
|
|
2007-01-26 09:13:53 +01:00
|
|
|
if (!connection_is_rate_limited(conn)) {
|
2007-01-18 04:38:24 +01:00
|
|
|
/* be willing to write to local conns even if our buckets are empty */
|
|
|
|
return conn->outbuf_flushlen;
|
|
|
|
}
|
2007-03-20 03:55:31 +01:00
|
|
|
|
2009-12-30 04:25:02 +01:00
|
|
|
if (connection_speaks_cells(conn)) {
|
|
|
|
/* use the per-conn write limit if it's lower, but if it's less
|
|
|
|
* than zero just use zero */
|
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
|
|
|
if (conn->state == OR_CONN_STATE_OPEN)
|
|
|
|
if (or_conn->write_bucket < conn_bucket)
|
|
|
|
conn_bucket = or_conn->write_bucket >= 0 ?
|
|
|
|
or_conn->write_bucket : 0;
|
|
|
|
}
|
|
|
|
|
2007-07-30 03:32:12 +02:00
|
|
|
if (connection_counts_as_relayed_traffic(conn, now) &&
|
2007-03-20 03:55:31 +01:00
|
|
|
global_relayed_write_bucket <= global_write_bucket)
|
|
|
|
global_bucket = global_relayed_write_bucket;
|
|
|
|
|
2009-12-30 04:25:02 +01:00
|
|
|
return connection_bucket_round_robin(base, priority,
|
|
|
|
global_bucket, conn_bucket);
|
2005-10-29 20:19:37 +02:00
|
|
|
}
|
2010-02-22 19:59:34 +01:00
|
|
|
#else
|
|
|
|
static ssize_t
|
|
|
|
connection_bucket_read_limit(connection_t *conn, time_t now)
|
|
|
|
{
|
|
|
|
(void) now;
|
|
|
|
return bufferevent_get_max_to_read(conn->bufev);
|
|
|
|
}
|
|
|
|
ssize_t
|
|
|
|
connection_bucket_write_limit(connection_t *conn, time_t now)
|
|
|
|
{
|
|
|
|
(void) now;
|
|
|
|
return bufferevent_get_max_to_write(conn->bufev);
|
|
|
|
}
|
|
|
|
#endif
|
2005-10-29 20:19:37 +02:00
|
|
|
|
2007-03-20 03:55:31 +01:00
|
|
|
/** Return 1 if the global write buckets are low enough that we
|
|
|
|
* shouldn't send <b>attempt</b> bytes of low-priority directory stuff
|
|
|
|
* out to <b>conn</b>. Else return 0.
|
2006-12-23 09:48:16 +01:00
|
|
|
|
|
|
|
* Priority is 1 for v1 requests (directories and running-routers),
|
|
|
|
* and 2 for v2 requests (statuses and descriptors). But see FFFF in
|
|
|
|
* directory_handle_command_get() for why we don't use priority 2 yet.
|
|
|
|
*
|
|
|
|
* There are a lot of parameters we could use here:
|
2007-03-20 03:55:31 +01:00
|
|
|
* - global_relayed_write_bucket. Low is bad.
|
2006-12-23 09:48:16 +01:00
|
|
|
* - global_write_bucket. Low is bad.
|
|
|
|
* - bandwidthrate. Low is bad.
|
|
|
|
* - bandwidthburst. Not a big factor?
|
|
|
|
* - attempt. High is bad.
|
|
|
|
* - total bytes queued on outbufs. High is bad. But I'm wary of
|
|
|
|
* using this, since a few slow-flushing queues will pump up the
|
|
|
|
* number without meaning what we meant to mean. What we really
|
|
|
|
* mean is "total directory bytes added to outbufs recently", but
|
|
|
|
* that's harder to quantify and harder to keep track of.
|
|
|
|
*/
|
2006-02-12 23:27:09 +01:00
|
|
|
int
|
2007-01-26 09:01:29 +01:00
|
|
|
global_write_bucket_low(connection_t *conn, size_t attempt, int priority)
|
2006-02-12 00:15:40 +01:00
|
|
|
{
|
2010-02-22 19:59:34 +01:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
|
|
|
ssize_t smaller_bucket = bufferevent_get_max_to_write(conn->bufev);
|
|
|
|
#else
|
2007-03-20 03:55:31 +01:00
|
|
|
int smaller_bucket = global_write_bucket < global_relayed_write_bucket ?
|
|
|
|
global_write_bucket : global_relayed_write_bucket;
|
2010-02-22 19:59:34 +01:00
|
|
|
#endif
|
2007-01-05 07:03:10 +01:00
|
|
|
if (authdir_mode(get_options()) && priority>1)
|
|
|
|
return 0; /* there's always room to answer v2 if we're an auth dir */
|
|
|
|
|
2007-01-26 09:13:53 +01:00
|
|
|
if (!connection_is_rate_limited(conn))
|
2007-01-26 09:01:29 +01:00
|
|
|
return 0; /* local conns don't get limited */
|
|
|
|
|
2007-03-20 03:55:31 +01:00
|
|
|
if (smaller_bucket < (int)attempt)
|
2007-01-05 07:03:10 +01:00
|
|
|
return 1; /* not enough space no matter the priority */
|
2006-12-23 09:48:16 +01:00
|
|
|
|
2010-02-22 19:59:34 +01:00
|
|
|
#ifndef USE_BUFFEREVENTS
|
2007-03-20 03:55:31 +01:00
|
|
|
if (write_buckets_empty_last_second)
|
2007-01-17 02:29:54 +01:00
|
|
|
return 1; /* we're already hitting our limits, no more please */
|
2010-02-22 19:59:34 +01:00
|
|
|
#endif
|
2007-01-17 02:29:54 +01:00
|
|
|
|
2006-12-23 09:48:16 +01:00
|
|
|
if (priority == 1) { /* old-style v1 query */
|
2007-01-05 07:59:36 +01:00
|
|
|
/* Could we handle *two* of these requests within the next two seconds? */
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options = get_options();
|
2007-03-20 03:55:31 +01:00
|
|
|
int64_t can_write = (int64_t)smaller_bucket
|
|
|
|
+ 2*(options->RelayBandwidthRate ? options->RelayBandwidthRate :
|
|
|
|
options->BandwidthRate);
|
2007-01-06 07:27:15 +01:00
|
|
|
if (can_write < 2*(int64_t)attempt)
|
2006-12-23 09:48:16 +01:00
|
|
|
return 1;
|
|
|
|
} else { /* v2 query */
|
|
|
|
/* no further constraints yet */
|
|
|
|
}
|
|
|
|
return 0;
|
2006-02-12 00:15:40 +01:00
|
|
|
}
|
|
|
|
|
2012-06-05 00:50:13 +02:00
|
|
|
/** Helper: adjusts our bandwidth history and informs the controller as
|
|
|
|
* appropriate, given that we have just read <b>num_read</b> bytes and written
|
|
|
|
* <b>num_written</b> bytes on <b>conn</b>. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2011-08-29 18:55:59 +02:00
|
|
|
record_num_bytes_transferred_impl(connection_t *conn,
|
|
|
|
time_t now, size_t num_read, size_t num_written)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2010-07-07 14:55:42 +02:00
|
|
|
/* Count bytes of answering direct and tunneled directory requests */
|
|
|
|
if (conn->type == CONN_TYPE_DIR && conn->purpose == DIR_PURPOSE_SERVER) {
|
|
|
|
if (num_read > 0)
|
|
|
|
rep_hist_note_dir_bytes_read(num_read, now);
|
|
|
|
if (num_written > 0)
|
|
|
|
rep_hist_note_dir_bytes_written(num_written, now);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!connection_is_rate_limited(conn))
|
|
|
|
return; /* local IPs are free */
|
2010-08-02 15:06:14 +02:00
|
|
|
|
|
|
|
if (conn->type == CONN_TYPE_OR)
|
|
|
|
rep_hist_note_or_conn_bytes(conn->global_identifier, num_read,
|
|
|
|
num_written, now);
|
|
|
|
|
2009-06-24 19:51:45 +02:00
|
|
|
if (num_read > 0) {
|
2007-03-20 03:55:31 +01:00
|
|
|
rep_hist_note_bytes_read(num_read, now);
|
2009-06-24 19:51:45 +02:00
|
|
|
}
|
|
|
|
if (num_written > 0) {
|
2007-03-20 03:55:31 +01:00
|
|
|
rep_hist_note_bytes_written(num_written, now);
|
2009-06-24 19:51:45 +02:00
|
|
|
}
|
2010-08-11 14:13:08 +02:00
|
|
|
if (conn->type == CONN_TYPE_EXIT)
|
|
|
|
rep_hist_note_exit_bytes(conn->port, num_written, num_read);
|
2011-08-29 18:55:59 +02:00
|
|
|
}
|
|
|
|
|
2011-08-29 19:41:59 +02:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
2012-06-05 00:50:13 +02:00
|
|
|
/** Wrapper around fetch_from_(buf/evbuffer)_socks_client: see those functions
|
|
|
|
* for documentation of its behavior. */
|
2011-08-29 18:55:59 +02:00
|
|
|
static void
|
|
|
|
record_num_bytes_transferred(connection_t *conn,
|
|
|
|
time_t now, size_t num_read, size_t num_written)
|
|
|
|
{
|
2012-06-15 15:37:40 +02:00
|
|
|
/* XXX024 check if this is necessary */
|
2011-08-29 18:55:59 +02:00
|
|
|
if (num_written >= INT_MAX || num_read >= INT_MAX) {
|
|
|
|
log_err(LD_BUG, "Value out of range. num_read=%lu, num_written=%lu, "
|
|
|
|
"connection type=%s, state=%s",
|
|
|
|
(unsigned long)num_read, (unsigned long)num_written,
|
|
|
|
conn_type_to_string(conn->type),
|
|
|
|
conn_state_to_string(conn->type, conn->state));
|
|
|
|
if (num_written >= INT_MAX) num_written = 1;
|
|
|
|
if (num_read >= INT_MAX) num_read = 1;
|
|
|
|
tor_fragile_assert();
|
|
|
|
}
|
|
|
|
|
|
|
|
record_num_bytes_transferred_impl(conn,now,num_read,num_written);
|
|
|
|
}
|
2011-08-29 19:41:59 +02:00
|
|
|
#endif
|
2011-08-29 18:55:59 +02:00
|
|
|
|
|
|
|
#ifndef USE_BUFFEREVENTS
|
|
|
|
/** We just read <b>num_read</b> and wrote <b>num_written</b> bytes
|
|
|
|
* onto <b>conn</b>. Decrement buckets appropriately. */
|
|
|
|
static void
|
|
|
|
connection_buckets_decrement(connection_t *conn, time_t now,
|
|
|
|
size_t num_read, size_t num_written)
|
|
|
|
{
|
|
|
|
if (num_written >= INT_MAX || num_read >= INT_MAX) {
|
|
|
|
log_err(LD_BUG, "Value out of range. num_read=%lu, num_written=%lu, "
|
|
|
|
"connection type=%s, state=%s",
|
|
|
|
(unsigned long)num_read, (unsigned long)num_written,
|
|
|
|
conn_type_to_string(conn->type),
|
|
|
|
conn_state_to_string(conn->type, conn->state));
|
|
|
|
if (num_written >= INT_MAX) num_written = 1;
|
|
|
|
if (num_read >= INT_MAX) num_read = 1;
|
|
|
|
tor_fragile_assert();
|
|
|
|
}
|
|
|
|
|
2011-08-29 19:41:59 +02:00
|
|
|
record_num_bytes_transferred_impl(conn, now, num_read, num_written);
|
2011-08-29 18:55:59 +02:00
|
|
|
|
|
|
|
if (!connection_is_rate_limited(conn))
|
|
|
|
return; /* local IPs are free */
|
2007-03-20 03:55:31 +01:00
|
|
|
|
2007-07-30 00:13:44 +02:00
|
|
|
if (connection_counts_as_relayed_traffic(conn, now)) {
|
2008-02-24 23:10:08 +01:00
|
|
|
global_relayed_read_bucket -= (int)num_read;
|
|
|
|
global_relayed_write_bucket -= (int)num_written;
|
2007-03-20 03:55:31 +01:00
|
|
|
}
|
2008-02-24 23:10:08 +01:00
|
|
|
global_read_bucket -= (int)num_read;
|
|
|
|
global_write_bucket -= (int)num_written;
|
2009-12-30 04:25:02 +01:00
|
|
|
if (connection_speaks_cells(conn) && conn->state == OR_CONN_STATE_OPEN) {
|
2008-02-24 23:10:08 +01:00
|
|
|
TO_OR_CONN(conn)->read_bucket -= (int)num_read;
|
2009-12-30 04:25:02 +01:00
|
|
|
TO_OR_CONN(conn)->write_bucket -= (int)num_written;
|
|
|
|
}
|
2004-11-07 02:33:06 +01:00
|
|
|
}
|
|
|
|
|
2006-12-13 08:08:36 +01:00
|
|
|
/** If we have exhausted our global buckets, or the buckets for conn,
|
2006-01-05 22:23:03 +01:00
|
|
|
* stop reading. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static void
|
2006-12-13 08:08:36 +01:00
|
|
|
connection_consider_empty_read_buckets(connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2007-03-20 03:55:31 +01:00
|
|
|
const char *reason;
|
|
|
|
|
2005-01-12 11:00:38 +01:00
|
|
|
if (global_read_bucket <= 0) {
|
2007-03-20 03:55:31 +01:00
|
|
|
reason = "global read bucket exhausted. Pausing.";
|
2008-12-18 18:19:04 +01:00
|
|
|
} else if (connection_counts_as_relayed_traffic(conn, approx_time()) &&
|
2007-03-20 03:55:31 +01:00
|
|
|
global_relayed_read_bucket <= 0) {
|
|
|
|
reason = "global relayed read bucket exhausted. Pausing.";
|
|
|
|
} else if (connection_speaks_cells(conn) &&
|
|
|
|
conn->state == OR_CONN_STATE_OPEN &&
|
|
|
|
TO_OR_CONN(conn)->read_bucket <= 0) {
|
|
|
|
reason = "connection read bucket exhausted. Pausing.";
|
|
|
|
} else
|
|
|
|
return; /* all good, no need to stop it */
|
|
|
|
|
|
|
|
LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason));
|
2007-04-21 19:30:42 +02:00
|
|
|
conn->read_blocked_on_bw = 1;
|
2007-03-20 03:55:31 +01:00
|
|
|
connection_stop_reading(conn);
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
|
|
|
|
2006-12-13 08:08:36 +01:00
|
|
|
/** If we have exhausted our global buckets, or the buckets for conn,
|
|
|
|
* stop writing. */
|
|
|
|
static void
|
|
|
|
connection_consider_empty_write_buckets(connection_t *conn)
|
|
|
|
{
|
2007-03-20 03:55:31 +01:00
|
|
|
const char *reason;
|
|
|
|
|
2006-12-13 08:08:36 +01:00
|
|
|
if (global_write_bucket <= 0) {
|
2007-03-20 03:55:31 +01:00
|
|
|
reason = "global write bucket exhausted. Pausing.";
|
2008-12-18 18:19:04 +01:00
|
|
|
} else if (connection_counts_as_relayed_traffic(conn, approx_time()) &&
|
2007-03-20 03:55:31 +01:00
|
|
|
global_relayed_write_bucket <= 0) {
|
|
|
|
reason = "global relayed write bucket exhausted. Pausing.";
|
|
|
|
} else if (connection_speaks_cells(conn) &&
|
|
|
|
conn->state == OR_CONN_STATE_OPEN &&
|
|
|
|
TO_OR_CONN(conn)->write_bucket <= 0) {
|
|
|
|
reason = "connection write bucket exhausted. Pausing.";
|
|
|
|
} else
|
|
|
|
return; /* all good, no need to stop it */
|
|
|
|
|
|
|
|
LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason));
|
2007-04-21 19:30:42 +02:00
|
|
|
conn->write_blocked_on_bw = 1;
|
2007-03-20 03:55:31 +01:00
|
|
|
connection_stop_writing(conn);
|
2006-12-13 08:08:36 +01:00
|
|
|
}
|
|
|
|
|
2007-03-20 03:55:31 +01:00
|
|
|
/** Initialize the global read bucket to options-\>BandwidthBurst. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
connection_bucket_init(void)
|
|
|
|
{
|
2011-06-14 19:01:38 +02:00
|
|
|
const 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;
|
2007-03-20 03:55:31 +01:00
|
|
|
if (options->RelayBandwidthRate) {
|
|
|
|
global_relayed_read_bucket = (int)options->RelayBandwidthBurst;
|
|
|
|
global_relayed_write_bucket = (int)options->RelayBandwidthBurst;
|
|
|
|
} else {
|
|
|
|
global_relayed_read_bucket = (int)options->BandwidthBurst;
|
|
|
|
global_relayed_write_bucket = (int)options->BandwidthBurst;
|
|
|
|
}
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
|
|
|
|
2011-09-22 21:07:01 +02:00
|
|
|
/** Refill a single <b>bucket</b> called <b>name</b> with bandwidth rate per
|
|
|
|
* second <b>rate</b> and bandwidth burst <b>burst</b>, assuming that
|
|
|
|
* <b>milliseconds_elapsed</b> milliseconds have passed since the last
|
|
|
|
* call. */
|
2007-03-20 03:55:31 +01:00
|
|
|
static void
|
|
|
|
connection_bucket_refill_helper(int *bucket, int rate, int burst,
|
2011-09-08 02:21:53 +02:00
|
|
|
int milliseconds_elapsed,
|
|
|
|
const char *name)
|
2007-03-20 03:55:31 +01:00
|
|
|
{
|
2007-11-06 20:42:37 +01:00
|
|
|
int starting_bucket = *bucket;
|
2011-09-08 03:22:02 +02:00
|
|
|
if (starting_bucket < burst && milliseconds_elapsed > 0) {
|
|
|
|
int64_t incr = (((int64_t)rate) * milliseconds_elapsed) / 1000;
|
|
|
|
if ((burst - starting_bucket) < incr) {
|
2008-02-06 19:21:16 +01:00
|
|
|
*bucket = burst; /* We would overflow the bucket; just set it to
|
|
|
|
* the maximum. */
|
|
|
|
} else {
|
2011-09-08 03:22:02 +02:00
|
|
|
*bucket += (int)incr;
|
2008-02-06 19:21:16 +01:00
|
|
|
if (*bucket > burst || *bucket < starting_bucket) {
|
|
|
|
/* If we overflow the burst, or underflow our starting bucket,
|
|
|
|
* cap the bucket value to burst. */
|
2008-12-18 17:11:24 +01:00
|
|
|
/* XXXX this might be redundant now, but it doesn't show up
|
2008-02-16 00:39:08 +01:00
|
|
|
* in profiles. Remove it after analysis. */
|
2008-02-06 19:21:16 +01:00
|
|
|
*bucket = burst;
|
|
|
|
}
|
2007-11-06 20:42:37 +01:00
|
|
|
}
|
2007-03-20 03:55:31 +01:00
|
|
|
log(LOG_DEBUG, LD_NET,"%s now %d.", name, *bucket);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-08 02:21:53 +02:00
|
|
|
/** Time has passed; increment buckets appropriately. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2011-09-08 02:21:53 +02:00
|
|
|
connection_bucket_refill(int milliseconds_elapsed, time_t now)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options = get_options();
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
2011-09-08 02:21:53 +02:00
|
|
|
int bandwidthrate, bandwidthburst, relayrate, relayburst;
|
|
|
|
|
2011-09-08 03:22:02 +02:00
|
|
|
bandwidthrate = (int)options->BandwidthRate;
|
2011-09-08 02:21:53 +02:00
|
|
|
bandwidthburst = (int)options->BandwidthBurst;
|
2007-03-20 03:55:31 +01:00
|
|
|
|
|
|
|
if (options->RelayBandwidthRate) {
|
2011-09-08 03:22:02 +02:00
|
|
|
relayrate = (int)options->RelayBandwidthRate;
|
2007-03-20 03:55:31 +01:00
|
|
|
relayburst = (int)options->RelayBandwidthBurst;
|
|
|
|
} else {
|
2011-09-08 02:21:53 +02:00
|
|
|
relayrate = bandwidthrate;
|
|
|
|
relayburst = bandwidthburst;
|
2007-03-20 03:55:31 +01:00
|
|
|
}
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2011-09-08 02:21:53 +02:00
|
|
|
tor_assert(milliseconds_elapsed >= 0);
|
2007-01-21 07:24:05 +01:00
|
|
|
|
2007-03-20 03:55:31 +01:00
|
|
|
write_buckets_empty_last_second =
|
2008-09-26 17:30:26 +02:00
|
|
|
global_relayed_write_bucket <= 0 || global_write_bucket <= 0;
|
2007-03-20 03:55:31 +01:00
|
|
|
|
2004-09-08 08:52:33 +02:00
|
|
|
/* refill the global buckets */
|
2007-03-20 03:55:31 +01:00
|
|
|
connection_bucket_refill_helper(&global_read_bucket,
|
2011-09-08 02:21:53 +02:00
|
|
|
bandwidthrate, bandwidthburst,
|
|
|
|
milliseconds_elapsed,
|
|
|
|
"global_read_bucket");
|
2007-03-20 03:55:31 +01:00
|
|
|
connection_bucket_refill_helper(&global_write_bucket,
|
2011-09-08 02:21:53 +02:00
|
|
|
bandwidthrate, bandwidthburst,
|
|
|
|
milliseconds_elapsed,
|
2011-09-22 21:07:01 +02:00
|
|
|
"global_write_bucket");
|
2007-03-20 03:55:31 +01:00
|
|
|
connection_bucket_refill_helper(&global_relayed_read_bucket,
|
2011-09-08 02:21:53 +02:00
|
|
|
relayrate, relayburst,
|
|
|
|
milliseconds_elapsed,
|
2007-03-20 03:55:31 +01:00
|
|
|
"global_relayed_read_bucket");
|
|
|
|
connection_bucket_refill_helper(&global_relayed_write_bucket,
|
2011-09-08 02:21:53 +02:00
|
|
|
relayrate, relayburst,
|
|
|
|
milliseconds_elapsed,
|
2007-03-20 03:55:31 +01:00
|
|
|
"global_relayed_write_bucket");
|
2004-03-14 17:00:52 +01:00
|
|
|
|
|
|
|
/* refill the per-connection buckets */
|
2012-07-17 15:33:38 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) {
|
2006-07-26 21:07:26 +02:00
|
|
|
if (connection_speaks_cells(conn)) {
|
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
2011-09-08 03:22:02 +02:00
|
|
|
int orbandwidthrate = or_conn->bandwidthrate;
|
2011-09-08 02:21:53 +02:00
|
|
|
int orbandwidthburst = or_conn->bandwidthburst;
|
2009-12-30 04:25:02 +01:00
|
|
|
if (connection_bucket_should_increase(or_conn->read_bucket, or_conn)) {
|
2007-11-06 20:54:32 +01:00
|
|
|
connection_bucket_refill_helper(&or_conn->read_bucket,
|
2011-09-08 02:21:53 +02:00
|
|
|
orbandwidthrate,
|
|
|
|
orbandwidthburst,
|
|
|
|
milliseconds_elapsed,
|
2007-11-06 20:54:32 +01:00
|
|
|
"or_conn->read_bucket");
|
2009-12-30 04:25:02 +01:00
|
|
|
}
|
|
|
|
if (connection_bucket_should_increase(or_conn->write_bucket, or_conn)) {
|
|
|
|
connection_bucket_refill_helper(&or_conn->write_bucket,
|
2011-09-08 02:21:53 +02:00
|
|
|
orbandwidthrate,
|
|
|
|
orbandwidthburst,
|
|
|
|
milliseconds_elapsed,
|
2009-12-30 04:25:02 +01:00
|
|
|
"or_conn->write_bucket");
|
2006-07-26 21:07:26 +02:00
|
|
|
}
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
|
|
|
|
2007-04-21 19:30:42 +02:00
|
|
|
if (conn->read_blocked_on_bw == 1 /* 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 */
|
2007-07-30 00:13:44 +02:00
|
|
|
&& (!connection_counts_as_relayed_traffic(conn, now) ||
|
2007-03-20 03:55:31 +01:00
|
|
|
global_relayed_read_bucket > 0) /* even if we're relayed traffic */
|
2004-11-28 12:39:53 +01:00
|
|
|
&& (!connection_speaks_cells(conn) ||
|
|
|
|
conn->state != OR_CONN_STATE_OPEN ||
|
2006-12-13 08:08:36 +01:00
|
|
|
TO_OR_CONN(conn)->read_bucket > 0)) {
|
|
|
|
/* and either a non-cell conn or a cell conn with non-empty bucket */
|
|
|
|
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,
|
2011-05-23 06:17:48 +02:00
|
|
|
"waking up conn (fd %d) for read", (int)conn->s));
|
2007-04-21 19:30:42 +02:00
|
|
|
conn->read_blocked_on_bw = 0;
|
2004-03-14 17:00:52 +01:00
|
|
|
connection_start_reading(conn);
|
2006-12-13 08:08:36 +01:00
|
|
|
}
|
2007-03-20 03:55:31 +01:00
|
|
|
|
2007-04-21 19:30:42 +02:00
|
|
|
if (conn->write_blocked_on_bw == 1
|
2007-03-20 03:55:31 +01:00
|
|
|
&& global_write_bucket > 0 /* and we're allowed to write */
|
2007-07-30 00:13:44 +02:00
|
|
|
&& (!connection_counts_as_relayed_traffic(conn, now) ||
|
2010-01-15 21:58:35 +01:00
|
|
|
global_relayed_write_bucket > 0) /* even if it's relayed traffic */
|
2009-12-30 04:25:02 +01:00
|
|
|
&& (!connection_speaks_cells(conn) ||
|
|
|
|
conn->state != OR_CONN_STATE_OPEN ||
|
|
|
|
TO_OR_CONN(conn)->write_bucket > 0)) {
|
2006-12-13 08:08:36 +01:00
|
|
|
LOG_FN_CONN(conn, (LOG_DEBUG,LD_NET,
|
2011-05-23 06:17:48 +02:00
|
|
|
"waking up conn (fd %d) for write", (int)conn->s));
|
2007-04-21 19:30:42 +02:00
|
|
|
conn->write_blocked_on_bw = 0;
|
2006-12-13 08:08:36 +01:00
|
|
|
connection_start_writing(conn);
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
2012-07-17 15:33:38 +02:00
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
2004-03-14 17:00:52 +01:00
|
|
|
}
|
|
|
|
|
2009-12-30 04:25:02 +01:00
|
|
|
/** Is the <b>bucket</b> for connection <b>conn</b> low enough that we
|
2004-05-10 03:32:57 +02:00
|
|
|
* should add another pile of tokens to it?
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
2009-12-30 04:25:02 +01:00
|
|
|
connection_bucket_should_increase(int bucket, 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
|
|
|
|
2012-10-12 18:22:13 +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 */
|
2009-12-30 04:25:02 +01:00
|
|
|
if (bucket >= conn->bandwidthburst)
|
2004-03-14 17:00:52 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
2010-02-22 19:59:34 +01:00
|
|
|
#else
|
|
|
|
static void
|
|
|
|
connection_buckets_decrement(connection_t *conn, time_t now,
|
|
|
|
size_t num_read, size_t num_written)
|
|
|
|
{
|
|
|
|
(void) conn;
|
|
|
|
(void) now;
|
|
|
|
(void) num_read;
|
|
|
|
(void) num_written;
|
|
|
|
/* Libevent does this for us. */
|
|
|
|
}
|
2011-08-29 18:55:59 +02:00
|
|
|
|
2010-02-22 19:59:34 +01:00
|
|
|
void
|
|
|
|
connection_bucket_refill(int seconds_elapsed, time_t now)
|
|
|
|
{
|
|
|
|
(void) seconds_elapsed;
|
|
|
|
(void) now;
|
|
|
|
/* Libevent does this for us. */
|
|
|
|
}
|
|
|
|
void
|
|
|
|
connection_bucket_init(void)
|
|
|
|
{
|
2011-06-14 19:01:38 +02:00
|
|
|
const or_options_t *options = get_options();
|
2010-02-22 19:59:34 +01:00
|
|
|
const struct timeval *tick = tor_libevent_get_one_tick_timeout();
|
|
|
|
struct ev_token_bucket_cfg *bucket_cfg;
|
|
|
|
|
|
|
|
uint64_t rate, burst;
|
|
|
|
if (options->RelayBandwidthRate) {
|
|
|
|
rate = options->RelayBandwidthRate;
|
|
|
|
burst = options->RelayBandwidthBurst;
|
|
|
|
} else {
|
|
|
|
rate = options->BandwidthRate;
|
|
|
|
burst = options->BandwidthBurst;
|
|
|
|
}
|
|
|
|
|
2011-09-08 04:00:48 +02:00
|
|
|
/* This can't overflow, since TokenBucketRefillInterval <= 1000,
|
|
|
|
* and rate started out less than INT32_MAX. */
|
|
|
|
rate = (rate * options->TokenBucketRefillInterval) / 1000;
|
|
|
|
|
2010-02-22 19:59:34 +01:00
|
|
|
bucket_cfg = ev_token_bucket_cfg_new((uint32_t)rate, (uint32_t)burst,
|
|
|
|
(uint32_t)rate, (uint32_t)burst,
|
|
|
|
tick);
|
|
|
|
|
|
|
|
if (!global_rate_limit) {
|
|
|
|
global_rate_limit =
|
|
|
|
bufferevent_rate_limit_group_new(tor_libevent_get_base(), bucket_cfg);
|
|
|
|
} else {
|
|
|
|
bufferevent_rate_limit_group_set_cfg(global_rate_limit, bucket_cfg);
|
|
|
|
}
|
|
|
|
ev_token_bucket_cfg_free(bucket_cfg);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
connection_get_rate_limit_totals(uint64_t *read_out, uint64_t *written_out)
|
|
|
|
{
|
|
|
|
if (global_rate_limit == NULL) {
|
|
|
|
*read_out = *written_out = 0;
|
|
|
|
} else {
|
|
|
|
bufferevent_rate_limit_group_get_totals(
|
|
|
|
global_rate_limit, read_out, written_out);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-06-05 00:50:13 +02:00
|
|
|
/** Perform whatever operations are needed on <b>conn</b> to enable
|
|
|
|
* rate-limiting. */
|
2010-02-22 19:59:34 +01:00
|
|
|
void
|
|
|
|
connection_enable_rate_limiting(connection_t *conn)
|
|
|
|
{
|
|
|
|
if (conn->bufev) {
|
|
|
|
if (!global_rate_limit)
|
|
|
|
connection_bucket_init();
|
2011-08-24 23:09:56 +02:00
|
|
|
tor_add_bufferevent_to_rate_limit_group(conn->bufev, global_rate_limit);
|
2010-02-22 19:59:34 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
connection_consider_empty_write_buckets(connection_t *conn)
|
|
|
|
{
|
|
|
|
(void) conn;
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
connection_consider_empty_read_buckets(connection_t *conn)
|
|
|
|
{
|
|
|
|
(void) conn;
|
|
|
|
}
|
|
|
|
#endif
|
2004-03-14 17:00:52 +01:00
|
|
|
|
2005-05-17 19:01:36 +02:00
|
|
|
/** Read bytes from conn-\>s and process them.
|
2004-05-10 03:32:57 +02:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
2009-12-10 17:12:42 +01:00
|
|
|
static int
|
|
|
|
connection_handle_read_impl(connection_t *conn)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2011-03-25 21:45:25 +01:00
|
|
|
ssize_t max_to_read=-1, try_to_read;
|
2007-04-21 19:26:12 +02:00
|
|
|
size_t before, n_read = 0;
|
2008-09-14 10:35:41 +02:00
|
|
|
int socket_error = 0;
|
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 */
|
|
|
|
|
2008-12-18 18:19:04 +01:00
|
|
|
conn->timestamp_lastread = approx_time();
|
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:
|
2006-11-14 01:06:31 +01:00
|
|
|
case CONN_TYPE_AP_NATD_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);
|
2007-05-24 22:31:30 +02:00
|
|
|
case CONN_TYPE_AP_DNS_LISTENER:
|
|
|
|
/* This should never happen; eventdns.c handles the reads here. */
|
|
|
|
tor_fragile_assert();
|
|
|
|
return 0;
|
2003-09-08 12:59:00 +02:00
|
|
|
}
|
2003-09-05 08:04:03 +02:00
|
|
|
|
2010-08-16 00:29:27 +02:00
|
|
|
loop_again:
|
2004-11-21 08:43:12 +01:00
|
|
|
try_to_read = max_to_read;
|
|
|
|
tor_assert(!conn->marked_for_close);
|
2007-04-21 19:26:12 +02:00
|
|
|
|
|
|
|
before = buf_datalen(conn->inbuf);
|
2008-09-14 10:35:41 +02:00
|
|
|
if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) {
|
2004-07-12 22:39:40 +02:00
|
|
|
/* There's a read error; kill the connection.*/
|
2012-08-01 13:18:42 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR) {
|
|
|
|
connection_or_notify_error(TO_OR_CONN(conn),
|
|
|
|
socket_error != 0 ?
|
|
|
|
errno_to_orconn_end_reason(socket_error) :
|
|
|
|
END_OR_CONN_REASON_CONNRESET,
|
|
|
|
socket_error != 0 ?
|
|
|
|
tor_socket_strerror(socket_error) :
|
|
|
|
"(unknown, errno was 0)");
|
2008-09-09 08:25:39 +02:00
|
|
|
}
|
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);
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end_errno(edge_conn);
|
2011-07-20 18:55:42 +02:00
|
|
|
if (conn->type == CONN_TYPE_AP && TO_ENTRY_CONN(conn)->socks_request) {
|
|
|
|
/* broken, don't send a socks reply back */
|
|
|
|
TO_ENTRY_CONN(conn)->socks_request->has_finished = 1;
|
|
|
|
}
|
2004-10-14 11:28:31 +02:00
|
|
|
}
|
2008-06-09 20:32:43 +02:00
|
|
|
connection_close_immediate(conn); /* Don't flush; connection is dead. */
|
2012-11-09 23:19:45 +01:00
|
|
|
/*
|
|
|
|
* This can bypass normal channel checking since we did
|
|
|
|
* connection_or_notify_error() above.
|
|
|
|
*/
|
|
|
|
connection_mark_for_close_internal(conn);
|
2003-09-08 12:59:00 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2007-04-21 19:26:12 +02:00
|
|
|
n_read += buf_datalen(conn->inbuf) - before;
|
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;
|
|
|
|
}
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked_conn) {
|
2009-09-07 02:09:08 +02:00
|
|
|
/* The other side's handle_write() will never actually get called, so
|
2007-04-21 19:26:12 +02:00
|
|
|
* we need to invoke the appropriate callbacks ourself. */
|
|
|
|
connection_t *linked = conn->linked_conn;
|
|
|
|
|
|
|
|
if (n_read) {
|
2010-08-09 15:25:09 +02:00
|
|
|
/* Probably a no-op, since linked conns typically don't count for
|
|
|
|
* bandwidth rate limiting. But do it anyway so we can keep stats
|
|
|
|
* accurately. Note that since we read the bytes from conn, and
|
|
|
|
* we're writing the bytes onto the linked connection, we count
|
|
|
|
* these as <i>written</i> bytes. */
|
|
|
|
connection_buckets_decrement(linked, approx_time(), 0, n_read);
|
2007-04-21 19:26:12 +02:00
|
|
|
|
|
|
|
if (connection_flushed_some(linked) < 0)
|
|
|
|
connection_mark_for_close(linked);
|
|
|
|
if (!connection_wants_to_flush(linked))
|
|
|
|
connection_finished_flushing(linked);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!buf_datalen(linked->outbuf) && conn->active_on_link)
|
|
|
|
connection_stop_reading_from_linked_conn(conn);
|
|
|
|
}
|
2009-09-07 02:09:08 +02:00
|
|
|
/* If we hit the EOF, call connection_reached_eof(). */
|
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
|
|
|
}
|
|
|
|
|
2012-06-05 01:51:00 +02:00
|
|
|
/* DOCDOC connection_handle_read */
|
2009-12-10 17:12:42 +01:00
|
|
|
int
|
|
|
|
connection_handle_read(connection_t *conn)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
|
|
|
tor_gettimeofday_cache_clear();
|
|
|
|
res = connection_handle_read_impl(conn);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
/** Pull in new bytes from conn-\>s or conn-\>linked_conn onto conn-\>inbuf,
|
|
|
|
* either directly or via TLS. Reduce the token buckets by the number of bytes
|
|
|
|
* read.
|
2004-05-10 03:32:57 +02:00
|
|
|
*
|
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
|
2011-03-25 21:45:25 +01:00
|
|
|
connection_read_to_buf(connection_t *conn, ssize_t *max_to_read,
|
|
|
|
int *socket_error)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2008-02-24 23:10:08 +01:00
|
|
|
int result;
|
|
|
|
ssize_t at_most = *max_to_read;
|
2007-12-26 01:12:08 +01:00
|
|
|
size_t slack_in_buf, more_to_read;
|
2006-12-29 04:42:46 +01:00
|
|
|
size_t n_read = 0, n_written = 0;
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
|
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? */
|
2008-12-18 18:19:04 +01:00
|
|
|
at_most = connection_bucket_read_limit(conn, approx_time());
|
2004-11-21 08:43:12 +01:00
|
|
|
}
|
2002-10-02 01:37:31 +02:00
|
|
|
|
2007-12-26 01:12:08 +01:00
|
|
|
slack_in_buf = buf_slack(conn->inbuf);
|
2005-05-03 01:17:08 +02:00
|
|
|
again:
|
2007-12-26 01:12:08 +01:00
|
|
|
if ((size_t)at_most > slack_in_buf && slack_in_buf >= 1024) {
|
|
|
|
more_to_read = at_most - slack_in_buf;
|
|
|
|
at_most = slack_in_buf;
|
2005-05-03 01:17:08 +02:00
|
|
|
} else {
|
|
|
|
more_to_read = 0;
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
if (connection_speaks_cells(conn) &&
|
2009-06-19 01:59:18 +02:00
|
|
|
conn->state > OR_CONN_STATE_PROXY_HANDSHAKING) {
|
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);
|
2008-02-06 20:34:32 +01:00
|
|
|
size_t initial_size;
|
2007-12-01 09:09:48 +01:00
|
|
|
if (conn->state == OR_CONN_STATE_TLS_HANDSHAKING ||
|
2008-01-13 01:20:47 +01:00
|
|
|
conn->state == OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING) {
|
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,
|
2008-02-24 23:10:08 +01:00
|
|
|
"%d: starting, inbuf_datalen %ld (%d pending in tls object)."
|
|
|
|
" at_most %ld.",
|
2011-05-23 06:17:48 +02:00
|
|
|
(int)conn->s,(long)buf_datalen(conn->inbuf),
|
2008-02-24 23:10:08 +01:00
|
|
|
tor_tls_get_pending_bytes(or_conn->tls), (long)at_most);
|
2004-04-26 23:15:06 +02:00
|
|
|
|
2008-02-06 20:34:32 +01:00
|
|
|
initial_size = buf_datalen(conn->inbuf);
|
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);
|
2007-01-15 22:21:05 +01:00
|
|
|
if (TOR_TLS_IS_ERROR(result) || result == TOR_TLS_CLOSE)
|
|
|
|
or_conn->tls_error = result;
|
2007-01-15 23:11:21 +01:00
|
|
|
else
|
|
|
|
or_conn->tls_error = 0;
|
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:
|
2008-02-21 17:11:58 +01:00
|
|
|
case TOR_TLS_ERROR_IO:
|
2008-03-17 05:07:51 +01:00
|
|
|
log_debug(LD_NET,"TLS connection closed %son read. Closing. "
|
2008-04-16 02:12:44 +02:00
|
|
|
"(Nickname %s, address %s)",
|
2008-02-21 17:11:58 +01:00
|
|
|
result == TOR_TLS_CLOSE ? "cleanly " : "",
|
2006-07-26 21:07:26 +02:00
|
|
|
or_conn->nickname ? or_conn->nickname : "not set",
|
|
|
|
conn->address);
|
2007-01-15 22:13:37 +01:00
|
|
|
return result;
|
2008-02-21 17:11:58 +01:00
|
|
|
CASE_TOR_TLS_ERROR_ANY_NONIO:
|
2008-03-17 05:07:51 +01:00
|
|
|
log_debug(LD_NET,"tls error [%s]. breaking (nickname %s, address %s).",
|
2007-11-07 17:37:08 +01:00
|
|
|
tor_tls_err_to_string(result),
|
2006-07-26 21:07:26 +02:00
|
|
|
or_conn->nickname ? or_conn->nickname : "not set",
|
|
|
|
conn->address);
|
2007-01-15 22:13:37 +01:00
|
|
|
return result;
|
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) {
|
2006-12-29 04:42:46 +01:00
|
|
|
/* If we have any pending bytes, we 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) {
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_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
|
|
|
}
|
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
|
|
|
}
|
2008-02-06 20:34:32 +01:00
|
|
|
result = (int)(buf_datalen(conn->inbuf)-initial_size);
|
2006-12-29 04:42:46 +01:00
|
|
|
tor_tls_get_n_raw_bytes(or_conn->tls, &n_read, &n_written);
|
|
|
|
log_debug(LD_GENERAL, "After TLS read of %d: %ld read, %ld written",
|
|
|
|
result, (long)n_read, (long)n_written);
|
2007-04-21 19:26:12 +02:00
|
|
|
} else if (conn->linked) {
|
|
|
|
if (conn->linked_conn) {
|
|
|
|
result = move_buf_to_buf(conn->inbuf, conn->linked_conn->outbuf,
|
|
|
|
&conn->linked_conn->outbuf_flushlen);
|
|
|
|
} else {
|
|
|
|
result = 0;
|
|
|
|
}
|
|
|
|
//log_notice(LD_GENERAL, "Moved %d bytes on an internal link!", result);
|
|
|
|
/* If the other side has disappeared, or if it's been marked for close and
|
|
|
|
* we flushed its outbuf, then we should set our inbuf_reached_eof. */
|
|
|
|
if (!conn->linked_conn ||
|
|
|
|
(conn->linked_conn->marked_for_close &&
|
|
|
|
buf_datalen(conn->linked_conn->outbuf) == 0))
|
|
|
|
conn->inbuf_reached_eof = 1;
|
|
|
|
|
|
|
|
n_read = (size_t) result;
|
2003-09-16 23:20:09 +02:00
|
|
|
} else {
|
2007-04-21 19:26:12 +02:00
|
|
|
/* !connection_speaks_cells, !conn->linked_conn. */
|
2006-07-28 17:11:20 +02:00
|
|
|
int reached_eof = 0;
|
2005-07-13 07:14:42 +02:00
|
|
|
CONN_LOG_PROTECT(conn,
|
2008-09-14 10:35:41 +02:00
|
|
|
result = read_to_buf(conn->s, at_most, conn->inbuf, &reached_eof,
|
|
|
|
socket_error));
|
2006-07-28 17:11:20 +02:00
|
|
|
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;
|
2006-12-29 04:42:46 +01:00
|
|
|
n_read = (size_t) result;
|
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
|
|
|
}
|
|
|
|
|
2011-03-25 21:45:25 +01:00
|
|
|
if (n_read > 0) {
|
2011-04-07 18:17:20 +02:00
|
|
|
/* change *max_to_read */
|
2011-03-25 21:45:25 +01:00
|
|
|
*max_to_read = at_most - n_read;
|
2004-11-21 08:43:12 +01:00
|
|
|
|
2011-03-25 21:45:25 +01:00
|
|
|
/* Update edge_conn->n_read */
|
|
|
|
if (conn->type == CONN_TYPE_AP) {
|
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
|
|
|
/* Check for overflow: */
|
|
|
|
if (PREDICT_LIKELY(UINT32_MAX - edge_conn->n_read > n_read))
|
|
|
|
edge_conn->n_read += (int)n_read;
|
|
|
|
else
|
|
|
|
edge_conn->n_read = UINT32_MAX;
|
|
|
|
}
|
2007-02-14 17:46:49 +01:00
|
|
|
}
|
|
|
|
|
2008-12-18 18:19:04 +01:00
|
|
|
connection_buckets_decrement(conn, approx_time(), n_read, n_written);
|
2004-07-13 18:58:01 +02:00
|
|
|
|
2005-05-03 01:17:08 +02:00
|
|
|
if (more_to_read && result == at_most) {
|
2007-12-26 01:12:08 +01:00
|
|
|
slack_in_buf = buf_slack(conn->inbuf);
|
2005-05-03 01:17:08 +02:00
|
|
|
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. */
|
2006-12-13 08:08:36 +01:00
|
|
|
connection_consider_empty_read_buckets(conn);
|
2007-01-05 07:03:10 +01:00
|
|
|
if (n_written > 0 && connection_is_writing(conn))
|
2006-12-29 04:42:46 +01:00
|
|
|
connection_consider_empty_write_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
|
|
|
}
|
|
|
|
|
2009-08-04 18:29:30 +02:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
|
|
|
/* XXXX These generic versions could be simplified by making them
|
|
|
|
type-specific */
|
2009-08-23 17:39:34 +02:00
|
|
|
|
|
|
|
/** Callback: Invoked whenever bytes are added to or drained from an input
|
|
|
|
* evbuffer. Used to track the number of bytes read. */
|
2009-08-04 18:29:30 +02:00
|
|
|
static void
|
|
|
|
evbuffer_inbuf_callback(struct evbuffer *buf,
|
|
|
|
const struct evbuffer_cb_info *info, void *arg)
|
|
|
|
{
|
|
|
|
connection_t *conn = arg;
|
|
|
|
(void) buf;
|
|
|
|
/* XXXX These need to get real counts on the non-nested TLS case. - NM */
|
|
|
|
if (info->n_added) {
|
|
|
|
time_t now = approx_time();
|
|
|
|
conn->timestamp_lastread = now;
|
2011-08-29 18:55:59 +02:00
|
|
|
record_num_bytes_transferred(conn, now, info->n_added, 0);
|
2009-08-04 18:29:30 +02:00
|
|
|
connection_consider_empty_read_buckets(conn);
|
|
|
|
if (conn->type == CONN_TYPE_AP) {
|
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
2012-06-15 15:37:40 +02:00
|
|
|
/*XXXX024 check for overflow*/
|
2009-08-04 18:29:30 +02:00
|
|
|
edge_conn->n_read += (int)info->n_added;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-23 17:39:34 +02:00
|
|
|
/** Callback: Invoked whenever bytes are added to or drained from an output
|
|
|
|
* evbuffer. Used to track the number of bytes written. */
|
2009-08-04 18:29:30 +02:00
|
|
|
static void
|
|
|
|
evbuffer_outbuf_callback(struct evbuffer *buf,
|
|
|
|
const struct evbuffer_cb_info *info, void *arg)
|
|
|
|
{
|
|
|
|
connection_t *conn = arg;
|
|
|
|
(void)buf;
|
|
|
|
if (info->n_deleted) {
|
|
|
|
time_t now = approx_time();
|
|
|
|
conn->timestamp_lastwritten = now;
|
2011-08-29 18:55:59 +02:00
|
|
|
record_num_bytes_transferred(conn, now, 0, info->n_deleted);
|
2009-08-04 18:29:30 +02:00
|
|
|
connection_consider_empty_write_buckets(conn);
|
|
|
|
if (conn->type == CONN_TYPE_AP) {
|
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
2012-06-15 15:37:40 +02:00
|
|
|
/*XXXX024 check for overflow*/
|
2009-08-04 18:29:30 +02:00
|
|
|
edge_conn->n_written += (int)info->n_deleted;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-23 17:39:34 +02:00
|
|
|
/** Callback: invoked whenever a bufferevent has read data. */
|
2009-08-14 20:34:16 +02:00
|
|
|
void
|
2009-08-04 18:29:30 +02:00
|
|
|
connection_handle_read_cb(struct bufferevent *bufev, void *arg)
|
|
|
|
{
|
|
|
|
connection_t *conn = arg;
|
|
|
|
(void) bufev;
|
2011-07-07 17:00:21 +02:00
|
|
|
if (!conn->marked_for_close) {
|
2009-08-04 18:29:30 +02:00
|
|
|
if (connection_process_inbuf(conn, 1)<0) /* XXXX Always 1? */
|
2011-07-07 17:00:21 +02:00
|
|
|
if (!conn->marked_for_close)
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
}
|
2009-08-04 18:29:30 +02:00
|
|
|
}
|
|
|
|
|
2009-08-23 17:39:34 +02:00
|
|
|
/** Callback: invoked whenever a bufferevent has written data. */
|
2009-08-14 20:34:16 +02:00
|
|
|
void
|
2009-08-04 18:29:30 +02:00
|
|
|
connection_handle_write_cb(struct bufferevent *bufev, void *arg)
|
|
|
|
{
|
|
|
|
connection_t *conn = arg;
|
2009-08-09 02:47:47 +02:00
|
|
|
struct evbuffer *output;
|
2009-08-04 18:29:30 +02:00
|
|
|
if (connection_flushed_some(conn)<0) {
|
2011-07-07 17:00:21 +02:00
|
|
|
if (!conn->marked_for_close)
|
|
|
|
connection_mark_for_close(conn);
|
2009-08-04 18:29:30 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-08-09 02:47:47 +02:00
|
|
|
output = bufferevent_get_output(bufev);
|
|
|
|
if (!evbuffer_get_length(output)) {
|
2009-08-04 18:29:30 +02:00
|
|
|
connection_finished_flushing(conn);
|
2009-08-14 20:34:16 +02:00
|
|
|
if (conn->marked_for_close && conn->hold_open_until_flushed) {
|
2009-08-09 02:47:47 +02:00
|
|
|
conn->hold_open_until_flushed = 0;
|
2009-08-14 20:34:16 +02:00
|
|
|
if (conn->linked) {
|
|
|
|
/* send eof */
|
|
|
|
bufferevent_flush(conn->bufev, EV_WRITE, BEV_FINISHED);
|
|
|
|
}
|
|
|
|
}
|
2009-08-04 18:29:30 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-23 17:39:34 +02:00
|
|
|
/** Callback: invoked whenever a bufferevent has had an event (like a
|
|
|
|
* connection, or an eof, or an error) occur. */
|
2009-08-14 20:34:16 +02:00
|
|
|
void
|
2009-08-04 18:29:30 +02:00
|
|
|
connection_handle_event_cb(struct bufferevent *bufev, short event, void *arg)
|
|
|
|
{
|
|
|
|
connection_t *conn = arg;
|
|
|
|
(void) bufev;
|
2011-12-17 20:06:10 +01:00
|
|
|
if (conn->marked_for_close)
|
|
|
|
return;
|
|
|
|
|
2009-08-04 18:29:30 +02:00
|
|
|
if (event & BEV_EVENT_CONNECTED) {
|
|
|
|
tor_assert(connection_state_is_connecting(conn));
|
|
|
|
if (connection_finished_connecting(conn)<0)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (event & BEV_EVENT_EOF) {
|
|
|
|
if (!conn->marked_for_close) {
|
|
|
|
conn->inbuf_reached_eof = 1;
|
|
|
|
if (connection_reached_eof(conn)<0)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (event & BEV_EVENT_ERROR) {
|
|
|
|
int socket_error = evutil_socket_geterror(conn->s);
|
|
|
|
if (conn->type == CONN_TYPE_OR &&
|
|
|
|
conn->state == OR_CONN_STATE_CONNECTING) {
|
|
|
|
connection_or_connect_failed(TO_OR_CONN(conn),
|
|
|
|
errno_to_orconn_end_reason(socket_error),
|
|
|
|
tor_socket_strerror(socket_error));
|
|
|
|
} else if (CONN_IS_EDGE(conn)) {
|
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
2009-08-11 23:45:01 +02:00
|
|
|
if (!edge_conn->edge_has_sent_end)
|
|
|
|
connection_edge_end_errno(edge_conn);
|
2011-07-20 18:55:42 +02:00
|
|
|
if (conn->type == CONN_TYPE_AP && TO_ENTRY_CONN(conn)->socks_request) {
|
|
|
|
/* broken, don't send a socks reply back */
|
|
|
|
TO_ENTRY_CONN(conn)->socks_request->has_finished = 1;
|
|
|
|
}
|
2009-08-04 18:29:30 +02:00
|
|
|
}
|
|
|
|
connection_close_immediate(conn); /* Connection is dead. */
|
2009-08-11 23:45:01 +02:00
|
|
|
if (!conn->marked_for_close)
|
|
|
|
connection_mark_for_close(conn);
|
2009-08-04 18:29:30 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-23 17:39:34 +02:00
|
|
|
/** Set up the generic callbacks for the bufferevent on <b>conn</b>. */
|
2009-08-04 18:29:30 +02:00
|
|
|
void
|
|
|
|
connection_configure_bufferevent_callbacks(connection_t *conn)
|
|
|
|
{
|
|
|
|
struct bufferevent *bufev;
|
|
|
|
struct evbuffer *input, *output;
|
|
|
|
tor_assert(conn->bufev);
|
|
|
|
bufev = conn->bufev;
|
|
|
|
bufferevent_setcb(bufev,
|
|
|
|
connection_handle_read_cb,
|
|
|
|
connection_handle_write_cb,
|
|
|
|
connection_handle_event_cb,
|
|
|
|
conn);
|
2011-08-24 23:30:20 +02:00
|
|
|
/* Set a fairly high write low-watermark so that we get the write callback
|
|
|
|
called whenever data is written to bring us under 128K. Leave the
|
|
|
|
high-watermark at 0.
|
|
|
|
*/
|
|
|
|
bufferevent_setwatermark(bufev, EV_WRITE, 128*1024, 0);
|
2009-08-04 18:29:30 +02:00
|
|
|
|
|
|
|
input = bufferevent_get_input(bufev);
|
|
|
|
output = bufferevent_get_output(bufev);
|
|
|
|
evbuffer_add_cb(input, evbuffer_inbuf_callback, conn);
|
|
|
|
evbuffer_add_cb(output, evbuffer_outbuf_callback, conn);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
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)
|
|
|
|
{
|
2009-07-31 17:59:39 +02:00
|
|
|
IF_HAS_BUFFEREVENT(conn, {
|
2010-04-04 03:34:42 +02:00
|
|
|
/* XXX overflow -seb */
|
|
|
|
return (int)bufferevent_read(conn->bufev, string, len);
|
2009-07-31 17:59:39 +02:00
|
|
|
}) ELSE_IF_NO_BUFFEREVENT {
|
|
|
|
return fetch_from_buf(string, len, conn->inbuf);
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2009-07-31 19:44:43 +02:00
|
|
|
/** As fetch_from_buf_line(), but read from a connection's input buffer. */
|
|
|
|
int
|
|
|
|
connection_fetch_from_buf_line(connection_t *conn, char *data,
|
|
|
|
size_t *data_len)
|
|
|
|
{
|
|
|
|
IF_HAS_BUFFEREVENT(conn, {
|
|
|
|
int r;
|
|
|
|
size_t eol_len=0;
|
|
|
|
struct evbuffer *input = bufferevent_get_input(conn->bufev);
|
|
|
|
struct evbuffer_ptr ptr =
|
|
|
|
evbuffer_search_eol(input, NULL, &eol_len, EVBUFFER_EOL_LF);
|
|
|
|
if (ptr.pos == -1)
|
|
|
|
return 0; /* No EOL found. */
|
|
|
|
if ((size_t)ptr.pos+eol_len >= *data_len) {
|
|
|
|
return -1; /* Too long */
|
|
|
|
}
|
|
|
|
*data_len = ptr.pos+eol_len;
|
|
|
|
r = evbuffer_remove(input, data, ptr.pos+eol_len);
|
|
|
|
tor_assert(r >= 0);
|
|
|
|
data[ptr.pos+eol_len] = '\0';
|
|
|
|
return 1;
|
|
|
|
}) ELSE_IF_NO_BUFFEREVENT {
|
|
|
|
return fetch_from_buf_line(conn->inbuf, data, data_len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-09 20:40:28 +02:00
|
|
|
/** As fetch_from_buf_http, but fetches from a conncetion's input buffer_t or
|
|
|
|
* its bufferevent as appropriate. */
|
|
|
|
int
|
|
|
|
connection_fetch_from_buf_http(connection_t *conn,
|
|
|
|
char **headers_out, size_t max_headerlen,
|
|
|
|
char **body_out, size_t *body_used,
|
|
|
|
size_t max_bodylen, int force_complete)
|
|
|
|
{
|
|
|
|
IF_HAS_BUFFEREVENT(conn, {
|
|
|
|
struct evbuffer *input = bufferevent_get_input(conn->bufev);
|
|
|
|
return fetch_from_evbuffer_http(input, headers_out, max_headerlen,
|
|
|
|
body_out, body_used, max_bodylen, force_complete);
|
|
|
|
}) ELSE_IF_NO_BUFFEREVENT {
|
|
|
|
return fetch_from_buf_http(conn->inbuf, headers_out, max_headerlen,
|
|
|
|
body_out, body_used, max_bodylen, force_complete);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
{
|
2007-04-21 19:26:12 +02:00
|
|
|
return conn->outbuf_flushlen > 0;
|
2002-07-18 08:37:58 +02:00
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2011-06-19 10:28:40 +02:00
|
|
|
/** Try to flush more bytes onto <b>conn</b>-\>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.
|
|
|
|
*
|
2011-06-19 10:28:40 +02:00
|
|
|
* Update <b>conn</b>-\>timestamp_lastwritten to now, and call flush_buf
|
2007-01-18 04:38:24 +01:00
|
|
|
* or flush_buf_tls appropriately. If it succeeds and there are no more
|
2011-06-19 10:28:40 +02:00
|
|
|
* more bytes on <b>conn</b>-\>outbuf, then call connection_finished_flushing
|
2004-05-10 03:32:57 +02:00
|
|
|
* on it too.
|
|
|
|
*
|
2006-12-29 06:06:47 +01:00
|
|
|
* If <b>force</b>, then write as many bytes as possible, ignoring bandwidth
|
|
|
|
* limits. (Used for flushing messages to controller connections on fatal
|
|
|
|
* errors.)
|
|
|
|
*
|
2004-05-10 03:32:57 +02:00
|
|
|
* Mark the connection and return -1 if you want to close it, else
|
|
|
|
* return 0.
|
|
|
|
*/
|
2009-12-10 17:12:42 +01:00
|
|
|
static int
|
|
|
|
connection_handle_write_impl(connection_t *conn, int force)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-05-07 07:55:06 +02:00
|
|
|
int e;
|
2008-02-24 23:10:08 +01:00
|
|
|
socklen_t len=(socklen_t)sizeof(e);
|
2004-07-13 09:42:20 +02:00
|
|
|
int result;
|
2008-02-24 23:10:08 +01:00
|
|
|
ssize_t max_to_write;
|
2008-12-18 18:19:04 +01:00
|
|
|
time_t now = approx_time();
|
2006-12-29 04:42:46 +01:00
|
|
|
size_t n_read = 0, n_written = 0;
|
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
|
|
|
|
2011-05-23 06:17:48 +02:00
|
|
|
if (conn->marked_for_close || !SOCKET_OK(conn->s))
|
2005-06-08 06:55:06 +02:00
|
|
|
return 0; /* do nothing */
|
|
|
|
|
2007-10-11 22:45:26 +02:00
|
|
|
if (conn->in_flushed_some) {
|
2009-09-07 02:09:08 +02:00
|
|
|
log_warn(LD_BUG, "called recursively from inside conn->in_flushed_some");
|
2007-10-11 22:45:26 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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) {
|
2011-12-02 21:42:15 +01:00
|
|
|
log_warn(LD_BUG, "getsockopt() syscall failed");
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn))
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end_errno(TO_EDGE_CONN(conn));
|
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)) {
|
2008-08-05 22:08:19 +02:00
|
|
|
log_info(LD_NET,"in-progress connect failed. Removing. (%s)",
|
|
|
|
tor_socket_strerror(e));
|
2005-02-23 21:35:26 +01:00
|
|
|
if (CONN_IS_EDGE(conn))
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end_errno(TO_EDGE_CONN(conn));
|
2008-06-09 20:32:43 +02:00
|
|
|
if (conn->type == CONN_TYPE_OR)
|
2012-08-01 13:18:42 +02:00
|
|
|
connection_or_notify_error(TO_OR_CONN(conn),
|
|
|
|
errno_to_orconn_end_reason(e),
|
|
|
|
tor_socket_strerror(e));
|
2005-02-23 21:35:26 +01:00
|
|
|
|
2004-05-12 21:17:09 +02:00
|
|
|
connection_close_immediate(conn);
|
2012-11-09 23:19:45 +01:00
|
|
|
/*
|
|
|
|
* This can bypass normal channel checking since we did
|
|
|
|
* connection_or_notify_error() above.
|
|
|
|
*/
|
|
|
|
connection_mark_for_close_internal(conn);
|
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
|
|
|
}
|
|
|
|
|
2008-02-24 23:10:08 +01:00
|
|
|
max_to_write = force ? (ssize_t)conn->outbuf_flushlen
|
2007-07-30 03:32:12 +02:00
|
|
|
: connection_bucket_write_limit(conn, now);
|
2005-10-29 20:19:37 +02:00
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
if (connection_speaks_cells(conn) &&
|
2009-06-19 01:59:18 +02:00
|
|
|
conn->state > OR_CONN_STATE_PROXY_HANDSHAKING) {
|
2006-07-26 21:07:26 +02:00
|
|
|
or_connection_t *or_conn = TO_OR_CONN(conn);
|
2007-12-01 09:09:48 +01:00
|
|
|
if (conn->state == OR_CONN_STATE_TLS_HANDSHAKING ||
|
2008-01-13 01:20:47 +01:00
|
|
|
conn->state == OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING) {
|
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. */
|
2012-08-01 13:18:42 +02:00
|
|
|
connection_or_notify_error(or_conn,
|
|
|
|
END_OR_CONN_REASON_MISC,
|
|
|
|
"TLS error in connection_tls_"
|
|
|
|
"continue_handshake()");
|
2005-12-14 21:40:40 +01:00
|
|
|
connection_close_immediate(conn);
|
2012-11-09 23:19:45 +01:00
|
|
|
/*
|
|
|
|
* This can bypass normal channel checking since we did
|
|
|
|
* connection_or_notify_error() above.
|
|
|
|
*/
|
|
|
|
connection_mark_for_close_internal(conn);
|
2004-03-03 08:26:34 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2008-01-13 01:20:47 +01:00
|
|
|
} else if (conn->state == OR_CONN_STATE_TLS_SERVER_RENEGOTIATING) {
|
|
|
|
return connection_handle_read(conn);
|
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);
|
2009-08-18 15:53:08 +02:00
|
|
|
|
2012-08-01 13:18:42 +02:00
|
|
|
/* If we just flushed the last bytes, tell the channel on the
|
|
|
|
* or_conn to check if it needs to geoip_change_dirreq_state() */
|
2009-08-04 18:29:30 +02:00
|
|
|
/* XXXX move this to flushed_some or finished_flushing -NM */
|
2012-08-01 13:18:42 +02:00
|
|
|
if (buf_datalen(conn->outbuf) == 0 && or_conn->chan)
|
|
|
|
channel_notify_flushed(TLS_CHAN_TO_BASE(or_conn->chan));
|
2009-08-18 15:53:08 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (result) {
|
2007-01-15 22:21:05 +01:00
|
|
|
CASE_TOR_TLS_ERROR_ANY:
|
2003-09-07 12:24:40 +02:00
|
|
|
case TOR_TLS_CLOSE:
|
2012-08-01 13:18:42 +02:00
|
|
|
log_info(LD_NET, result != TOR_TLS_CLOSE ?
|
2006-02-13 10:02:35 +01:00
|
|
|
"tls error. breaking.":"TLS connection closed on flush");
|
2005-12-14 21:40:40 +01:00
|
|
|
/* Don't flush; connection is dead. */
|
2012-08-01 13:18:42 +02:00
|
|
|
connection_or_notify_error(or_conn,
|
|
|
|
END_OR_CONN_REASON_MISC,
|
|
|
|
result != TOR_TLS_CLOSE ?
|
|
|
|
"TLS error in during flush" :
|
|
|
|
"TLS closed during flush");
|
2005-12-14 21:40:40 +01:00
|
|
|
connection_close_immediate(conn);
|
2012-11-09 23:19:45 +01:00
|
|
|
/*
|
|
|
|
* This can bypass normal channel checking since we did
|
|
|
|
* connection_or_notify_error() above.
|
|
|
|
*/
|
|
|
|
connection_mark_for_close_internal(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);
|
2007-04-21 19:30:42 +02:00
|
|
|
conn->write_blocked_on_bw = 1;
|
2009-09-07 02:09:08 +02:00
|
|
|
/* we'll start reading again when we get more tokens in our
|
|
|
|
* read bucket; then we'll start writing again too.
|
2003-09-07 12:24:40 +02:00
|
|
|
*/
|
|
|
|
}
|
|
|
|
/* 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
|
|
|
}
|
2006-12-29 04:42:46 +01:00
|
|
|
|
|
|
|
tor_tls_get_n_raw_bytes(or_conn->tls, &n_read, &n_written);
|
|
|
|
log_debug(LD_GENERAL, "After TLS write of %d: %ld read, %ld written",
|
|
|
|
result, (long)n_read, (long)n_written);
|
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))
|
2007-03-24 16:57:51 +01:00
|
|
|
connection_edge_end_errno(TO_EDGE_CONN(conn));
|
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
|
|
|
}
|
2006-12-29 04:42:46 +01:00
|
|
|
n_written = (size_t) result;
|
2003-09-05 08:04:03 +02:00
|
|
|
}
|
|
|
|
|
2011-03-25 21:45:25 +01:00
|
|
|
if (n_written && conn->type == CONN_TYPE_AP) {
|
2007-02-14 17:46:55 +01:00
|
|
|
edge_connection_t *edge_conn = TO_EDGE_CONN(conn);
|
2011-04-07 18:17:20 +02:00
|
|
|
|
2011-03-25 21:45:25 +01:00
|
|
|
/* Check for overflow: */
|
|
|
|
if (PREDICT_LIKELY(UINT32_MAX - edge_conn->n_written > n_written))
|
2011-03-28 18:20:50 +02:00
|
|
|
edge_conn->n_written += (int)n_written;
|
2011-03-25 21:45:25 +01:00
|
|
|
else
|
|
|
|
edge_conn->n_written = UINT32_MAX;
|
2007-02-14 17:46:49 +01:00
|
|
|
}
|
|
|
|
|
2008-12-18 18:19:04 +01:00
|
|
|
connection_buckets_decrement(conn, approx_time(), n_read, n_written);
|
2006-12-29 04:42:46 +01:00
|
|
|
|
|
|
|
if (result > 0) {
|
|
|
|
/* If we wrote any bytes from our buffer, then call the appropriate
|
|
|
|
* functions. */
|
2012-08-01 13:18:42 +02:00
|
|
|
if (connection_flushed_some(conn) < 0) {
|
|
|
|
if (connection_speaks_cells(conn)) {
|
|
|
|
connection_or_notify_error(TO_OR_CONN(conn),
|
|
|
|
END_OR_CONN_REASON_MISC,
|
|
|
|
"Got error back from "
|
|
|
|
"connection_flushed_some()");
|
|
|
|
}
|
|
|
|
|
2012-11-09 23:19:45 +01:00
|
|
|
/*
|
|
|
|
* This can bypass normal channel checking since we did
|
|
|
|
* connection_or_notify_error() above.
|
|
|
|
*/
|
|
|
|
connection_mark_for_close_internal(conn);
|
2012-08-01 13:18:42 +02:00
|
|
|
}
|
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
|
|
|
}
|
2006-12-13 08:08:36 +01:00
|
|
|
return 0;
|
2004-05-12 21:49:48 +02:00
|
|
|
}
|
2003-09-07 12:24:40 +02:00
|
|
|
|
2006-12-13 08:08:36 +01:00
|
|
|
/* Call even if result is 0, since the global write bucket may
|
|
|
|
* have reached 0 on a different conn, and this guy needs to
|
|
|
|
* know to stop writing. */
|
|
|
|
connection_consider_empty_write_buckets(conn);
|
2007-01-05 07:03:10 +01:00
|
|
|
if (n_read > 0 && connection_is_reading(conn))
|
2006-12-29 04:42:46 +01:00
|
|
|
connection_consider_empty_read_buckets(conn);
|
|
|
|
|
2003-09-07 12:24:40 +02:00
|
|
|
return 0;
|
2003-09-05 08:04:03 +02:00
|
|
|
}
|
|
|
|
|
2012-06-05 01:51:00 +02:00
|
|
|
/* DOCDOC connection_handle_write */
|
2009-12-10 17:12:42 +01:00
|
|
|
int
|
|
|
|
connection_handle_write(connection_t *conn, int force)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
tor_gettimeofday_cache_clear();
|
|
|
|
res = connection_handle_write_impl(conn, force);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2011-06-21 16:22:54 +02:00
|
|
|
/**
|
|
|
|
* Try to flush data that's waiting for a write on <b>conn</b>. Return
|
|
|
|
* -1 on failure, 0 on success.
|
|
|
|
*
|
|
|
|
* Don't use this function for regular writing; the buffers/bufferevents
|
|
|
|
* system should be good enough at scheduling writes there. Instead, this
|
|
|
|
* function is for cases when we're about to exit or something and we want
|
|
|
|
* to report it right away.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
connection_flush(connection_t *conn)
|
|
|
|
{
|
|
|
|
IF_HAS_BUFFEREVENT(conn, {
|
|
|
|
int r = bufferevent_flush(conn->bufev, EV_WRITE, BEV_FLUSH);
|
|
|
|
return (r < 0) ? -1 : 0;
|
|
|
|
});
|
|
|
|
return connection_handle_write(conn, 1);
|
|
|
|
}
|
|
|
|
|
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.
|
2006-12-29 06:07:04 +01:00
|
|
|
*
|
|
|
|
* If <b>zlib</b> is nonzero, this is a directory connection that should get
|
|
|
|
* its contents compressed or decompressed as they're written. If zlib is
|
|
|
|
* negative, this is the last data to be compressed, and the connection's zlib
|
|
|
|
* state should be flushed.
|
2007-01-22 07:07:51 +01:00
|
|
|
*
|
2012-07-26 00:34:14 +02:00
|
|
|
* If it's a local control connection and a 64k chunk is ready, try to flush
|
|
|
|
* it all, so we don't end up with many megabytes of controller info queued at
|
|
|
|
* once.
|
2004-05-10 03:32:57 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2012-10-12 18:22:13 +02:00
|
|
|
connection_write_to_buf_impl_(const char *string, size_t len,
|
2006-12-29 06:07:04 +01:00
|
|
|
connection_t *conn, int zlib)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2007-10-11 22:45:26 +02:00
|
|
|
/* XXXX This function really needs to return -1 on failure. */
|
2005-07-13 07:14:42 +02:00
|
|
|
int r;
|
2006-12-29 06:07:04 +01:00
|
|
|
size_t old_datalen;
|
2008-02-01 06:27:12 +01:00
|
|
|
if (!len && !(zlib<0))
|
2004-12-04 08:13:37 +01:00
|
|
|
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
|
|
|
|
2009-07-31 17:59:39 +02:00
|
|
|
IF_HAS_BUFFEREVENT(conn, {
|
2009-08-26 21:33:19 +02:00
|
|
|
if (zlib) {
|
|
|
|
int done = zlib < 0;
|
|
|
|
r = write_to_evbuffer_zlib(bufferevent_get_output(conn->bufev),
|
|
|
|
TO_DIR_CONN(conn)->zlib_state,
|
|
|
|
string, len, done);
|
|
|
|
} else {
|
|
|
|
r = bufferevent_write(conn->bufev, string, len);
|
|
|
|
}
|
|
|
|
if (r < 0) {
|
|
|
|
/* XXXX mark for close? */
|
|
|
|
log_warn(LD_NET, "bufferevent_write failed! That shouldn't happen.");
|
|
|
|
}
|
|
|
|
return;
|
2009-07-31 17:59:39 +02:00
|
|
|
});
|
|
|
|
|
2006-12-29 06:07:04 +01:00
|
|
|
old_datalen = buf_datalen(conn->outbuf);
|
|
|
|
if (zlib) {
|
|
|
|
dir_connection_t *dir_conn = TO_DIR_CONN(conn);
|
|
|
|
int done = zlib < 0;
|
|
|
|
CONN_LOG_PROTECT(conn, r = write_to_buf_zlib(conn->outbuf,
|
|
|
|
dir_conn->zlib_state,
|
|
|
|
string, len, done));
|
|
|
|
} else {
|
|
|
|
CONN_LOG_PROTECT(conn, r = write_to_buf(string, len, conn->outbuf));
|
|
|
|
}
|
2005-07-13 07:14:42 +02:00
|
|
|
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,
|
2011-05-23 06:17:48 +02:00
|
|
|
"write_to_buf failed. Closing circuit (fd %d).", (int)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,
|
2011-05-23 06:17:48 +02:00
|
|
|
"write_to_buf failed. Closing connection (fd %d).",
|
|
|
|
(int)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
|
|
|
|
Implement server side of Proposal 174 (optimistic data)
Ian's original message:
The current code actually correctly handles queued data at the
Exit; if there is queued data in a EXIT_CONN_STATE_CONNECTING
stream, that data will be immediately sent when the connection
succeeds. If the connection fails, the data will be correctly
ignored and freed. The problem with the current server code is
that the server currently drops DATA cells on streams in the
EXIT_CONN_STATE_CONNECTING state. Also, if you try to queue data
in the EXIT_CONN_STATE_RESOLVING state, bad things happen because
streams in that state don't yet have conn->write_event set, and so
some existing sanity checks (any stream with queued data is at
least potentially writable) are no longer sound.
The solution is to simply not drop received DATA cells while in
the EXIT_CONN_STATE_CONNECTING state. Also do not send SENDME
cells in this state, so that the OP cannot send more than one
window's worth of data to be queued at the Exit. Finally, patch
the sanity checks so that streams in the EXIT_CONN_STATE_RESOLVING
state that have buffered data can pass.
[...] Here is a simple patch. It seems to work with both regular
streams and hidden services, but there may be other corner cases
I'm not aware of. (Do streams used for directory fetches, hidden
services, etc. take a different code path?)
2011-03-14 23:05:33 +01:00
|
|
|
/* If we receive optimistic data in the EXIT_CONN_STATE_RESOLVING
|
|
|
|
* state, we don't want to try to write it right away, since
|
|
|
|
* conn->write_event won't be set yet. Otherwise, write data from
|
|
|
|
* this conn as the socket is available. */
|
|
|
|
if (conn->write_event) {
|
2011-03-15 21:59:58 +01:00
|
|
|
connection_start_writing(conn);
|
Implement server side of Proposal 174 (optimistic data)
Ian's original message:
The current code actually correctly handles queued data at the
Exit; if there is queued data in a EXIT_CONN_STATE_CONNECTING
stream, that data will be immediately sent when the connection
succeeds. If the connection fails, the data will be correctly
ignored and freed. The problem with the current server code is
that the server currently drops DATA cells on streams in the
EXIT_CONN_STATE_CONNECTING state. Also, if you try to queue data
in the EXIT_CONN_STATE_RESOLVING state, bad things happen because
streams in that state don't yet have conn->write_event set, and so
some existing sanity checks (any stream with queued data is at
least potentially writable) are no longer sound.
The solution is to simply not drop received DATA cells while in
the EXIT_CONN_STATE_CONNECTING state. Also do not send SENDME
cells in this state, so that the OP cannot send more than one
window's worth of data to be queued at the Exit. Finally, patch
the sanity checks so that streams in the EXIT_CONN_STATE_RESOLVING
state that have buffered data can pass.
[...] Here is a simple patch. It seems to work with both regular
streams and hidden services, but there may be other corner cases
I'm not aware of. (Do streams used for directory fetches, hidden
services, etc. take a different code path?)
2011-03-14 23:05:33 +01:00
|
|
|
}
|
2007-01-22 07:07:51 +01:00
|
|
|
if (zlib) {
|
2006-12-29 06:07:04 +01:00
|
|
|
conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen;
|
2007-01-22 07:07:51 +01:00
|
|
|
} else {
|
2006-12-29 06:07:04 +01:00
|
|
|
conn->outbuf_flushlen += len;
|
2007-01-22 07:07:51 +01:00
|
|
|
|
2007-10-11 22:45:26 +02:00
|
|
|
/* Should we try flushing the outbuf now? */
|
|
|
|
if (conn->in_flushed_some) {
|
|
|
|
/* Don't flush the outbuf when the reason we're writing more stuff is
|
|
|
|
* _because_ we flushed the outbuf. That's unfair. */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-07-26 00:34:14 +02:00
|
|
|
if (conn->type == CONN_TYPE_CONTROL &&
|
2007-01-26 09:13:53 +01:00
|
|
|
!connection_is_rate_limited(conn) &&
|
2007-01-22 07:07:51 +01:00
|
|
|
conn->outbuf_flushlen-len < 1<<16 &&
|
|
|
|
conn->outbuf_flushlen >= 1<<16) {
|
|
|
|
/* just try to flush all of it */
|
|
|
|
} else
|
|
|
|
return; /* no need to try flushing */
|
|
|
|
|
|
|
|
if (connection_handle_write(conn, 0) < 0) {
|
|
|
|
if (!conn->marked_for_close) {
|
|
|
|
/* this connection is broken. remove it. */
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG, "unhandled error on write for "
|
2007-01-22 07:07:51 +01:00
|
|
|
"conn (type %d, fd %d); removing",
|
2011-05-23 06:17:48 +02:00
|
|
|
conn->type, (int)conn->s);
|
2007-01-22 07:07:51 +01:00
|
|
|
tor_fragile_assert();
|
|
|
|
/* do a close-immediate here, so we don't try to flush */
|
|
|
|
connection_close_immediate(conn);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2006-06-18 10:46:55 +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,
|
2008-08-05 22:08:19 +02:00
|
|
|
const tor_addr_t *addr, uint16_t port,
|
2005-09-12 08:56:42 +02:00
|
|
|
int purpose)
|
|
|
|
{
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
{
|
2005-09-12 08:56:42 +02:00
|
|
|
if (conn->type == type &&
|
2008-08-05 22:08:19 +02:00
|
|
|
tor_addr_eq(&conn->addr, addr) &&
|
2005-09-12 08:56:42 +02:00
|
|
|
conn->port == port &&
|
|
|
|
conn->purpose == purpose &&
|
|
|
|
!conn->marked_for_close)
|
|
|
|
return conn;
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2005-09-12 08:56:42 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-01-22 07:07:51 +01:00
|
|
|
/** Return the stream with id <b>id</b> if it is not already marked for
|
2005-12-14 21:40:40 +01:00
|
|
|
* close.
|
2005-03-12 05:22:01 +01:00
|
|
|
*/
|
2008-08-15 15:55:01 +02:00
|
|
|
connection_t *
|
|
|
|
connection_get_by_global_id(uint64_t id)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
{
|
2008-08-15 15:55:01 +02:00
|
|
|
if (conn->global_identifier == id)
|
|
|
|
return conn;
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2005-03-12 05:22:01 +01:00
|
|
|
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)
|
|
|
|
{
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
{
|
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;
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2003-09-30 21:06:22 +02:00
|
|
|
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)
|
|
|
|
{
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
{
|
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;
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2003-09-30 21:06:22 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
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
|
2009-05-03 01:04:25 +02:00
|
|
|
* 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,
|
2009-05-03 01:04:25 +02:00
|
|
|
const char *rendquery)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
2004-04-05 02:47:48 +02:00
|
|
|
|
2006-07-26 21:07:26 +02:00
|
|
|
tor_assert(type == CONN_TYPE_DIR ||
|
|
|
|
type == CONN_TYPE_AP || type == CONN_TYPE_EXIT);
|
2008-09-24 16:44:29 +02:00
|
|
|
tor_assert(rendquery);
|
2006-07-26 21:07:26 +02:00
|
|
|
|
2011-07-20 18:55:42 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) {
|
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 &&
|
2008-09-24 16:44:29 +02:00
|
|
|
TO_DIR_CONN(conn)->rend_data &&
|
|
|
|
!rend_cmp_service_ids(rendquery,
|
|
|
|
TO_DIR_CONN(conn)->rend_data->onion_address))
|
2006-07-26 21:07:26 +02:00
|
|
|
return conn;
|
|
|
|
else if (CONN_IS_EDGE(conn) &&
|
2008-09-24 16:44:29 +02:00
|
|
|
TO_EDGE_CONN(conn)->rend_data &&
|
|
|
|
!rend_cmp_service_ids(rendquery,
|
|
|
|
TO_EDGE_CONN(conn)->rend_data->onion_address))
|
2006-07-26 21:07:26 +02:00
|
|
|
return conn;
|
|
|
|
}
|
2011-07-20 18:55:42 +02:00
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
2004-04-05 02:47:48 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2010-09-20 17:24:01 +02:00
|
|
|
/** Return a directory connection (if any one exists) that is fetching
|
|
|
|
* the item described by <b>state</b>/<b>resource</b> */
|
|
|
|
dir_connection_t *
|
|
|
|
connection_dir_get_by_purpose_and_resource(int purpose,
|
|
|
|
const char *resource)
|
|
|
|
{
|
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) {
|
|
|
|
dir_connection_t *dirconn;
|
|
|
|
if (conn->type != CONN_TYPE_DIR || conn->marked_for_close ||
|
|
|
|
conn->purpose != purpose)
|
|
|
|
continue;
|
|
|
|
dirconn = TO_DIR_CONN(conn);
|
|
|
|
if (dirconn->requested_resource == NULL) {
|
|
|
|
if (resource == NULL)
|
|
|
|
return dirconn;
|
|
|
|
} else if (resource) {
|
|
|
|
if (0 == strcmp(resource, dirconn->requested_resource))
|
|
|
|
return dirconn;
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(conn);
|
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
{
|
2005-09-12 08:56:42 +02:00
|
|
|
if (conn->type == type &&
|
|
|
|
!conn->marked_for_close &&
|
|
|
|
(purpose == conn->purpose))
|
|
|
|
return conn;
|
2007-05-22 17:49:14 +02:00
|
|
|
});
|
2005-09-12 08:56:42 +02:00
|
|
|
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 ||
|
2007-07-26 00:57:07 +02:00
|
|
|
conn->type == CONN_TYPE_AP_DNS_LISTENER ||
|
2006-11-14 01:06:31 +01:00
|
|
|
conn->type == CONN_TYPE_AP_NATD_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 &&
|
2007-03-04 22:08:28 +01:00
|
|
|
conn->state == CONTROL_CONN_STATE_OPEN))
|
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;
|
|
|
|
}
|
|
|
|
|
2006-12-12 21:19:54 +01:00
|
|
|
/** Allocates a base64'ed authenticator for use in http or https
|
2005-05-20 10:51:45 +02:00
|
|
|
* 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" */
|
2008-02-22 20:09:45 +01:00
|
|
|
const size_t authenticator_length = strlen(authenticator);
|
2005-05-20 10:51:45 +02:00
|
|
|
/* The base64_encode function needs a minimum buffer length
|
|
|
|
* of 66 bytes. */
|
2008-02-22 20:09:45 +01:00
|
|
|
const size_t base64_authenticator_length = (authenticator_length/48+1)*66;
|
2005-05-20 10:51:45 +02:00
|
|
|
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 {
|
2011-05-16 22:09:35 +02:00
|
|
|
int i = 0, j = 0;
|
2011-05-20 05:52:36 +02:00
|
|
|
ssize_t len = strlen(base64_authenticator);
|
2011-05-16 22:09:35 +02:00
|
|
|
|
|
|
|
/* remove all newline occurrences within the string */
|
|
|
|
for (i=0; i < len; ++i) {
|
|
|
|
if ('\n' != base64_authenticator[i]) {
|
|
|
|
base64_authenticator[j] = base64_authenticator[i];
|
|
|
|
++j;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
base64_authenticator[j]='\0';
|
2005-05-20 10:51:45 +02:00
|
|
|
}
|
|
|
|
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
|
|
|
*/
|
|
|
|
static void
|
2011-05-23 06:17:48 +02:00
|
|
|
client_check_address_changed(tor_socket_t sock)
|
2005-08-03 22:42:17 +02:00
|
|
|
{
|
2012-03-30 22:43:52 +02:00
|
|
|
struct sockaddr_storage out_sockaddr;
|
|
|
|
socklen_t out_addr_len = (socklen_t) sizeof(out_sockaddr);
|
|
|
|
tor_addr_t out_addr, iface_addr;
|
|
|
|
tor_addr_t **last_interface_ip_ptr;
|
|
|
|
sa_family_t family;
|
2005-08-03 22:42:17 +02:00
|
|
|
|
|
|
|
if (!outgoing_addrs)
|
2012-01-18 21:53:30 +01:00
|
|
|
outgoing_addrs = smartlist_new();
|
2005-08-03 22:42:17 +02:00
|
|
|
|
2012-03-30 22:43:52 +02:00
|
|
|
if (getsockname(sock, (struct sockaddr*)&out_sockaddr, &out_addr_len)<0) {
|
2005-08-03 22:42:17 +02:00
|
|
|
int e = tor_socket_errno(sock);
|
2006-09-30 00:33:40 +02:00
|
|
|
log_warn(LD_NET, "getsockname() to check for address change failed: %s",
|
|
|
|
tor_socket_strerror(e));
|
2005-08-03 22:42:17 +02:00
|
|
|
return;
|
|
|
|
}
|
2012-03-30 22:43:52 +02:00
|
|
|
tor_addr_from_sockaddr(&out_addr, (struct sockaddr*)&out_sockaddr, NULL);
|
|
|
|
family = tor_addr_family(&out_addr);
|
|
|
|
|
|
|
|
if (family == AF_INET)
|
|
|
|
last_interface_ip_ptr = &last_interface_ipv4;
|
|
|
|
else if (family == AF_INET6)
|
|
|
|
last_interface_ip_ptr = &last_interface_ipv6;
|
|
|
|
else
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (! *last_interface_ip_ptr) {
|
|
|
|
tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t));
|
|
|
|
if (get_interface_address6(LOG_INFO, family, a)==0) {
|
|
|
|
*last_interface_ip_ptr = a;
|
|
|
|
} else {
|
|
|
|
tor_free(a);
|
|
|
|
}
|
|
|
|
}
|
2005-08-03 22:42:17 +02:00
|
|
|
|
2009-09-07 02:09:08 +02:00
|
|
|
/* If we've used this address previously, we're okay. */
|
2012-03-30 22:43:52 +02:00
|
|
|
SMARTLIST_FOREACH(outgoing_addrs, const tor_addr_t *, a_ptr,
|
|
|
|
if (tor_addr_eq(a_ptr, &out_addr))
|
|
|
|
return;
|
2005-08-03 22:42:17 +02:00
|
|
|
);
|
|
|
|
|
|
|
|
/* Uh-oh. We haven't connected from this address before. Has the interface
|
|
|
|
* address changed? */
|
2012-03-30 22:43:52 +02:00
|
|
|
if (get_interface_address6(LOG_INFO, family, &iface_addr)<0)
|
2005-08-03 22:42:17 +02:00
|
|
|
return;
|
|
|
|
|
2012-03-30 22:43:52 +02:00
|
|
|
if (tor_addr_eq(&iface_addr, *last_interface_ip_ptr)) {
|
2005-08-03 22:42:17 +02:00
|
|
|
/* Nope, it hasn't changed. Add this address to the list. */
|
2012-03-30 22:43:52 +02:00
|
|
|
smartlist_add(outgoing_addrs, tor_memdup(&out_addr, sizeof(tor_addr_t)));
|
2005-08-03 22:42:17 +02:00
|
|
|
} else {
|
|
|
|
/* The interface changed. We're a client, so we need to regenerate our
|
|
|
|
* keys. First, reset the state. */
|
2008-04-23 20:37:24 +02:00
|
|
|
log(LOG_NOTICE, LD_NET, "Our IP address has changed. Rotating keys...");
|
2012-03-30 22:43:52 +02:00
|
|
|
tor_addr_copy(*last_interface_ip_ptr, &iface_addr);
|
|
|
|
SMARTLIST_FOREACH(outgoing_addrs, tor_addr_t*, a_ptr, tor_free(a_ptr));
|
2005-08-03 22:42:17 +02:00
|
|
|
smartlist_clear(outgoing_addrs);
|
2012-03-30 22:43:52 +02:00
|
|
|
smartlist_add(outgoing_addrs, tor_memdup(&out_addr, sizeof(tor_addr_t)));
|
2005-08-03 22:42:17 +02:00
|
|
|
/* Okay, now change our keys. */
|
2006-12-28 22:29:20 +01:00
|
|
|
ip_address_changed(1);
|
2005-08-03 22:42:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-16 18:23:34 +02:00
|
|
|
/** Some systems have limited system buffers for recv and xmit on
|
|
|
|
* sockets allocated in a virtual server or similar environment. For a Tor
|
|
|
|
* server this can produce the "Error creating network socket: No buffer
|
|
|
|
* space available" error once all available TCP buffer space is consumed.
|
|
|
|
* This method will attempt to constrain the buffers allocated for the socket
|
|
|
|
* to the desired size to stay below system TCP buffer limits.
|
|
|
|
*/
|
|
|
|
static void
|
2011-05-23 06:17:48 +02:00
|
|
|
set_constrained_socket_buffers(tor_socket_t sock, int size)
|
2007-07-16 18:23:34 +02:00
|
|
|
{
|
2007-07-16 18:23:36 +02:00
|
|
|
void *sz = (void*)&size;
|
2008-02-24 23:11:18 +01:00
|
|
|
socklen_t sz_sz = (socklen_t) sizeof(size);
|
|
|
|
if (setsockopt(sock, SOL_SOCKET, SO_SNDBUF, sz, sz_sz) < 0) {
|
2007-07-16 18:23:34 +02:00
|
|
|
int e = tor_socket_errno(sock);
|
2007-07-16 18:23:36 +02:00
|
|
|
log_warn(LD_NET, "setsockopt() to constrain send "
|
|
|
|
"buffer to %d bytes failed: %s", size, tor_socket_strerror(e));
|
2007-07-16 18:23:34 +02:00
|
|
|
}
|
2008-02-24 23:11:18 +01:00
|
|
|
if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, sz, sz_sz) < 0) {
|
2007-07-16 18:23:34 +02:00
|
|
|
int e = tor_socket_errno(sock);
|
2007-07-16 18:23:36 +02:00
|
|
|
log_warn(LD_NET, "setsockopt() to constrain recv "
|
|
|
|
"buffer to %d bytes failed: %s", size, tor_socket_strerror(e));
|
2007-07-16 18:23:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-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:
|
2007-03-04 21:11:46 +01:00
|
|
|
log_err(LD_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)
|
|
|
|
{
|
2007-10-11 22:45:26 +02:00
|
|
|
int r = 0;
|
|
|
|
tor_assert(!conn->in_flushed_some);
|
|
|
|
conn->in_flushed_some = 1;
|
2006-06-18 09:38:55 +02:00
|
|
|
if (conn->type == CONN_TYPE_DIR &&
|
2007-10-11 22:45:26 +02:00
|
|
|
conn->state == DIR_CONN_STATE_SERVER_WRITING) {
|
|
|
|
r = connection_dirserv_flushed_some(TO_DIR_CONN(conn));
|
|
|
|
} else if (conn->type == CONN_TYPE_OR) {
|
|
|
|
r = connection_or_flushed_some(TO_OR_CONN(conn));
|
2011-03-14 22:48:45 +01:00
|
|
|
} else if (CONN_IS_EDGE(conn)) {
|
|
|
|
r = connection_edge_flushed_some(TO_EDGE_CONN(conn));
|
2007-10-11 22:45:26 +02:00
|
|
|
}
|
|
|
|
conn->in_flushed_some = 0;
|
|
|
|
return r;
|
2006-06-18 09:38:55 +02:00
|
|
|
}
|
|
|
|
|
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
|
|
|
|
2007-10-12 00:19:18 +02:00
|
|
|
/* If the connection is closed, don't try to do anything more here. */
|
2007-10-11 22:45:26 +02:00
|
|
|
if (CONN_IS_CLOSED(conn))
|
|
|
|
return 0;
|
|
|
|
|
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
|
|
|
|
2009-08-05 18:59:11 +02:00
|
|
|
IF_HAS_NO_BUFFEREVENT(conn)
|
|
|
|
connection_stop_writing(conn);
|
|
|
|
|
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-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:
|
2007-03-04 21:11:46 +01:00
|
|
|
log_err(LD_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);
|
2012-05-24 22:57:36 +02:00
|
|
|
|
|
|
|
if (!server_mode(get_options())) {
|
|
|
|
/* See whether getsockname() says our address changed. We need to do this
|
|
|
|
* now that the connection has finished, because getsockname() on Windows
|
|
|
|
* won't work until then. */
|
|
|
|
client_check_address_changed(conn->s);
|
|
|
|
}
|
|
|
|
|
2004-05-12 21:17:09 +02:00
|
|
|
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:
|
2007-03-04 21:11:46 +01:00
|
|
|
log_err(LD_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_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:
|
2007-03-04 21:11:46 +01:00
|
|
|
log_err(LD_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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-04-23 05:04:46 +02:00
|
|
|
/** Log how many bytes are used by buffers of different kinds and sizes. */
|
|
|
|
void
|
|
|
|
connection_dump_buffer_mem_stats(int severity)
|
|
|
|
{
|
2012-10-12 18:22:13 +02:00
|
|
|
uint64_t used_by_type[CONN_TYPE_MAX_+1];
|
|
|
|
uint64_t alloc_by_type[CONN_TYPE_MAX_+1];
|
|
|
|
int n_conns_by_type[CONN_TYPE_MAX_+1];
|
2007-04-23 05:04:46 +02:00
|
|
|
uint64_t total_alloc = 0;
|
|
|
|
uint64_t total_used = 0;
|
2007-05-22 17:49:14 +02:00
|
|
|
int i;
|
|
|
|
smartlist_t *conns = get_connection_array();
|
2007-04-23 05:04:46 +02:00
|
|
|
|
|
|
|
memset(used_by_type, 0, sizeof(used_by_type));
|
|
|
|
memset(alloc_by_type, 0, sizeof(alloc_by_type));
|
|
|
|
memset(n_conns_by_type, 0, sizeof(n_conns_by_type));
|
|
|
|
|
2012-07-17 15:33:38 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, c) {
|
2007-04-23 05:04:46 +02:00
|
|
|
int tp = c->type;
|
|
|
|
++n_conns_by_type[tp];
|
|
|
|
if (c->inbuf) {
|
|
|
|
used_by_type[tp] += buf_datalen(c->inbuf);
|
2007-12-26 01:12:08 +01:00
|
|
|
alloc_by_type[tp] += buf_allocation(c->inbuf);
|
2007-04-23 05:04:46 +02:00
|
|
|
}
|
|
|
|
if (c->outbuf) {
|
|
|
|
used_by_type[tp] += buf_datalen(c->outbuf);
|
2007-12-26 01:12:08 +01:00
|
|
|
alloc_by_type[tp] += buf_allocation(c->outbuf);
|
2007-04-23 05:04:46 +02:00
|
|
|
}
|
2012-07-17 15:33:38 +02:00
|
|
|
} SMARTLIST_FOREACH_END(c);
|
2012-10-12 18:22:13 +02:00
|
|
|
for (i=0; i <= CONN_TYPE_MAX_; ++i) {
|
2007-04-23 05:04:46 +02:00
|
|
|
total_used += used_by_type[i];
|
|
|
|
total_alloc += alloc_by_type[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
log(severity, LD_GENERAL,
|
|
|
|
"In buffers for %d connections: "U64_FORMAT" used/"U64_FORMAT" allocated",
|
2007-05-22 17:49:14 +02:00
|
|
|
smartlist_len(conns),
|
|
|
|
U64_PRINTF_ARG(total_used), U64_PRINTF_ARG(total_alloc));
|
2012-10-12 18:22:13 +02:00
|
|
|
for (i=CONN_TYPE_MIN_; i <= CONN_TYPE_MAX_; ++i) {
|
2007-04-23 05:04:46 +02:00
|
|
|
if (!n_conns_by_type[i])
|
|
|
|
continue;
|
|
|
|
log(severity, LD_GENERAL,
|
|
|
|
" For %d %s connections: "U64_FORMAT" used/"U64_FORMAT" allocated",
|
|
|
|
n_conns_by_type[i], conn_type_to_string(i),
|
|
|
|
U64_PRINTF_ARG(used_by_type[i]), U64_PRINTF_ARG(alloc_by_type[i]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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);
|
2012-10-12 18:22:13 +02:00
|
|
|
tor_assert(conn->type >= CONN_TYPE_MIN_);
|
|
|
|
tor_assert(conn->type <= CONN_TYPE_MAX_);
|
2009-07-31 18:01:57 +02:00
|
|
|
|
2009-08-04 18:29:30 +02:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
2009-07-31 18:01:57 +02:00
|
|
|
if (conn->bufev) {
|
|
|
|
tor_assert(conn->read_event == NULL);
|
|
|
|
tor_assert(conn->write_event == NULL);
|
2009-08-09 19:53:06 +02:00
|
|
|
tor_assert(conn->inbuf == NULL);
|
|
|
|
tor_assert(conn->outbuf == NULL);
|
2009-07-31 18:01:57 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
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:
|
2011-07-20 18:38:13 +02:00
|
|
|
tor_assert(conn->magic == ENTRY_CONNECTION_MAGIC);
|
|
|
|
break;
|
2006-07-26 21:07:26 +02:00
|
|
|
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;
|
2011-07-20 19:42:11 +02:00
|
|
|
CASE_ANY_LISTENER_TYPE:
|
|
|
|
tor_assert(conn->magic == LISTENER_CONNECTION_MAGIC);
|
|
|
|
break;
|
2006-07-26 21:07:26 +02:00
|
|
|
default:
|
|
|
|
tor_assert(conn->magic == BASE_CONNECTION_MAGIC);
|
|
|
|
break;
|
|
|
|
}
|
2003-09-16 21:36:19 +02:00
|
|
|
|
2007-04-21 19:26:12 +02:00
|
|
|
if (conn->linked_conn) {
|
|
|
|
tor_assert(conn->linked_conn->linked_conn == conn);
|
2008-12-11 21:28:50 +01:00
|
|
|
tor_assert(conn->linked);
|
2007-04-21 19:26:12 +02:00
|
|
|
}
|
|
|
|
if (conn->linked)
|
2011-05-23 06:17:48 +02:00
|
|
|
tor_assert(!SOCKET_OK(conn->s));
|
2007-04-21 19:26:12 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (conn->outbuf_flushlen > 0) {
|
Implement server side of Proposal 174 (optimistic data)
Ian's original message:
The current code actually correctly handles queued data at the
Exit; if there is queued data in a EXIT_CONN_STATE_CONNECTING
stream, that data will be immediately sent when the connection
succeeds. If the connection fails, the data will be correctly
ignored and freed. The problem with the current server code is
that the server currently drops DATA cells on streams in the
EXIT_CONN_STATE_CONNECTING state. Also, if you try to queue data
in the EXIT_CONN_STATE_RESOLVING state, bad things happen because
streams in that state don't yet have conn->write_event set, and so
some existing sanity checks (any stream with queued data is at
least potentially writable) are no longer sound.
The solution is to simply not drop received DATA cells while in
the EXIT_CONN_STATE_CONNECTING state. Also do not send SENDME
cells in this state, so that the OP cannot send more than one
window's worth of data to be queued at the Exit. Finally, patch
the sanity checks so that streams in the EXIT_CONN_STATE_RESOLVING
state that have buffered data can pass.
[...] Here is a simple patch. It seems to work with both regular
streams and hidden services, but there may be other corner cases
I'm not aware of. (Do streams used for directory fetches, hidden
services, etc. take a different code path?)
2011-03-14 23:05:33 +01:00
|
|
|
/* With optimistic data, we may have queued data in
|
|
|
|
* EXIT_CONN_STATE_RESOLVING while the conn is not yet marked to writing.
|
|
|
|
* */
|
|
|
|
tor_assert((conn->type == CONN_TYPE_EXIT &&
|
2011-03-15 21:59:58 +01:00
|
|
|
conn->state == EXIT_CONN_STATE_RESOLVING) ||
|
|
|
|
connection_is_writing(conn) ||
|
|
|
|
conn->write_blocked_on_bw ||
|
|
|
|
(CONN_IS_EDGE(conn) &&
|
|
|
|
TO_EDGE_CONN(conn)->edge_blocked_on_circ));
|
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
|
|
|
|
2007-04-21 19:30:42 +02:00
|
|
|
/* XXXX check: read_blocked_on_bw, write_blocked_on_bw, 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 */
|
2009-08-09 19:53:06 +02:00
|
|
|
if (conn->inbuf)
|
2004-03-03 23:49:15 +01:00
|
|
|
assert_buf_ok(conn->inbuf);
|
2009-08-09 19:53:06 +02:00
|
|
|
if (conn->outbuf)
|
2004-03-03 23:49:15 +01:00
|
|
|
assert_buf_ok(conn->outbuf);
|
2003-09-16 21:36:19 +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
|
|
|
|
*/
|
2006-12-13 08:08:36 +01:00
|
|
|
// tor_assert(conn->read_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);
|
2009-06-19 01:59:18 +02:00
|
|
|
if (conn->state > OR_CONN_STATE_PROXY_HANDSHAKING)
|
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)) {
|
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) {
|
2011-07-20 18:55:42 +02:00
|
|
|
entry_connection_t *entry_conn = TO_ENTRY_CONN(conn);
|
|
|
|
if (entry_conn->chosen_exit_optional || entry_conn->chosen_exit_retries)
|
|
|
|
tor_assert(entry_conn->chosen_exit_name);
|
2006-07-26 21:07:26 +02:00
|
|
|
|
2011-07-20 18:55:42 +02:00
|
|
|
tor_assert(entry_conn->socks_request);
|
2006-07-26 21:07:26 +02:00
|
|
|
if (conn->state == AP_CONN_STATE_OPEN) {
|
2011-07-20 18:55:42 +02:00
|
|
|
tor_assert(entry_conn->socks_request->has_finished);
|
2006-07-26 21:07:26 +02:00
|
|
|
if (!conn->marked_for_close) {
|
2011-07-20 18:55:42 +02:00
|
|
|
tor_assert(ENTRY_TO_EDGE_CONN(entry_conn)->cpath_layer);
|
|
|
|
assert_cpath_layer_ok(ENTRY_TO_EDGE_CONN(entry_conn)->cpath_layer);
|
2006-07-26 21:07:26 +02:00
|
|
|
}
|
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);
|
|
|
|
}
|
2007-01-27 09:55:06 +01:00
|
|
|
} else if (conn->type == CONN_TYPE_DIR) {
|
|
|
|
} else {
|
2006-07-27 06:10:51 +02:00
|
|
|
/* 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
|
|
|
{
|
2011-07-05 23:11:22 +02:00
|
|
|
CASE_ANY_LISTENER_TYPE:
|
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:
|
2012-10-12 18:22:13 +02:00
|
|
|
tor_assert(conn->state >= OR_CONN_STATE_MIN_);
|
|
|
|
tor_assert(conn->state <= OR_CONN_STATE_MAX_);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_EXIT:
|
2012-10-12 18:22:13 +02:00
|
|
|
tor_assert(conn->state >= EXIT_CONN_STATE_MIN_);
|
|
|
|
tor_assert(conn->state <= EXIT_CONN_STATE_MAX_);
|
|
|
|
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:
|
2012-10-12 18:22:13 +02:00
|
|
|
tor_assert(conn->state >= AP_CONN_STATE_MIN_);
|
|
|
|
tor_assert(conn->state <= AP_CONN_STATE_MAX_);
|
2011-07-20 18:55:42 +02:00
|
|
|
tor_assert(TO_ENTRY_CONN(conn)->socks_request);
|
2003-09-16 21:36:19 +02:00
|
|
|
break;
|
|
|
|
case CONN_TYPE_DIR:
|
2012-10-12 18:22:13 +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_CPUWORKER:
|
2012-10-12 18:22:13 +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:
|
2012-10-12 18:22:13 +02:00
|
|
|
tor_assert(conn->state >= CONTROL_CONN_STATE_MIN_);
|
|
|
|
tor_assert(conn->state <= CONTROL_CONN_STATE_MAX_);
|
2004-11-03 02:32:26 +01:00
|
|
|
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
|
|
|
|
2011-06-28 05:43:40 +02:00
|
|
|
/** Fills <b>addr</b> and <b>port</b> with the details of the global
|
|
|
|
* proxy server we are using.
|
|
|
|
* <b>conn</b> contains the connection we are using the proxy for.
|
|
|
|
*
|
2011-07-03 06:13:41 +02:00
|
|
|
* Return 0 on success, -1 on failure.
|
|
|
|
*/
|
2011-06-14 04:28:36 +02:00
|
|
|
int
|
2011-07-03 06:13:41 +02:00
|
|
|
get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type,
|
|
|
|
const connection_t *conn)
|
2011-06-14 03:27:07 +02:00
|
|
|
{
|
2011-07-11 21:59:03 +02:00
|
|
|
const or_options_t *options = get_options();
|
2011-06-14 04:28:36 +02:00
|
|
|
|
2011-06-22 23:28:11 +02:00
|
|
|
if (options->HTTPSProxy) {
|
2011-06-14 04:28:36 +02:00
|
|
|
tor_addr_copy(addr, &options->HTTPSProxyAddr);
|
|
|
|
*port = options->HTTPSProxyPort;
|
2011-07-03 06:13:41 +02:00
|
|
|
*proxy_type = PROXY_CONNECT;
|
|
|
|
return 0;
|
2011-06-22 23:28:11 +02:00
|
|
|
} else if (options->Socks4Proxy) {
|
2011-06-14 04:28:36 +02:00
|
|
|
tor_addr_copy(addr, &options->Socks4ProxyAddr);
|
|
|
|
*port = options->Socks4ProxyPort;
|
2011-07-03 06:13:41 +02:00
|
|
|
*proxy_type = PROXY_SOCKS4;
|
|
|
|
return 0;
|
2011-06-22 23:28:11 +02:00
|
|
|
} else if (options->Socks5Proxy) {
|
2011-06-14 04:28:36 +02:00
|
|
|
tor_addr_copy(addr, &options->Socks5ProxyAddr);
|
|
|
|
*port = options->Socks5ProxyPort;
|
2011-07-03 06:13:41 +02:00
|
|
|
*proxy_type = PROXY_SOCKS5;
|
|
|
|
return 0;
|
2011-06-22 23:28:11 +02:00
|
|
|
} else if (options->ClientTransportPlugin ||
|
|
|
|
options->Bridges) {
|
2011-07-03 06:13:41 +02:00
|
|
|
const transport_t *transport = NULL;
|
2011-06-22 23:28:11 +02:00
|
|
|
int r;
|
|
|
|
r = find_transport_by_bridge_addrport(&conn->addr, conn->port, &transport);
|
2011-07-03 06:13:41 +02:00
|
|
|
if (r<0)
|
|
|
|
return -1;
|
|
|
|
if (transport) { /* transport found */
|
2011-06-14 04:28:36 +02:00
|
|
|
tor_addr_copy(addr, &transport->addr);
|
|
|
|
*port = transport->port;
|
2011-07-03 06:13:41 +02:00
|
|
|
*proxy_type = transport->socks_version;
|
|
|
|
return 0;
|
2011-06-21 18:48:43 +02:00
|
|
|
}
|
|
|
|
}
|
2011-06-14 04:28:36 +02:00
|
|
|
|
2011-07-03 06:13:41 +02:00
|
|
|
*proxy_type = PROXY_NONE;
|
2011-06-21 18:48:43 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2011-06-14 04:28:36 +02:00
|
|
|
|
2011-06-28 05:43:40 +02:00
|
|
|
/** Returns the global proxy type used by tor. */
|
2011-06-22 23:28:11 +02:00
|
|
|
static int
|
2011-06-14 04:28:36 +02:00
|
|
|
get_proxy_type(void)
|
|
|
|
{
|
2011-07-11 21:59:03 +02:00
|
|
|
const or_options_t *options = get_options();
|
2011-06-14 04:28:36 +02:00
|
|
|
|
|
|
|
if (options->HTTPSProxy)
|
|
|
|
return PROXY_CONNECT;
|
|
|
|
else if (options->Socks4Proxy)
|
|
|
|
return PROXY_SOCKS4;
|
|
|
|
else if (options->Socks5Proxy)
|
|
|
|
return PROXY_SOCKS5;
|
|
|
|
else if (options->ClientTransportPlugin)
|
|
|
|
return PROXY_PLUGGABLE;
|
|
|
|
else
|
|
|
|
return PROXY_NONE;
|
|
|
|
}
|
2011-06-21 18:48:43 +02:00
|
|
|
|
|
|
|
/** Log a failed connection to a proxy server.
|
|
|
|
* <b>conn</b> is the connection we use the proxy server for. */
|
2011-06-14 04:28:36 +02:00
|
|
|
void
|
|
|
|
log_failed_proxy_connection(connection_t *conn)
|
|
|
|
{
|
|
|
|
tor_addr_t proxy_addr;
|
|
|
|
uint16_t proxy_port;
|
2011-07-03 06:13:41 +02:00
|
|
|
int proxy_type;
|
2011-06-14 04:28:36 +02:00
|
|
|
|
2011-07-03 06:13:41 +02:00
|
|
|
if (get_proxy_addrport(&proxy_addr, &proxy_port, &proxy_type, conn) != 0)
|
2011-06-28 05:43:40 +02:00
|
|
|
return; /* if we have no proxy set up, leave this function. */
|
2011-06-21 18:48:43 +02:00
|
|
|
|
2011-06-14 03:27:07 +02:00
|
|
|
log_warn(LD_NET,
|
2012-10-07 06:25:25 +02:00
|
|
|
"The connection to the %s proxy server at %s just failed. "
|
2011-06-14 03:27:07 +02:00
|
|
|
"Make sure that the proxy server is up and running.",
|
2012-10-07 05:30:58 +02:00
|
|
|
proxy_type_to_string(get_proxy_type()),
|
2012-10-07 06:25:25 +02:00
|
|
|
fmt_addrport(&proxy_addr, proxy_port));
|
2011-06-14 03:27:07 +02:00
|
|
|
}
|
|
|
|
|
2011-06-21 18:48:43 +02:00
|
|
|
/** Return string representation of <b>proxy_type</b>. */
|
2011-06-14 03:27:07 +02:00
|
|
|
static const char *
|
|
|
|
proxy_type_to_string(int proxy_type)
|
|
|
|
{
|
|
|
|
switch (proxy_type) {
|
|
|
|
case PROXY_CONNECT: return "HTTP";
|
|
|
|
case PROXY_SOCKS4: return "SOCKS4";
|
|
|
|
case PROXY_SOCKS5: return "SOCKS5";
|
|
|
|
case PROXY_PLUGGABLE: return "pluggable transports SOCKS";
|
2011-06-28 05:43:40 +02:00
|
|
|
case PROXY_NONE: return "NULL";
|
2011-06-21 18:48:43 +02:00
|
|
|
default: tor_assert(0);
|
2011-06-14 03:27:07 +02:00
|
|
|
}
|
2011-07-03 05:12:32 +02:00
|
|
|
return NULL; /*Unreached*/
|
2011-06-14 03:27:07 +02:00
|
|
|
}
|
2011-06-21 18:48:43 +02:00
|
|
|
|
2012-10-12 18:22:13 +02:00
|
|
|
/** Call connection_free_() on every connection in our array, and release all
|
2011-08-13 20:29:22 +02:00
|
|
|
* storage held by connection.c. This is used by cpuworkers and dnsworkers
|
|
|
|
* when they fork, so they don't keep resources held open (especially
|
|
|
|
* sockets).
|
|
|
|
*
|
|
|
|
* Don't do the checks in connection_free(), because they will
|
|
|
|
* fail.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
connection_free_all(void)
|
|
|
|
{
|
|
|
|
smartlist_t *conns = get_connection_array();
|
|
|
|
|
|
|
|
/* We don't want to log any messages to controllers. */
|
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn,
|
|
|
|
if (conn->type == CONN_TYPE_CONTROL)
|
|
|
|
TO_CONTROL_CONN(conn)->event_mask = 0);
|
|
|
|
|
|
|
|
control_update_global_event_mask();
|
|
|
|
|
|
|
|
/* Unlink everything from the identity map. */
|
|
|
|
connection_or_clear_identity_map();
|
|
|
|
|
|
|
|
/* Clear out our list of broken connections */
|
|
|
|
clear_broken_connection_map(0);
|
|
|
|
|
2012-10-12 18:22:13 +02:00
|
|
|
SMARTLIST_FOREACH(conns, connection_t *, conn, connection_free_(conn));
|
2011-08-13 20:29:22 +02:00
|
|
|
|
|
|
|
if (outgoing_addrs) {
|
2012-03-30 22:43:52 +02:00
|
|
|
SMARTLIST_FOREACH(outgoing_addrs, tor_addr_t *, addr, tor_free(addr));
|
2011-08-13 20:29:22 +02:00
|
|
|
smartlist_free(outgoing_addrs);
|
|
|
|
outgoing_addrs = NULL;
|
|
|
|
}
|
2011-08-13 20:37:13 +02:00
|
|
|
|
2012-10-03 18:46:09 +02:00
|
|
|
tor_free(last_interface_ipv4);
|
|
|
|
tor_free(last_interface_ipv6);
|
|
|
|
|
2011-08-13 20:37:13 +02:00
|
|
|
#ifdef USE_BUFFEREVENTS
|
|
|
|
if (global_rate_limit)
|
|
|
|
bufferevent_rate_limit_group_free(global_rate_limit);
|
|
|
|
#endif
|
2011-08-13 20:29:22 +02:00
|
|
|
}
|
2011-08-18 21:17:37 +02:00
|
|
|
|