2003-10-08 04:04:08 +02:00
|
|
|
/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
|
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
|
|
|
/* $Id$ */
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/**
|
|
|
|
* \file or.h
|
|
|
|
*
|
|
|
|
* \brief Master header file for Tor-specific functionality.
|
|
|
|
*/
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#ifndef __OR_H
|
|
|
|
#define __OR_H
|
|
|
|
|
2002-09-03 20:44:24 +02:00
|
|
|
#include "orconfig.h"
|
2004-03-11 07:19:08 +01:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
#define WIN32_WINNT 0x400
|
|
|
|
#define _WIN32_WINNT 0x400
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
#endif
|
2002-09-03 20:44:24 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2002-09-09 06:10:58 +02:00
|
|
|
#include <limits.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#ifdef HAVE_UNISTD_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <unistd.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STRING_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <string.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <signal.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_NETDB_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <netdb.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_CTYPE_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <ctype.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
2003-08-11 22:40:21 +02:00
|
|
|
#include "../common/torint.h"
|
2002-09-03 20:44:24 +02:00
|
|
|
#include "../common/fakepoll.h"
|
2004-06-16 02:49:27 +02:00
|
|
|
#ifdef HAVE_INTTYPES_H
|
|
|
|
#include <inttypes.h>
|
|
|
|
#endif
|
2004-06-01 19:03:01 +02:00
|
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
|
|
#include <sys/param.h> /* FreeBSD needs this to know what version it is */
|
|
|
|
#endif
|
2004-04-17 08:35:18 +02:00
|
|
|
#ifdef HAVE_SYS_LIMITS_H
|
|
|
|
#include <sys/limits.h>
|
|
|
|
#endif
|
2004-04-26 01:47:26 +02:00
|
|
|
#ifdef HAVE_MACHINE_LIMITS_H
|
2004-05-26 22:27:54 +02:00
|
|
|
#ifndef __FreeBSD__
|
|
|
|
/* FreeBSD has a bug where it complains that this file is obsolete,
|
2004-06-01 19:03:01 +02:00
|
|
|
and I should migrate to using sys/limits. It complains even when
|
2004-05-26 22:27:54 +02:00
|
|
|
I include both. */
|
2004-04-26 01:47:26 +02:00
|
|
|
#include <machine/limits.h>
|
|
|
|
#endif
|
2004-05-26 22:27:54 +02:00
|
|
|
#endif
|
2003-08-12 05:08:41 +02:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
2003-09-05 13:25:24 +02:00
|
|
|
#include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
2003-08-12 08:41:53 +02:00
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#endif
|
2003-08-12 05:08:41 +02:00
|
|
|
#ifdef HAVE_SYS_FCNTL_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <sys/fcntl.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_IOCTL_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <sys/ioctl.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <sys/socket.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_TIME_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <sys/time.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
2002-09-24 12:43:57 +02:00
|
|
|
#include <sys/stat.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <netinet/in.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ARPA_INET_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <arpa/inet.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ERRNO_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <errno.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ASSERT_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <assert.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_TIME_H
|
2002-08-22 09:30:03 +02:00
|
|
|
#include <time.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_WINSOCK_H
|
|
|
|
#include <winsock.h>
|
|
|
|
#endif
|
|
|
|
#if _MSC_VER > 1300
|
|
|
|
#include <winsock2.h>
|
|
|
|
#include <ws2tcpip.h>
|
|
|
|
#elif defined(_MSC_VER)
|
|
|
|
#include <winsock.h>
|
|
|
|
#endif
|
|
|
|
|
2003-08-12 17:08:51 +02:00
|
|
|
#ifdef MS_WINDOWS
|
2003-08-12 05:08:41 +02:00
|
|
|
#include <io.h>
|
2003-10-04 03:37:01 +02:00
|
|
|
#include <process.h>
|
2004-03-09 23:01:17 +01:00
|
|
|
#include <direct.h>
|
2003-08-12 05:08:41 +02:00
|
|
|
#include <windows.h>
|
2003-08-12 17:08:51 +02:00
|
|
|
#define snprintf _snprintf
|
2003-08-12 05:08:41 +02:00
|
|
|
#endif
|
|
|
|
|
2002-08-22 09:30:03 +02:00
|
|
|
#include "../common/crypto.h"
|
2003-09-04 18:05:08 +02:00
|
|
|
#include "../common/tortls.h"
|
2002-06-27 00:45:49 +02:00
|
|
|
#include "../common/log.h"
|
2003-04-16 19:04:58 +02:00
|
|
|
#include "../common/util.h"
|
2004-09-02 20:57:09 +02:00
|
|
|
#include "../common/torgzip.h"
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** Upper bound on maximum simultaneous connections; can be lowered by
|
2004-05-10 12:27:54 +02:00
|
|
|
* config file. */
|
2004-06-02 21:44:41 +02:00
|
|
|
#define MAXCONNECTIONS 10000
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-02-18 02:55:51 +01:00
|
|
|
#define DEFAULT_BANDWIDTH_OP (1024 * 1000)
|
2004-04-05 02:47:48 +02:00
|
|
|
#define MAX_NICKNAME_LEN 19
|
2004-07-22 23:31:04 +02:00
|
|
|
/* Hex digest plus dollar sign. */
|
|
|
|
#define MAX_HEX_NICKNAME_LEN HEX_DIGEST_LEN+1
|
2003-12-17 10:42:28 +01:00
|
|
|
#define MAX_DIR_SIZE 500000
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-01-20 03:14:30 +01:00
|
|
|
#ifdef TOR_PERF
|
2004-05-10 08:52:01 +02:00
|
|
|
/** How long do we keep DNS cache entries before purging them? */
|
2004-01-20 03:14:30 +01:00
|
|
|
#define MAX_DNS_ENTRY_AGE (150*60)
|
|
|
|
#else
|
2003-12-14 08:40:47 +01:00
|
|
|
#define MAX_DNS_ENTRY_AGE (15*60)
|
2004-01-20 03:14:30 +01:00
|
|
|
#endif
|
2003-12-14 08:40:47 +01:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** How often do we rotate onion keys? */
|
2004-09-29 01:27:41 +02:00
|
|
|
#define OLD_MIN_ONION_KEY_LIFETIME (12*60*60) /* twice a day */
|
|
|
|
#define MIN_ONION_KEY_LIFETIME (7*24*60*60) /* once a week */
|
2004-05-10 08:52:01 +02:00
|
|
|
/** How often do we rotate TLS contexts? */
|
2004-04-25 00:17:50 +02:00
|
|
|
#define MAX_SSL_KEY_LIFETIME (120*60)
|
|
|
|
|
2004-05-20 07:10:30 +02:00
|
|
|
/** How old do we allow a router to get before removing it, either
|
|
|
|
* from the descriptor list (for dirservers) or the router list (for others)?
|
|
|
|
* In seconds. */
|
|
|
|
#define ROUTER_MAX_AGE (60*60*24)
|
|
|
|
|
2003-11-11 04:01:48 +01:00
|
|
|
#define CIRC_ID_TYPE_LOWER 0
|
|
|
|
#define CIRC_ID_TYPE_HIGHER 1
|
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
|
|
|
|
2003-09-16 21:36:19 +02:00
|
|
|
#define _CONN_TYPE_MIN 3
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Type for sockets listening for OR connections. */
|
2002-06-27 00:45:49 +02:00
|
|
|
#define CONN_TYPE_OR_LISTENER 3
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Type for OR-to-OR or OP-to-OR connections. */
|
2002-06-27 00:45:49 +02:00
|
|
|
#define CONN_TYPE_OR 4
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Type for connections from final OR to chosen destination. */
|
2002-06-30 09:37:49 +02:00
|
|
|
#define CONN_TYPE_EXIT 5
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Type for sockets listening for SOCKS connections. */
|
2002-06-30 09:37:49 +02:00
|
|
|
#define CONN_TYPE_AP_LISTENER 6
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Type for SOCKS connections to OP. */
|
2002-06-30 09:37:49 +02:00
|
|
|
#define CONN_TYPE_AP 7
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Type for sockets listening for HTTP connections to the directory server. */
|
2002-09-26 14:09:10 +02:00
|
|
|
#define CONN_TYPE_DIR_LISTENER 8
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Type for HTTP connections to the directory server. */
|
2002-09-26 14:09:10 +02:00
|
|
|
#define CONN_TYPE_DIR 9
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Type for connections to local dnsworker processes. */
|
2003-06-17 16:31:05 +02:00
|
|
|
#define CONN_TYPE_DNSWORKER 10
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Type for connections to local cpuworker processes. */
|
2003-08-21 01:05:22 +02:00
|
|
|
#define CONN_TYPE_CPUWORKER 11
|
cleanups, bugfixes, more verbose logs
Fixed up the assert_*_ok funcs some (more work remains)
Changed config so it reads either /etc/torrc or the -f arg, never both
Finally tracked down a nasty bug with our use of tls:
It turns out that if you ask SSL_read() for no more than n bytes, it
will read the entire record from the network (and maybe part of the next
record, I'm not sure), give you n bytes of it, and keep the remaining
bytes internally. This is fine, except our poll-for-read looks at the
network, and there are no bytes pending on the network, so we never know
to ask SSL_read() for more bytes. Currently I've hacked it so if we ask
for n bytes and it returns n bytes, then it reads again right then. This
will interact poorly with our rate limiting; we need a cleaner solution.
svn:r481
2003-09-24 23:24:52 +02:00
|
|
|
#define _CONN_TYPE_MAX 11
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for any listener connection. */
|
2002-06-27 00:45:49 +02:00
|
|
|
#define LISTENER_STATE_READY 0
|
|
|
|
|
2003-09-30 10:18:10 +02:00
|
|
|
#define _DNSWORKER_STATE_MIN 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a connection to a dnsworker process that's idle. */
|
2003-09-30 10:18:10 +02:00
|
|
|
#define DNSWORKER_STATE_IDLE 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a connection to a dnsworker process that's resolving a hostname. */
|
2003-09-30 10:18:10 +02:00
|
|
|
#define DNSWORKER_STATE_BUSY 2
|
|
|
|
#define _DNSWORKER_STATE_MAX 2
|
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
|
|
|
|
2003-09-27 09:33:07 +02:00
|
|
|
#define _CPUWORKER_STATE_MIN 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a connection to a cpuworker process that's idle. */
|
2003-09-27 09:33:07 +02:00
|
|
|
#define CPUWORKER_STATE_IDLE 1
|
2004-05-10 08:52:01 +02:00
|
|
|
/** State for a connection to a cpuworker process that's processing a
|
2004-05-10 12:27:54 +02:00
|
|
|
* handshake. */
|
2003-09-27 09:33:07 +02:00
|
|
|
#define CPUWORKER_STATE_BUSY_ONION 2
|
2004-05-10 08:52:01 +02:00
|
|
|
#define _CPUWORKER_STATE_MAX 2
|
2003-08-21 01:05:22 +02:00
|
|
|
|
|
|
|
#define CPUWORKER_TASK_ONION CPUWORKER_STATE_BUSY_ONION
|
|
|
|
|
2003-09-27 09:33:07 +02:00
|
|
|
#define _OR_CONN_STATE_MIN 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a connection to an OR: waiting for connect() to finish. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define OR_CONN_STATE_CONNECTING 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a connection to an OR: SSL is handshaking, not done yet. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define OR_CONN_STATE_HANDSHAKING 2
|
|
|
|
/** State for a connection to an OR: Ready to send/receive cells. */
|
|
|
|
#define OR_CONN_STATE_OPEN 3
|
2003-09-27 09:33:07 +02:00
|
|
|
#define _OR_CONN_STATE_MAX 3
|
|
|
|
|
|
|
|
#define _EXIT_CONN_STATE_MIN 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for an exit connection: waiting for response from dns farm. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define EXIT_CONN_STATE_RESOLVING 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for an exit connection: waiting for connect() to finish. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define EXIT_CONN_STATE_CONNECTING 2
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for an exit connection: open and ready to transmit data. */
|
2003-09-27 09:33:07 +02:00
|
|
|
#define EXIT_CONN_STATE_OPEN 3
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for an exit connection: waiting to be removed. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define EXIT_CONN_STATE_RESOLVEFAILED 4
|
2004-03-02 08:24:11 +01:00
|
|
|
#define _EXIT_CONN_STATE_MAX 4
|
2002-06-27 00:45:49 +02:00
|
|
|
#if 0
|
2002-06-30 09:37:49 +02:00
|
|
|
#define EXIT_CONN_STATE_CLOSE 3 /* flushing the buffer, then will close */
|
|
|
|
#define EXIT_CONN_STATE_CLOSE_WAIT 4 /* have sent a destroy, awaiting a confirmation */
|
2002-06-27 00:45:49 +02:00
|
|
|
#endif
|
|
|
|
|
2003-09-27 09:33:07 +02:00
|
|
|
/* the AP state values must be disjoint from the EXIT state values */
|
2004-03-02 08:24:11 +01:00
|
|
|
#define _AP_CONN_STATE_MIN 5
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a SOCKS connection: waiting for SOCKS request. */
|
2004-03-02 08:24:11 +01:00
|
|
|
#define AP_CONN_STATE_SOCKS_WAIT 5
|
2004-05-10 08:52:01 +02:00
|
|
|
/** State for a SOCKS connection: got a y.onion URL; waiting to receive
|
2004-05-10 12:27:54 +02:00
|
|
|
* rendezvous rescriptor. */
|
2004-04-05 02:47:48 +02:00
|
|
|
#define AP_CONN_STATE_RENDDESC_WAIT 6
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a SOCKS connection: waiting for a completed circuit. */
|
2004-04-05 02:47:48 +02:00
|
|
|
#define AP_CONN_STATE_CIRCUIT_WAIT 7
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a SOCKS connection: sent BEGIN, waiting for CONNECTED. */
|
2004-04-05 02:47:48 +02:00
|
|
|
#define AP_CONN_STATE_CONNECT_WAIT 8
|
2004-06-17 20:13:09 +02:00
|
|
|
/** State for a SOCKS connection: send RESOLVE, waiting for RESOLVED. */
|
|
|
|
#define AP_CONN_STATE_RESOLVE_WAIT 9
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for a SOCKS connection: ready to send and receive. */
|
2004-06-17 20:13:09 +02:00
|
|
|
#define AP_CONN_STATE_OPEN 10
|
|
|
|
#define _AP_CONN_STATE_MAX 10
|
2004-04-01 23:32:01 +02:00
|
|
|
|
2003-09-27 09:33:07 +02:00
|
|
|
#define _DIR_CONN_STATE_MIN 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for connection to directory server: waiting for connect(). */
|
2004-03-31 00:57:49 +02:00
|
|
|
#define DIR_CONN_STATE_CONNECTING 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for connection to directory server: sending HTTP request. */
|
2004-03-31 00:57:49 +02:00
|
|
|
#define DIR_CONN_STATE_CLIENT_SENDING 2
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for connection to directory server: reading HTTP response. */
|
2004-03-31 00:57:49 +02:00
|
|
|
#define DIR_CONN_STATE_CLIENT_READING 3
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for connection at directory server: waiting for HTTP request. */
|
2004-03-31 00:57:49 +02:00
|
|
|
#define DIR_CONN_STATE_SERVER_COMMAND_WAIT 4
|
2004-05-10 12:27:54 +02:00
|
|
|
/** State for connection at directory server: sending HTTP response. */
|
2004-03-31 00:57:49 +02:00
|
|
|
#define DIR_CONN_STATE_SERVER_WRITING 5
|
|
|
|
#define _DIR_CONN_STATE_MAX 5
|
|
|
|
|
|
|
|
#define _DIR_PURPOSE_MIN 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Purpose for connection to directory server: download a directory. */
|
2004-03-31 00:57:49 +02:00
|
|
|
#define DIR_PURPOSE_FETCH_DIR 1
|
2004-06-16 23:08:29 +02:00
|
|
|
/** Purpose for connection to directory server: download just the list
|
|
|
|
* of running routers. */
|
|
|
|
#define DIR_PURPOSE_FETCH_RUNNING_LIST 2
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Purpose for connection to directory server: download a rendezvous
|
|
|
|
* descriptor. */
|
2004-06-16 23:08:29 +02:00
|
|
|
#define DIR_PURPOSE_FETCH_RENDDESC 3
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Purpose for connection to directory server: set after a rendezvous
|
|
|
|
* descriptor is downloaded. */
|
2004-06-16 23:08:29 +02:00
|
|
|
#define DIR_PURPOSE_HAS_FETCHED_RENDDESC 4
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Purpose for connection to directory server: upload a server descriptor. */
|
2004-06-16 23:08:29 +02:00
|
|
|
#define DIR_PURPOSE_UPLOAD_DIR 5
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Purpose for connection to directory server: upload a rendezvous
|
2004-05-10 12:27:54 +02:00
|
|
|
* descriptor. */
|
2004-06-16 23:08:29 +02:00
|
|
|
#define DIR_PURPOSE_UPLOAD_RENDDESC 6
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Purpose for connection at a directory server. */
|
2004-06-16 23:08:29 +02:00
|
|
|
#define DIR_PURPOSE_SERVER 7
|
|
|
|
#define _DIR_PURPOSE_MAX 7
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2004-06-17 20:13:09 +02:00
|
|
|
#define _EXIT_PURPOSE_MIN 1
|
|
|
|
#define EXIT_PURPOSE_CONNECT 1
|
|
|
|
#define EXIT_PURPOSE_RESOLVE 2
|
|
|
|
#define _EXIT_PURPOSE_MAX 2
|
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Circuit state: I'm the OP, still haven't done all my handshakes. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_STATE_BUILDING 0
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Circuit state: Waiting to process the onionskin. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_STATE_ONIONSKIN_PENDING 1
|
2004-07-02 11:29:01 +02:00
|
|
|
/** Circuit state: I'd like to deliver a create, but my n_conn is still connecting. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_STATE_OR_WAIT 2
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Circuit state: onionskin(s) processed, ready to send/receive cells. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_STATE_OPEN 3
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-03-30 00:14:19 +02:00
|
|
|
#define _CIRCUIT_PURPOSE_MIN 1
|
2004-04-05 02:47:48 +02:00
|
|
|
|
2004-03-30 00:14:19 +02:00
|
|
|
/* these circuits were initiated elsewhere */
|
2004-04-08 04:24:06 +02:00
|
|
|
#define _CIRCUIT_PURPOSE_OR_MIN 1
|
2004-05-10 08:52:01 +02:00
|
|
|
/** OR-side circuit purpose: normal circuit, at OR. */
|
|
|
|
#define CIRCUIT_PURPOSE_OR 1
|
2004-05-10 12:27:54 +02:00
|
|
|
/** OR-side circuit purpose: At OR, from Bob, waiting for intro from Alices. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_INTRO_POINT 2
|
2004-05-10 12:27:54 +02:00
|
|
|
/** OR-side circuit purpose: At OR, from Alice, waiting for Bob. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_REND_POINT_WAITING 3
|
2004-05-10 12:27:54 +02:00
|
|
|
/** OR-side circuit purpose: At OR, both circuits have this purpose. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_REND_ESTABLISHED 4
|
2004-04-08 04:24:06 +02:00
|
|
|
#define _CIRCUIT_PURPOSE_OR_MAX 4
|
2004-04-05 02:47:48 +02:00
|
|
|
|
2004-03-30 21:52:42 +02:00
|
|
|
/* these circuits originate at this node */
|
2004-04-05 02:47:48 +02:00
|
|
|
|
|
|
|
/* here's how circ client-side purposes work:
|
|
|
|
* normal circuits are C_GENERAL.
|
|
|
|
* circuits that are c_introducing are either on their way to
|
2004-04-13 07:20:52 +02:00
|
|
|
* becoming open, or they are open and waiting for a
|
|
|
|
* suitable rendcirc before they send the intro.
|
|
|
|
* circuits that are c_introduce_ack_wait have sent the intro,
|
|
|
|
* but haven't gotten a response yet.
|
2004-04-05 02:47:48 +02:00
|
|
|
* circuits that are c_establish_rend are either on their way
|
|
|
|
* to becoming open, or they are open and have sent the
|
|
|
|
* establish_rendezvous cell but haven't received an ack.
|
2004-04-14 00:56:24 +02:00
|
|
|
* circuits that are c_rend_ready are open and have received a
|
|
|
|
* rend ack, but haven't heard from bob yet. if they have a
|
2004-04-05 02:47:48 +02:00
|
|
|
* buildstate->pending_final_cpath then they're expecting a
|
|
|
|
* cell from bob, else they're not.
|
2004-04-14 00:56:24 +02:00
|
|
|
* circuits that are c_rend_ready_intro_acked are open, and
|
|
|
|
* some intro circ has sent its intro and received an ack.
|
2004-04-05 02:47:48 +02:00
|
|
|
* circuits that are c_rend_joined are open, have heard from
|
|
|
|
* bob, and are talking to him.
|
|
|
|
*/
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Client-side circuit purpose: Normal circuit, with cpath. */
|
|
|
|
#define CIRCUIT_PURPOSE_C_GENERAL 5
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Client-side circuit purpose: at Alice, connecting to intro point. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_C_INTRODUCING 6
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Client-side circuit purpose: at Alice, sent INTRODUCE1 to intro point, waiting for ACK/NAK. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT 7
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Client-side circuit purpose: at Alice, introduced and acked, closing. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_C_INTRODUCE_ACKED 8
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Client-side circuit purpose: at Alice, waiting for ack. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_C_ESTABLISH_REND 9
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Client-side circuit purpose: at Alice, waiting for Bob. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_C_REND_READY 10
|
|
|
|
/** Client-side circuit purpose: at Alice, waiting for Bob, INTRODUCE
|
|
|
|
* has been acknowledged. */
|
|
|
|
#define CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED 11
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Client-side circuit purpose: at Alice, rendezvous established. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_C_REND_JOINED 12
|
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Hidden-service-side circuit purpose: at Bob, waiting for introductions. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_S_ESTABLISH_INTRO 13
|
|
|
|
/** Hidden-service-side circuit purpose: at Bob, successfully established
|
2004-05-10 12:27:54 +02:00
|
|
|
* intro. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_S_INTRO 14
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Hidden-service-side circuit purpose: at Bob, connecting to rend point. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_S_CONNECT_REND 15
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Hidden-service-side circuit purpose: at Bob, rendezvous established. */
|
2004-05-10 08:52:01 +02:00
|
|
|
#define CIRCUIT_PURPOSE_S_REND_JOINED 16
|
2004-04-18 10:38:40 +02:00
|
|
|
#define _CIRCUIT_PURPOSE_MAX 16
|
2004-03-30 00:14:19 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** True iff the circuit purpose <b>p</b> is for a circuit at the OP
|
|
|
|
* that this OP has originated. */
|
2004-04-08 04:24:06 +02:00
|
|
|
#define CIRCUIT_PURPOSE_IS_ORIGIN(p) ((p)>_CIRCUIT_PURPOSE_OR_MAX)
|
|
|
|
#define CIRCUIT_IS_ORIGIN(c) (CIRCUIT_PURPOSE_IS_ORIGIN((c)->purpose))
|
|
|
|
|
2003-05-01 08:42:29 +02:00
|
|
|
#define RELAY_COMMAND_BEGIN 1
|
|
|
|
#define RELAY_COMMAND_DATA 2
|
|
|
|
#define RELAY_COMMAND_END 3
|
|
|
|
#define RELAY_COMMAND_CONNECTED 4
|
|
|
|
#define RELAY_COMMAND_SENDME 5
|
2003-05-06 01:24:46 +02:00
|
|
|
#define RELAY_COMMAND_EXTEND 6
|
|
|
|
#define RELAY_COMMAND_EXTENDED 7
|
2003-06-12 12:16:33 +02:00
|
|
|
#define RELAY_COMMAND_TRUNCATE 8
|
|
|
|
#define RELAY_COMMAND_TRUNCATED 9
|
2003-11-17 01:57:56 +01:00
|
|
|
#define RELAY_COMMAND_DROP 10
|
2004-03-08 00:50:15 +01:00
|
|
|
#define RELAY_COMMAND_RESOLVE 11
|
|
|
|
#define RELAY_COMMAND_RESOLVED 12
|
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
|
|
|
|
2004-04-01 03:11:28 +02:00
|
|
|
#define RELAY_COMMAND_ESTABLISH_INTRO 32
|
|
|
|
#define RELAY_COMMAND_ESTABLISH_RENDEZVOUS 33
|
|
|
|
#define RELAY_COMMAND_INTRODUCE1 34
|
|
|
|
#define RELAY_COMMAND_INTRODUCE2 35
|
2004-04-13 02:38:16 +02:00
|
|
|
#define RELAY_COMMAND_RENDEZVOUS1 36
|
|
|
|
#define RELAY_COMMAND_RENDEZVOUS2 37
|
|
|
|
#define RELAY_COMMAND_INTRO_ESTABLISHED 38
|
|
|
|
#define RELAY_COMMAND_RENDEZVOUS_ESTABLISHED 39
|
|
|
|
#define RELAY_COMMAND_INTRODUCE_ACK 40
|
2004-04-01 03:11:28 +02:00
|
|
|
|
2004-02-27 23:00:26 +01:00
|
|
|
#define _MIN_END_STREAM_REASON 1
|
2003-10-22 09:55:44 +02:00
|
|
|
#define END_STREAM_REASON_MISC 1
|
|
|
|
#define END_STREAM_REASON_RESOLVEFAILED 2
|
|
|
|
#define END_STREAM_REASON_CONNECTFAILED 3
|
|
|
|
#define END_STREAM_REASON_EXITPOLICY 4
|
|
|
|
#define END_STREAM_REASON_DESTROY 5
|
|
|
|
#define END_STREAM_REASON_DONE 6
|
2004-02-29 00:56:50 +01:00
|
|
|
#define END_STREAM_REASON_TIMEOUT 7
|
|
|
|
#define _MAX_END_STREAM_REASON 7
|
2003-10-22 09:55:44 +02:00
|
|
|
|
2004-06-17 20:13:09 +02:00
|
|
|
#define RESOLVED_TYPE_IPV4 4
|
|
|
|
#define RESOLVED_TYPE_IPV6 6
|
|
|
|
#define RESOLVED_TYPE_ERROR_TRANSIENT 0xF0
|
|
|
|
#define RESOLVED_TYPE_ERROR 0xF1
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Length of 'y' portion of 'y.onion' URL. */
|
2004-04-01 23:32:01 +02:00
|
|
|
#define REND_SERVICE_ID_LEN 16
|
|
|
|
|
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
|
|
|
#define CELL_DIRECTION_IN 1
|
|
|
|
#define CELL_DIRECTION_OUT 2
|
|
|
|
|
2004-01-20 03:14:30 +01:00
|
|
|
#ifdef TOR_PERF
|
|
|
|
#define CIRCWINDOW_START 10000
|
|
|
|
#define CIRCWINDOW_INCREMENT 1000
|
|
|
|
#define STREAMWINDOW_START 5000
|
|
|
|
#define STREAMWINDOW_INCREMENT 500
|
|
|
|
#else
|
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
|
|
|
#define CIRCWINDOW_START 1000
|
|
|
|
#define CIRCWINDOW_INCREMENT 100
|
2003-05-01 08:42:29 +02:00
|
|
|
#define STREAMWINDOW_START 500
|
|
|
|
#define STREAMWINDOW_INCREMENT 50
|
2004-01-20 03:14:30 +01:00
|
|
|
#endif
|
2002-07-18 08:37:58 +02:00
|
|
|
|
2002-07-19 20:48:28 +02:00
|
|
|
/* cell commands */
|
|
|
|
#define CELL_PADDING 0
|
|
|
|
#define CELL_CREATE 1
|
2003-05-06 01:24:46 +02:00
|
|
|
#define CELL_CREATED 2
|
|
|
|
#define CELL_RELAY 3
|
|
|
|
#define CELL_DESTROY 4
|
2002-07-19 20:48:28 +02:00
|
|
|
|
2004-08-15 10:15:12 +02:00
|
|
|
/* people behind fascist firewalls use only these ports */
|
|
|
|
#define REQUIRED_FIREWALL_DIRPORT 80
|
|
|
|
#define REQUIRED_FIREWALL_ORPORT 443
|
|
|
|
|
2003-09-27 23:30:10 +02:00
|
|
|
/* legal characters in a nickname */
|
|
|
|
#define LEGAL_NICKNAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2003-09-21 08:15:43 +02:00
|
|
|
#define SOCKS4_NETWORK_LEN 8
|
|
|
|
|
2003-12-16 10:48:17 +01:00
|
|
|
/*
|
|
|
|
* Relay payload:
|
|
|
|
* Relay command [1 byte]
|
2003-12-19 06:09:51 +01:00
|
|
|
* Recognized [2 bytes]
|
|
|
|
* Stream ID [2 bytes]
|
2003-12-16 10:48:17 +01:00
|
|
|
* Partial SHA-1 [4 bytes]
|
|
|
|
* Length [2 bytes]
|
2003-12-19 06:09:51 +01:00
|
|
|
* Relay payload [498 bytes]
|
2003-12-16 10:48:17 +01:00
|
|
|
*/
|
2003-04-16 19:44:33 +02:00
|
|
|
|
2003-12-16 10:48:17 +01:00
|
|
|
#define CELL_PAYLOAD_SIZE 509
|
|
|
|
#define CELL_NETWORK_SIZE 512
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
#define RELAY_HEADER_SIZE (1+2+2+4+2)
|
|
|
|
#define RELAY_PAYLOAD_SIZE (CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE)
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Parsed onion routing cell. All communication from OP-to-OR, or from
|
|
|
|
* OR-to-OR, is via cells. */
|
2003-12-16 10:48:17 +01:00
|
|
|
typedef struct {
|
2004-05-10 08:52:01 +02:00
|
|
|
uint16_t circ_id; /**< Circuit which received the cell. */
|
|
|
|
unsigned char command; /**< Type of the cell: one of PADDING, CREATE, RELAY,
|
2004-05-10 12:27:54 +02:00
|
|
|
* or DESTROY. */
|
|
|
|
unsigned char payload[CELL_PAYLOAD_SIZE]; /**< Cell body. */
|
2003-12-16 10:48:17 +01:00
|
|
|
} cell_t;
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Beginning of a RELAY cell payload. */
|
2003-12-19 06:09:51 +01:00
|
|
|
typedef struct {
|
2004-05-10 08:52:01 +02:00
|
|
|
uint8_t command; /**< The end-to-end relay command. */
|
|
|
|
uint16_t recognized; /**< Used to tell whether cell is for us. */
|
|
|
|
uint16_t stream_id; /**< Which stream is this cell associated with? */
|
|
|
|
char integrity[4]; /**< Used to tell whether cell is corrupted. */
|
|
|
|
uint16_t length; /**< How long is the payload body? */
|
2003-12-19 06:09:51 +01:00
|
|
|
} relay_header_t;
|
2002-07-19 20:48:28 +02:00
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
typedef struct buf_t buf_t;
|
2003-11-11 03:41:31 +01:00
|
|
|
typedef struct socks_request_t socks_request_t;
|
2003-09-25 07:17:11 +02:00
|
|
|
|
2004-02-25 08:31:46 +01:00
|
|
|
#define CONNECTION_MAGIC 0x7C3C304Eu
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Description of a connection to another host or process, and associated
|
2004-05-10 12:27:54 +02:00
|
|
|
* data. */
|
2003-12-16 10:48:17 +01:00
|
|
|
struct connection_t {
|
2004-05-10 08:52:01 +02:00
|
|
|
uint32_t magic; /**< For memory debugging: must equal CONNECTION_MAGIC. */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
uint8_t type; /**< What kind of connection is this? */
|
|
|
|
uint8_t state; /**< Current state of this connection. */
|
2004-05-10 12:27:54 +02:00
|
|
|
uint8_t purpose; /**< Only used for DIR types currently. */
|
|
|
|
uint8_t wants_to_read; /**< Boolean: should we start reading again once
|
2003-09-05 08:04:03 +02:00
|
|
|
* the bandwidth throttler allows it?
|
|
|
|
*/
|
2004-05-10 12:27:54 +02:00
|
|
|
uint8_t wants_to_write; /**< Boolean: should we start writing again once
|
2003-09-07 12:24:40 +02:00
|
|
|
* the bandwidth throttler allows reads?
|
|
|
|
*/
|
2004-05-10 10:56:42 +02:00
|
|
|
int s; /**< Our socket; -1 if this connection is closed. */
|
2004-05-10 12:27:54 +02:00
|
|
|
int poll_index; /**< Index of this conn into the poll_array. */
|
|
|
|
int marked_for_close; /**< Boolean: should we close this conn on the next
|
2003-09-05 08:04:03 +02:00
|
|
|
* iteration of the main loop?
|
|
|
|
*/
|
2004-05-10 10:56:42 +02:00
|
|
|
char *marked_for_close_file; /**< For debugging: in which file were we marked
|
2004-02-28 05:11:53 +01:00
|
|
|
* for close? */
|
2004-05-10 08:52:01 +02:00
|
|
|
int hold_open_until_flushed; /**< Despite this connection's being marked
|
|
|
|
* for close, do we flush it before closing it?
|
|
|
|
*/
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
buf_t *inbuf; /**< Buffer holding data read over this connection. */
|
2004-05-10 10:56:42 +02:00
|
|
|
int inbuf_reached_eof; /**< Boolean: did read() return 0 on this conn? */
|
|
|
|
time_t timestamp_lastread; /**< When was the last time poll() said we could read? */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
buf_t *outbuf; /**< Buffer holding data to write over this connection. */
|
2004-10-14 05:13:08 +02:00
|
|
|
size_t outbuf_flushlen; /**< How much data should we try to flush from the
|
|
|
|
* outbuf? */
|
2004-05-10 08:52:01 +02:00
|
|
|
time_t timestamp_lastwritten; /**< When was the last time poll() said we could write? */
|
2002-10-02 01:37:31 +02:00
|
|
|
|
2004-05-10 10:56:42 +02:00
|
|
|
time_t timestamp_created; /**< When was this connection_t created? */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
uint32_t addr; /**< IP of the other side of the connection; used to identify
|
|
|
|
* routers, along with port. */
|
2004-05-10 12:27:54 +02:00
|
|
|
uint16_t port; /**< If non-zero, port on the other end
|
2003-09-05 08:04:03 +02:00
|
|
|
* of the connection. */
|
2004-05-10 08:52:01 +02:00
|
|
|
char *address; /**< FQDN (or IP) of the guy on the other end.
|
2004-05-10 12:27:54 +02:00
|
|
|
* strdup into this, because free_connection frees it.
|
2003-09-05 08:04:03 +02:00
|
|
|
*/
|
2004-07-01 03:16:59 +02:00
|
|
|
crypto_pk_env_t *identity_pkey; /**< Public RSA key for the other side's
|
2004-05-10 12:27:54 +02:00
|
|
|
* signing key. */
|
2004-07-01 03:16:59 +02:00
|
|
|
char identity_digest[DIGEST_LEN]; /**< Hash of identity_pkey */
|
2004-05-10 08:52:01 +02:00
|
|
|
char *nickname; /**< Nickname of OR on other side (if any). */
|
2003-09-05 08:04:03 +02:00
|
|
|
|
|
|
|
/* Used only by OR connections: */
|
2004-05-10 08:52:01 +02:00
|
|
|
tor_tls *tls; /**< TLS connection state (OR only.) */
|
|
|
|
uint16_t next_circ_id; /**< Which circ_id do we try to use next on
|
|
|
|
* this connection? This is always in the
|
|
|
|
* range 0..1<<15-1. (OR only.)*/
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-27 23:09:56 +02:00
|
|
|
/* bandwidth and receiver_bucket only used by ORs in OPEN state: */
|
2004-05-10 12:27:54 +02:00
|
|
|
int bandwidth; /**< Connection bandwidth. (OPEN ORs only.) */
|
2004-05-10 10:56:42 +02:00
|
|
|
int receiver_bucket; /**< When this hits 0, stop receiving. Every second we
|
2003-09-27 23:09:56 +02:00
|
|
|
* add 'bandwidth' to this, capping it at 10*bandwidth.
|
2004-05-10 08:52:01 +02:00
|
|
|
* (OPEN ORs only)
|
2003-09-27 23:09:56 +02:00
|
|
|
*/
|
|
|
|
|
2004-04-03 01:54:48 +02:00
|
|
|
/* Used only by DIR and AP connections: */
|
2004-05-10 08:52:01 +02:00
|
|
|
char rend_query[REND_SERVICE_ID_LEN+1]; /**< What rendezvous service are we
|
|
|
|
* querying for? (DIR/AP only) */
|
2004-04-01 23:32:01 +02:00
|
|
|
|
2003-09-05 08:04:03 +02:00
|
|
|
/* Used only by edge connections: */
|
2003-12-19 06:09:51 +01:00
|
|
|
uint16_t stream_id;
|
2004-05-10 08:52:01 +02:00
|
|
|
struct connection_t *next_stream; /**< Points to the next stream at this
|
|
|
|
* edge, if any (Edge only). */
|
2004-05-10 10:56:42 +02:00
|
|
|
struct crypt_path_t *cpath_layer; /**< A pointer to which node in the circ
|
2004-05-10 08:52:01 +02:00
|
|
|
* this conn exits at. (Edge only.) */
|
|
|
|
int package_window; /**< How many more relay cells can i send into the
|
|
|
|
* circuit? (Edge only.) */
|
|
|
|
int deliver_window; /**< How many more relay cells can end at me? (Edge
|
|
|
|
* only.) */
|
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
int done_sending; /**< For half-open connections; not used currently. */
|
|
|
|
int done_receiving; /**< For half-open connections; not used currently. */
|
2004-05-10 10:56:42 +02:00
|
|
|
char has_sent_end; /**< For debugging: set once we've set the stream end,
|
2004-05-10 12:27:54 +02:00
|
|
|
and check in circuit_about_to_close_connection(). */
|
2004-05-10 10:56:42 +02:00
|
|
|
char num_retries; /**< How many times have we re-tried beginning this stream? (Edge only) */
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2003-11-11 03:41:31 +01:00
|
|
|
/* Used only by AP connections */
|
2004-05-10 08:52:01 +02:00
|
|
|
socks_request_t *socks_request; /**< SOCKS structure describing request (AP
|
|
|
|
* only.) */
|
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
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct connection_t connection_t;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-04-07 06:38:19 +02:00
|
|
|
#define EXIT_POLICY_ACCEPT 1
|
|
|
|
#define EXIT_POLICY_REJECT 2
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** A linked list of exit policy rules */
|
2003-04-07 06:38:19 +02:00
|
|
|
struct exit_policy_t {
|
2004-05-10 12:27:54 +02:00
|
|
|
char policy_type; /**< One of EXIT_POLICY_ACCEPT or EXIT_POLICY_REJECT. */
|
|
|
|
char *string; /**< String representation of this rule. */
|
|
|
|
uint32_t addr; /**< Base address to accept or reject. */
|
|
|
|
uint32_t msk; /**< Accept/reject all addresses <b>a</b> such that a & msk ==
|
2004-05-10 08:52:01 +02:00
|
|
|
* <b>addr</b> & msk . */
|
2004-05-10 12:27:54 +02:00
|
|
|
uint16_t prt_min; /**< Lowest port number to accept/reject. */
|
|
|
|
uint16_t prt_max; /**< Highest port number to accept/reject. */
|
2004-05-10 08:52:01 +02:00
|
|
|
|
|
|
|
struct exit_policy_t *next; /**< Next rule in list. */
|
2003-04-07 06:38:19 +02:00
|
|
|
};
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Information about another onion router in the network. */
|
2002-12-03 23:18:23 +01:00
|
|
|
typedef struct {
|
2004-05-10 08:52:01 +02:00
|
|
|
char *address; /**< Location of OR: either a hostname or an IP address. */
|
|
|
|
char *nickname; /**< Human-readable OR name. */
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
uint32_t addr; /**< IPv4 address of OR, in host order. */
|
2004-05-10 12:27:54 +02:00
|
|
|
uint16_t or_port; /**< Port for OR-to-OR and OP-to-OR connections. */
|
|
|
|
uint16_t socks_port; /**< Port for SOCKS connections. */
|
|
|
|
uint16_t dir_port; /**< Port for HTTP directory connections. */
|
2003-09-26 20:27:35 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
time_t published_on; /**< When was the information in this routerinfo_t
|
|
|
|
* published? */
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
crypto_pk_env_t *onion_pkey; /**< Public RSA key for onions. */
|
|
|
|
crypto_pk_env_t *identity_pkey; /**< Public RSA key for signing. */
|
2004-07-01 13:32:26 +02:00
|
|
|
char identity_digest[DIGEST_LEN]; /**< Digest of identity key */
|
2003-09-27 23:30:10 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
char *platform; /**< What software/operating system is this OR using? */
|
2004-04-07 23:36:03 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/* link info */
|
2004-05-10 08:52:01 +02:00
|
|
|
uint32_t bandwidthrate; /**< How many bytes does this OR add to its token
|
|
|
|
* bucket per second? */
|
|
|
|
uint32_t bandwidthburst; /**< How large is this OR's token bucket? */
|
2004-07-12 20:02:54 +02:00
|
|
|
/** How many bytes/s is this router known to handle? */
|
2004-08-15 10:15:12 +02:00
|
|
|
uint32_t bandwidthcapacity;
|
2004-05-10 08:52:01 +02:00
|
|
|
struct exit_policy_t *exit_policy; /**< What streams will this OR permit
|
|
|
|
* to exit? */
|
2004-08-17 08:06:05 +02:00
|
|
|
long uptime; /**< How many seconds the router claims to have been up */
|
2004-05-17 22:31:01 +02:00
|
|
|
/* local info */
|
|
|
|
int is_running; /**< As far as we know, is this OR currently running? */
|
2004-07-17 01:05:40 +02:00
|
|
|
time_t status_set_at; /**< When did we last update is_running? */
|
|
|
|
int is_verified; /**< Has a trusted dirserver validated this OR? */
|
2004-05-17 22:31:01 +02:00
|
|
|
int is_trusted_dir; /**< Do we trust this OR as a directory server? */
|
|
|
|
|
2004-10-15 03:58:11 +02:00
|
|
|
smartlist_t *declared_family; /**< Nicknames of router which this router
|
|
|
|
* claims are its family. */
|
2002-06-27 00:45:49 +02:00
|
|
|
} routerinfo_t;
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Contents of a directory of onion routers. */
|
2003-05-06 19:38:16 +02:00
|
|
|
typedef struct {
|
2004-05-10 08:52:01 +02:00
|
|
|
/** List of routerinfo_t */
|
2004-04-07 21:46:27 +02:00
|
|
|
smartlist_t *routers;
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Which versions of tor are recommended by this directory? */
|
2003-05-09 04:25:37 +02:00
|
|
|
char *software_versions;
|
2004-05-17 22:31:01 +02:00
|
|
|
/** When was the most recent directory that contributed to this list
|
|
|
|
* published?
|
|
|
|
*/
|
2003-09-27 23:30:10 +02:00
|
|
|
time_t published_on;
|
2004-06-25 02:29:31 +02:00
|
|
|
time_t running_routers_updated_on;
|
2004-06-02 22:00:57 +02:00
|
|
|
/** Which router is claimed to have signed it? */
|
|
|
|
char *signing_router;
|
2003-12-05 10:51:49 +01:00
|
|
|
} routerlist_t;
|
2003-05-06 19:38:16 +02:00
|
|
|
|
2004-07-17 00:23:18 +02:00
|
|
|
/** Contents of a running-routers list */
|
2004-06-25 02:29:31 +02:00
|
|
|
typedef struct running_routers_t {
|
2004-07-17 00:23:18 +02:00
|
|
|
time_t published_on; /**< When was the list marked as published? */
|
|
|
|
/** Which ORs are on the list? Entries may be prefixed with ! and $. */
|
2004-06-25 02:29:31 +02:00
|
|
|
smartlist_t *running_routers;
|
|
|
|
} running_routers_t;
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Holds accounting information for a single step in the layered encryption
|
|
|
|
* performed by a circuit. Used only at the client edge of a circuit. */
|
2003-12-17 22:09:31 +01:00
|
|
|
struct crypt_path_t {
|
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
|
|
|
|
2002-08-22 09:30:03 +02:00
|
|
|
/* crypto environments */
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Encryption key and counter for cells heading towards the OR at this
|
|
|
|
* step. */
|
2002-08-22 09:30:03 +02:00
|
|
|
crypto_cipher_env_t *f_crypto;
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Encryption key and counter for cells heading back from the OR at this
|
|
|
|
* step. */
|
2002-08-22 09:30:03 +02:00
|
|
|
crypto_cipher_env_t *b_crypto;
|
2003-05-02 00:55:51 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Digest state for cells heading towards the OR at this step. */
|
2003-12-16 09:21:58 +01:00
|
|
|
crypto_digest_env_t *f_digest; /* for integrity checking */
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Digest state for cells heading away from the OR at this step. */
|
2003-12-16 09:21:58 +01:00
|
|
|
crypto_digest_env_t *b_digest;
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Current state of Diffie-Hellman key negotiation with the OR at this
|
|
|
|
* step. */
|
2003-05-06 01:24:46 +02:00
|
|
|
crypto_dh_env_t *handshake_state;
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Negotiated key material shared with the OR at this step. */
|
2004-04-03 04:40:30 +02:00
|
|
|
char handshake_digest[DIGEST_LEN];/* KH in tor-spec.txt */
|
2003-05-06 01:24:46 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** IP4 address of the OR at this step. */
|
2003-05-06 01:24:46 +02:00
|
|
|
uint32_t addr;
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Port of the OR at this step. */
|
2003-05-06 01:24:46 +02:00
|
|
|
uint16_t port;
|
2004-07-01 03:16:59 +02:00
|
|
|
/** Identity key digest of the OR at this step. */
|
|
|
|
char identity_digest[DIGEST_LEN];
|
2003-05-06 01:24:46 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Is the circuit built to this step? Must be one of:
|
|
|
|
* - CPATH_STATE_CLOSED (The circuit has not been extended to this step)
|
|
|
|
* - CPATH_STATE_AWAITING_KEYS (We have sent an EXTEND/CREATE to this step
|
|
|
|
* and not received an EXTENDED/CREATED)
|
|
|
|
* - CPATH_STATE_OPEN (The circuit has been extended to this step) */
|
2003-09-05 08:04:03 +02:00
|
|
|
uint8_t state;
|
2003-05-02 00:55:51 +02:00
|
|
|
#define CPATH_STATE_CLOSED 0
|
2003-05-06 01:24:46 +02:00
|
|
|
#define CPATH_STATE_AWAITING_KEYS 1
|
2003-05-02 00:55:51 +02:00
|
|
|
#define CPATH_STATE_OPEN 2
|
2004-05-10 08:52:01 +02:00
|
|
|
struct crypt_path_t *next; /**< Link to next crypt_path_t in the circuit.
|
|
|
|
* (The list is circular, so the last node
|
|
|
|
* links to the first.) */
|
|
|
|
struct crypt_path_t *prev; /**< Link to previous crypt_path_t in the
|
2004-05-10 12:27:54 +02:00
|
|
|
* circuit. */
|
2004-05-10 08:52:01 +02:00
|
|
|
|
|
|
|
int package_window; /**< How many bytes are we allowed to originate ending
|
|
|
|
* at this step? */
|
|
|
|
int deliver_window; /**< How many bytes are we willing to deliver originating
|
|
|
|
* at this step? */
|
2003-05-02 23:29:25 +02:00
|
|
|
};
|
2003-05-02 00:55:51 +02:00
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
#define CPATH_KEY_MATERIAL_LEN (20*2+16*2)
|
|
|
|
|
2004-04-05 22:53:50 +02:00
|
|
|
#define DH_KEY_LEN DH_BYTES
|
2004-04-25 00:17:50 +02:00
|
|
|
#define ONIONSKIN_CHALLENGE_LEN (PKCS1_OAEP_PADDING_OVERHEAD+\
|
|
|
|
CIPHER_KEY_LEN+\
|
|
|
|
DH_KEY_LEN)
|
|
|
|
#define ONIONSKIN_REPLY_LEN (DH_KEY_LEN+DIGEST_LEN)
|
2004-04-03 04:40:30 +02:00
|
|
|
#define REND_COOKIE_LEN DIGEST_LEN
|
2003-05-06 07:54:42 +02:00
|
|
|
|
2003-05-02 23:29:25 +02:00
|
|
|
typedef struct crypt_path_t crypt_path_t;
|
Integrated onion proxy into or/
The 'or' process can now be told (by the global_role variable) what
roles this server should play -- connect to all ORs, listen for ORs,
listen for OPs, listen for APs, or any combination.
* everything in /src/op/ is now obsolete.
* connection_ap.c now handles all interactions with application proxies
* "port" is now or_port, op_port, ap_port. But routers are still always
referenced (say, in conn_get_by_addr_port()) by addr / or_port. We
should make routers.c actually read these new ports (currently I've
kludged it so op_port = or_port+10, ap_port=or_port+20)
* circuits currently know if they're at the beginning of the path because
circ->cpath is set. They use this instead for crypts (both ways),
if it's set.
* I still obey the "send a 0 back to the AP when you're ready" protocol,
but I think we should phase it out. I can simply not read from the AP
socket until I'm ready.
I need to do a lot of cleanup work here, but the code appears to work, so
now's a good time for a checkin.
svn:r22
2002-07-02 11:36:58 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Information used to build a circuit. */
|
2003-11-16 18:00:02 +01:00
|
|
|
typedef struct {
|
2004-05-10 12:31:48 +02:00
|
|
|
/** Intended length of the final circuit. */
|
2003-11-16 18:00:02 +01:00
|
|
|
int desired_path_len;
|
2004-05-10 12:31:48 +02:00
|
|
|
/** Nickname of planned exit node. */
|
2004-07-03 01:40:03 +02:00
|
|
|
char *chosen_exit_name;
|
|
|
|
/** Identity of planned exit node. */
|
|
|
|
char chosen_exit_digest[DIGEST_LEN];
|
2004-05-10 12:31:48 +02:00
|
|
|
/** The crypt_path_t to append after rendezvous: used for rendezvous. */
|
2004-04-02 00:21:01 +02:00
|
|
|
struct crypt_path_t *pending_final_cpath;
|
2004-05-10 08:52:01 +02:00
|
|
|
/** How many times has building a circuit for this task failed? */
|
2004-04-14 23:40:50 +02:00
|
|
|
int failure_count;
|
2003-11-16 18:00:02 +01:00
|
|
|
} cpath_build_state_t;
|
2003-11-14 21:45:47 +01:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
|
2004-02-25 08:31:46 +01:00
|
|
|
#define CIRCUIT_MAGIC 0x35315243u
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Struct for a path (circuit) through the onion routing network. */
|
2003-08-21 01:05:22 +02:00
|
|
|
struct circuit_t {
|
2004-05-10 12:27:54 +02:00
|
|
|
uint32_t magic; /**< For memory debugging: must equal CIRCUIT_MAGIC. */
|
2004-02-25 08:31:46 +01:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
int marked_for_close; /**< Should we close this circuit at the end of the
|
|
|
|
* main loop? */
|
|
|
|
char *marked_for_close_file; /**< For debugging: in which file was this
|
|
|
|
* circuit marked for close? */
|
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The IPv4 address of the OR that is next in this circuit. */
|
2002-06-27 00:45:49 +02:00
|
|
|
uint32_t n_addr;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The port for the OR that is next in this circuit. */
|
2002-06-27 00:45:49 +02:00
|
|
|
uint16_t n_port;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The OR connection that is previous in this circuit. */
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_t *p_conn;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The OR connection that is next in this circuit. */
|
|
|
|
connection_t *n_conn;
|
2004-07-02 11:29:01 +02:00
|
|
|
/** The identity hash of n_conn. */
|
|
|
|
char n_conn_id_digest[DIGEST_LEN];
|
2004-05-10 09:37:10 +02:00
|
|
|
/** Linked list of AP streams associated with this circuit. */
|
2003-05-28 01:39:04 +02:00
|
|
|
connection_t *p_streams;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** Linked list of Exit streams associated with this circuit. */
|
2003-05-28 01:39:04 +02:00
|
|
|
connection_t *n_streams;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** Linked list of Exit streams associated with this circuit that are
|
|
|
|
* still being resolved. */
|
2004-05-06 13:08:04 +02:00
|
|
|
connection_t *resolving_streams;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The next stream_id that will be tried when we're attempting to
|
|
|
|
* construct a new AP stream originating at this circuit. */
|
2003-12-19 22:25:44 +01:00
|
|
|
uint16_t next_stream_id;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** How many relay data cells can we package (read from edge streams)
|
|
|
|
* on this circuit before we receive a circuit-level sendme cell asking
|
|
|
|
* for more? */
|
2003-05-20 08:41:23 +02:00
|
|
|
int package_window;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** How many relay data cells will we deliver (write to edge streams)
|
|
|
|
* on this circuit? When deliver_window gets low, we send some
|
|
|
|
* circuit-level sendme cells to indicate that we're willing to accept
|
|
|
|
* more. */
|
2003-05-20 08:41:23 +02:00
|
|
|
int deliver_window;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The circuit_id used in the previous (backward) hop of this circuit. */
|
|
|
|
uint16_t p_circ_id;
|
|
|
|
/** The circuit_id used in the next (forward) hop of this circuit. */
|
2003-12-19 20:55:02 +01:00
|
|
|
uint16_t n_circ_id;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The cipher used by intermediate hops for cells heading toward the
|
2004-05-10 12:27:54 +02:00
|
|
|
* OP. */
|
2004-05-10 09:37:10 +02:00
|
|
|
crypto_cipher_env_t *p_crypto;
|
|
|
|
/** The cipher used by intermediate hops for cells heading away from
|
2004-05-10 12:27:54 +02:00
|
|
|
* the OP. */
|
2002-08-22 09:30:03 +02:00
|
|
|
crypto_cipher_env_t *n_crypto;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The integrity-checking digest used by intermediate hops, for
|
|
|
|
* cells packaged here and heading towards the OP.
|
|
|
|
*/
|
|
|
|
crypto_digest_env_t *p_digest;
|
|
|
|
/** The integrity-checking digest used by intermediate hops, for
|
|
|
|
* cells packaged at the OP and arriving here.
|
|
|
|
*/
|
|
|
|
crypto_digest_env_t *n_digest;
|
2003-12-16 09:21:58 +01:00
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** Build state for this circuit. It includes the intended path
|
|
|
|
* length, the chosen exit router, rendezvous information, etc.
|
|
|
|
*/
|
2003-11-14 21:45:47 +01:00
|
|
|
cpath_build_state_t *build_state;
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The doubly-linked list of crypt_path_t entries, one per hop,
|
|
|
|
* for this circuit. This includes ciphers for each hop,
|
|
|
|
* integrity-checking digests for each hop, and package/delivery
|
|
|
|
* windows for each hop.
|
|
|
|
*
|
|
|
|
* The cpath field is defined only when we are the circuit's origin.
|
|
|
|
*/
|
2003-05-02 00:55:51 +02:00
|
|
|
crypt_path_t *cpath;
|
Integrated onion proxy into or/
The 'or' process can now be told (by the global_role variable) what
roles this server should play -- connect to all ORs, listen for ORs,
listen for OPs, listen for APs, or any combination.
* everything in /src/op/ is now obsolete.
* connection_ap.c now handles all interactions with application proxies
* "port" is now or_port, op_port, ap_port. But routers are still always
referenced (say, in conn_get_by_addr_port()) by addr / or_port. We
should make routers.c actually read these new ports (currently I've
kludged it so op_port = or_port+10, ap_port=or_port+20)
* circuits currently know if they're at the beginning of the path because
circ->cpath is set. They use this instead for crypts (both ways),
if it's set.
* I still obey the "send a 0 back to the AP when you're ready" protocol,
but I think we should phase it out. I can simply not read from the AP
socket until I'm ready.
I need to do a lot of cleanup work here, but the code appears to work, so
now's a good time for a checkin.
svn:r22
2002-07-02 11:36:58 +02:00
|
|
|
|
2004-07-02 11:29:01 +02:00
|
|
|
/** For storage while passing to cpuworker, or while n_conn is pending. */
|
|
|
|
char onionskin[ONIONSKIN_CHALLENGE_LEN];
|
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
char handshake_digest[DIGEST_LEN]; /**< Stores KH for intermediate hops. */
|
2004-04-02 00:21:01 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
time_t timestamp_created; /**< When was this circuit created? */
|
|
|
|
time_t timestamp_dirty; /**< When the circuit was first used, or 0 if the
|
|
|
|
* circuit is clean. */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
uint8_t state; /**< Current status of this circuit. */
|
|
|
|
uint8_t purpose; /**< Why are we creating this circuit? */
|
2004-03-30 21:52:42 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/**
|
2004-05-10 09:37:10 +02:00
|
|
|
* The rend_query field holds y portion of y.onion (nul-terminated)
|
|
|
|
* if purpose is C_INTRODUCING or C_ESTABLISH_REND, or is a C_GENERAL
|
|
|
|
* for a hidden service, or is S_*.
|
2004-03-30 21:52:42 +02:00
|
|
|
*/
|
2004-04-03 01:38:26 +02:00
|
|
|
char rend_query[REND_SERVICE_ID_LEN+1];
|
|
|
|
|
2004-05-10 09:37:10 +02:00
|
|
|
/** The rend_pk_digest field holds a hash of location-hidden service's
|
2004-05-10 12:27:54 +02:00
|
|
|
* PK if purpose is INTRO_POINT or S_ESTABLISH_INTRO or S_RENDEZVOUSING.
|
2004-04-03 01:38:26 +02:00
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
char rend_pk_digest[DIGEST_LEN];
|
2004-04-01 22:05:57 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Holds rendezvous cookie if purpose is REND_POINT_WAITING or
|
2004-04-02 23:56:52 +02:00
|
|
|
* C_ESTABLISH_REND. Filled with zeroes otherwise.
|
|
|
|
*/
|
2004-03-30 21:52:42 +02:00
|
|
|
char rend_cookie[REND_COOKIE_LEN];
|
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Points to spliced circuit if purpose is REND_ESTABLISHED, and circuit
|
2004-03-30 21:52:42 +02:00
|
|
|
* is not marked for close. */
|
|
|
|
struct circuit_t *rend_splice;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
struct circuit_t *next; /**< Next circuit in linked list. */
|
2003-08-21 01:05:22 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct circuit_t circuit_t;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-08-17 08:27:32 +02:00
|
|
|
#define ALLOW_UNVERIFIED_ENTRY 1
|
|
|
|
#define ALLOW_UNVERIFIED_EXIT 2
|
|
|
|
#define ALLOW_UNVERIFIED_MIDDLE 4
|
|
|
|
#define ALLOW_UNVERIFIED_RENDEZVOUS 8
|
|
|
|
#define ALLOW_UNVERIFIED_INTRODUCTION 16
|
2004-08-17 07:13:58 +02:00
|
|
|
|
2004-05-10 08:52:01 +02:00
|
|
|
/** Configuration options for a Tor process */
|
2002-12-03 23:18:23 +01:00
|
|
|
typedef struct {
|
2004-05-19 22:07:08 +02:00
|
|
|
struct config_line_t *LogOptions; /**< List of configuration lines
|
|
|
|
* for logfiles */
|
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
char *DebugLogFile; /**< Where to send verbose log messages. */
|
|
|
|
char *DataDirectory; /**< OR only: where to store long-term data. */
|
|
|
|
char *RouterFile; /**< Where to find starting list of ORs. */
|
|
|
|
char *Nickname; /**< OR only: nickname of this onion router. */
|
|
|
|
char *Address; /**< OR only: configured address for this onion router. */
|
|
|
|
char *PidFile; /**< Where to store PID of Tor process. */
|
2004-05-10 08:52:01 +02:00
|
|
|
|
|
|
|
char *ExitNodes; /**< Comma-separated list of nicknames of ORs to consider
|
|
|
|
* as exits. */
|
|
|
|
char *EntryNodes; /**< Comma-separated list of nicknames of ORs to consider
|
|
|
|
* as entry points. */
|
2004-08-15 22:14:44 +02:00
|
|
|
int StrictExitNodes; /**< Boolean: When none of our ExitNodes are up, do we
|
|
|
|
* stop building circuits? */
|
|
|
|
int StrictEntryNodes; /**< Boolean: When none of our EntryNodes are up, do we
|
|
|
|
* stop building circuits? */
|
2004-05-10 08:52:01 +02:00
|
|
|
char *ExcludeNodes; /**< Comma-separated list of nicknames of ORs not to
|
|
|
|
* use in circuits. */
|
|
|
|
|
|
|
|
char *RendNodes; /**< Comma-separated list of nicknames used as introduction
|
|
|
|
* points. */
|
|
|
|
char *RendExcludeNodes; /**< Comma-separated list of nicknames not to use
|
|
|
|
* as introduction points. */
|
|
|
|
|
2004-08-17 07:13:58 +02:00
|
|
|
smartlist_t *AllowUnverifiedNodes; /**< List of "entry", "middle", "exit" */
|
|
|
|
int _AllowUnverified; /**< Bitmask; derived from AllowUnverifiedNodes; */
|
2004-05-20 04:42:50 +02:00
|
|
|
struct config_line_t *ExitPolicy; /**< Lists of exit policy components. */
|
|
|
|
struct config_line_t *SocksPolicy; /**< Lists of socks policy components */
|
2004-08-16 13:43:18 +02:00
|
|
|
/** Addresses to bind for listening for SOCKS connections. */
|
2004-05-20 04:42:50 +02:00
|
|
|
struct config_line_t *SocksBindAddress;
|
2004-08-16 13:43:18 +02:00
|
|
|
/** Addresses to bind for listening for OR connections. */
|
2004-05-20 04:42:50 +02:00
|
|
|
struct config_line_t *ORBindAddress;
|
2004-08-16 13:43:18 +02:00
|
|
|
/** Addresses to bind for listening for directory connections. */
|
2004-05-20 04:42:50 +02:00
|
|
|
struct config_line_t *DirBindAddress;
|
2004-08-16 13:43:18 +02:00
|
|
|
/** Local address to bind outbound sockets */
|
|
|
|
char *OutboundBindAddress;
|
2004-05-10 08:52:01 +02:00
|
|
|
char *RecommendedVersions; /**< Directory server only: which versions of
|
|
|
|
* Tor should we tell users to run? */
|
|
|
|
char *User; /**< Name of user to run Tor as. */
|
|
|
|
char *Group; /**< Name of group to run Tor as. */
|
|
|
|
double PathlenCoinWeight; /**< Parameter used to configure average path
|
2004-05-10 12:27:54 +02:00
|
|
|
* length (alpha in geometric distribution). */
|
|
|
|
int ORPort; /**< Port to listen on for OR connections. */
|
|
|
|
int SocksPort; /**< Port to listen on for SOCKS connections. */
|
|
|
|
int DirPort; /**< Port to listen on for directory connections. */
|
2004-06-21 06:37:27 +02:00
|
|
|
int AuthoritativeDir; /**< Boolean: is this an authoritative directory? */
|
2004-07-13 09:42:20 +02:00
|
|
|
int ClientOnly; /**< Boolean: should we never evolve into a server role? */
|
2004-05-10 12:27:54 +02:00
|
|
|
int MaxConn; /**< Maximum number of simultaneous connections. */
|
2004-05-10 08:52:01 +02:00
|
|
|
int IgnoreVersion; /**< If true, run no matter what versions of Tor the
|
|
|
|
* directory recommends. */
|
|
|
|
int RunAsDaemon; /**< If true, run in the background. (Unix only) */
|
2004-08-16 22:47:00 +02:00
|
|
|
int FascistFirewall; /**< Whether to prefer ORs reachable on open ports. */
|
|
|
|
smartlist_t *FirewallPorts; /** Which ports our firewall allows. */
|
2004-05-10 08:52:01 +02:00
|
|
|
int DirFetchPostPeriod; /**< How often do we fetch new directories
|
|
|
|
* and post server descriptros to the directory
|
|
|
|
* server? */
|
|
|
|
int KeepalivePeriod; /**< How often do we send padding cells to keep
|
|
|
|
* connections alive? */
|
|
|
|
int MaxOnionsPending; /**< How many circuit CREATE requests do we allow
|
|
|
|
* to wait simultaneously before we start dropping
|
|
|
|
* them? */
|
|
|
|
int NewCircuitPeriod; /**< How long do we use a circuit before building
|
|
|
|
* a new one? */
|
|
|
|
int BandwidthRate; /**< How much bandwidth, on average, are we willing to
|
|
|
|
* use in a second? */
|
|
|
|
int BandwidthBurst; /**< How much bandwidth, at maximum, are we willing to
|
|
|
|
* use in a second? */
|
|
|
|
int NumCpus; /**< How many CPUs should we try to use? */
|
|
|
|
int RunTesting; /**< If true, create testing circuits to measure how well the
|
|
|
|
* other ORs are running. */
|
|
|
|
struct config_line_t *RendConfigLines; /**< List of configuration lines
|
|
|
|
* for rendezvous services. */
|
2004-10-08 07:53:59 +02:00
|
|
|
char *ContactInfo; /**< Contact info to be published in the directory */
|
|
|
|
|
|
|
|
char *HttpProxy; /**< hostname[:port] to use as http proxy, if any */
|
|
|
|
uint32_t HttpProxyAddr; /**< Parsed IPv4 addr for http proxy, if any */
|
|
|
|
uint16_t HttpProxyPort; /**< Parsed port for http proxy, if any */
|
|
|
|
|
2004-10-12 17:55:20 +02:00
|
|
|
struct config_line_t *DirServers; /**< List of configuration lines
|
|
|
|
* for directory servers. */
|
2004-10-15 03:58:11 +02:00
|
|
|
char *MyFamily; /**< Declared family for this OR. */
|
2002-07-03 18:31:22 +02:00
|
|
|
} or_options_t;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-12-16 10:48:17 +01:00
|
|
|
/* XXX are these good enough defaults? */
|
2004-02-26 23:02:22 +01:00
|
|
|
#define MAX_SOCKS_REPLY_LEN 1024
|
|
|
|
#define MAX_SOCKS_ADDR_LEN 256
|
2004-06-17 20:13:09 +02:00
|
|
|
#define SOCKS_COMMAND_CONNECT 0x01
|
|
|
|
#define SOCKS_COMMAND_RESOLVE 0xF0
|
2004-05-10 08:52:01 +02:00
|
|
|
/** State of a SOCKS request from a user to an OP */
|
2003-11-11 03:41:31 +01:00
|
|
|
struct socks_request_t {
|
2004-05-10 08:52:01 +02:00
|
|
|
char socks_version; /**< Which version of SOCKS did the client use? */
|
2004-06-17 20:13:09 +02:00
|
|
|
int command; /**< What has the user requested? One of CONNECT or RESOLVE. */
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t replylen; /**< Length of <b>reply</b>. */
|
2004-05-10 09:37:10 +02:00
|
|
|
char reply[MAX_SOCKS_REPLY_LEN]; /**< Write an entry into this string if
|
|
|
|
* we want to specify our own socks reply,
|
|
|
|
* rather than using the default socks4 or
|
|
|
|
* socks5 socks reply. We use this for the
|
|
|
|
* two-stage socks5 handshake.
|
|
|
|
*/
|
2004-05-10 08:52:01 +02:00
|
|
|
int has_finished; /**< Has the SOCKS handshake finished? */
|
2004-05-10 09:37:10 +02:00
|
|
|
char address[MAX_SOCKS_ADDR_LEN]; /**< What address did the client ask to connect to? */
|
|
|
|
uint16_t port; /**< What port did the client ask to connect to? */
|
2003-11-11 03:41:31 +01:00
|
|
|
};
|
|
|
|
|
2003-10-25 14:01:09 +02:00
|
|
|
/* all the function prototypes go here */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/********************************* buffers.c ***************************/
|
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
buf_t *buf_new();
|
|
|
|
buf_t *buf_new_with_capacity(size_t size);
|
|
|
|
void buf_free(buf_t *buf);
|
2004-02-28 20:14:11 +01:00
|
|
|
void buf_clear(buf_t *buf);
|
2003-09-25 07:17:11 +02:00
|
|
|
|
|
|
|
size_t buf_datalen(const buf_t *buf);
|
|
|
|
size_t buf_capacity(const buf_t *buf);
|
|
|
|
const char *_buf_peek_raw_buffer(const buf_t *buf);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-04-28 22:13:21 +02:00
|
|
|
int read_to_buf(int s, size_t at_most, buf_t *buf, int *reached_eof);
|
|
|
|
int read_to_buf_tls(tor_tls *tls, size_t at_most, buf_t *buf);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
int flush_buf(int s, buf_t *buf, size_t *buf_flushlen);
|
|
|
|
int flush_buf_tls(tor_tls *tls, buf_t *buf, size_t *buf_flushlen);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
int write_to_buf(const char *string, size_t string_len, buf_t *buf);
|
2004-04-28 22:13:21 +02:00
|
|
|
int fetch_from_buf(char *string, size_t string_len, buf_t *buf);
|
2003-09-25 07:17:11 +02:00
|
|
|
int fetch_from_buf_http(buf_t *buf,
|
2004-10-14 04:47:09 +02:00
|
|
|
char **headers_out, size_t max_headerlen,
|
|
|
|
char **body_out, size_t *body_used, size_t max_bodylen);
|
2003-11-11 03:41:31 +01:00
|
|
|
int fetch_from_buf_socks(buf_t *buf, socks_request_t *req);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-03-03 23:49:15 +01:00
|
|
|
void assert_buf_ok(buf_t *buf);
|
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
/********************************* circuitbuild.c **********************/
|
|
|
|
|
|
|
|
void circuit_log_path(int severity, circuit_t *circ);
|
|
|
|
void circuit_rep_hist_note_result(circuit_t *circ);
|
|
|
|
void circuit_dump_by_conn(connection_t *conn, int severity);
|
|
|
|
circuit_t *circuit_establish_circuit(uint8_t purpose,
|
2004-07-03 01:40:03 +02:00
|
|
|
const char *exit_digest);
|
2004-07-02 11:29:01 +02:00
|
|
|
void circuit_n_conn_done(connection_t *or_conn, int success);
|
2004-05-13 09:24:49 +02:00
|
|
|
int circuit_send_next_onion_skin(circuit_t *circ);
|
|
|
|
int circuit_extend(cell_t *cell, circuit_t *circ);
|
|
|
|
int circuit_init_cpath_crypto(crypt_path_t *cpath, char *key_data, int reverse);
|
|
|
|
int circuit_finish_handshake(circuit_t *circ, char *reply);
|
|
|
|
int circuit_truncated(circuit_t *circ, crypt_path_t *layer);
|
|
|
|
int onionskin_answer(circuit_t *circ, unsigned char *payload, unsigned char *keys);
|
|
|
|
void onion_append_to_cpath(crypt_path_t **head_ptr, crypt_path_t *new_hop);
|
|
|
|
|
|
|
|
/********************************* circuitlist.c ***********************/
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-04-09 22:02:16 +02:00
|
|
|
extern char *circuit_state_to_string[];
|
2004-03-02 18:48:17 +01:00
|
|
|
void circuit_close_all_marked(void);
|
2004-05-13 09:24:49 +02:00
|
|
|
circuit_t *circuit_new(uint16_t p_circ_id, connection_t *p_conn);
|
|
|
|
void circuit_free_cpath_node(crypt_path_t *victim);
|
|
|
|
circuit_t *circuit_get_by_circ_id_conn(uint16_t circ_id, connection_t *conn);
|
|
|
|
circuit_t *circuit_get_by_conn(connection_t *conn);
|
|
|
|
circuit_t *circuit_get_by_rend_query_and_purpose(const char *rend_query, uint8_t purpose);
|
|
|
|
circuit_t *circuit_get_next_by_pk_and_purpose(circuit_t *start,
|
|
|
|
const char *digest, uint8_t purpose);
|
|
|
|
circuit_t *circuit_get_rendezvous(const char *cookie);
|
|
|
|
int circuit_count_building(uint8_t purpose);
|
|
|
|
circuit_t *circuit_get_youngest_clean_open(uint8_t purpose);
|
2004-03-02 18:48:17 +01:00
|
|
|
int _circuit_mark_for_close(circuit_t *circ);
|
|
|
|
|
|
|
|
#define circuit_mark_for_close(c) \
|
|
|
|
do { \
|
|
|
|
if (_circuit_mark_for_close(c)<0) { \
|
|
|
|
log(LOG_WARN,"Duplicate call to circuit_mark_for_close at %s:%d (first at %s:%d)", \
|
|
|
|
__FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \
|
|
|
|
} else { \
|
|
|
|
c->marked_for_close_file = __FILE__; \
|
|
|
|
c->marked_for_close = __LINE__; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
void assert_cpath_layer_ok(const crypt_path_t *cp);
|
|
|
|
void assert_circuit_ok(const circuit_t *c);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
/********************************* circuituse.c ************************/
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-04-13 07:20:52 +02:00
|
|
|
void circuit_expire_building(time_t now);
|
2003-12-13 00:03:25 +01:00
|
|
|
int circuit_stream_is_being_handled(connection_t *conn);
|
2004-04-13 00:47:12 +02:00
|
|
|
void circuit_build_needed_circs(time_t now);
|
2004-02-18 02:21:20 +01:00
|
|
|
void circuit_detach_stream(circuit_t *circ, connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
void circuit_about_to_close_connection(connection_t *conn);
|
2004-05-13 09:24:49 +02:00
|
|
|
void circuit_has_opened(circuit_t *circ);
|
|
|
|
void circuit_build_failed(circuit_t *circ);
|
2004-07-03 01:40:03 +02:00
|
|
|
circuit_t *circuit_launch_by_nickname(uint8_t purpose, const char *exit_nickname);
|
|
|
|
circuit_t *circuit_launch_by_identity(uint8_t purpose, const char *exit_digest);
|
2004-08-18 10:51:04 +02:00
|
|
|
void circuit_reset_failure_count(int timeout);
|
2004-05-13 09:24:49 +02:00
|
|
|
int connection_ap_handshake_attach_circuit(connection_t *conn);
|
|
|
|
|
2004-04-05 22:53:50 +02:00
|
|
|
int circuit_init_cpath_crypto(crypt_path_t *cpath, char *key_data,int reverse);
|
2003-05-06 01:24:46 +02:00
|
|
|
int circuit_finish_handshake(circuit_t *circ, char *reply);
|
2003-06-12 12:16:33 +02:00
|
|
|
int circuit_truncated(circuit_t *circ, crypt_path_t *layer);
|
2003-04-16 08:18:31 +02:00
|
|
|
|
cleanups, bugfixes, more verbose logs
Fixed up the assert_*_ok funcs some (more work remains)
Changed config so it reads either /etc/torrc or the -f arg, never both
Finally tracked down a nasty bug with our use of tls:
It turns out that if you ask SSL_read() for no more than n bytes, it
will read the entire record from the network (and maybe part of the next
record, I'm not sure), give you n bytes of it, and keep the remaining
bytes internally. This is fine, except our poll-for-read looks at the
network, and there are no bytes pending on the network, so we never know
to ask SSL_read() for more bytes. Currently I've hacked it so if we ask
for n bytes and it returns n bytes, then it reads again right then. This
will interact poorly with our rate limiting; we need a cleaner solution.
svn:r481
2003-09-24 23:24:52 +02:00
|
|
|
void assert_cpath_layer_ok(const crypt_path_t *c);
|
|
|
|
void assert_circuit_ok(const circuit_t *c);
|
2003-09-16 21:36:19 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/********************************* command.c ***************************/
|
|
|
|
|
|
|
|
void command_process_cell(cell_t *cell, connection_t *conn);
|
|
|
|
|
2003-10-02 22:00:38 +02:00
|
|
|
extern unsigned long stats_n_padding_cells_processed;
|
|
|
|
extern unsigned long stats_n_create_cells_processed;
|
|
|
|
extern unsigned long stats_n_created_cells_processed;
|
|
|
|
extern unsigned long stats_n_relay_cells_processed;
|
|
|
|
extern unsigned long stats_n_destroy_cells_processed;
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/********************************* config.c ***************************/
|
|
|
|
|
2004-03-31 23:35:23 +02:00
|
|
|
struct config_line_t {
|
|
|
|
char *key;
|
|
|
|
char *value;
|
|
|
|
struct config_line_t *next;
|
|
|
|
};
|
|
|
|
|
2004-02-26 23:56:36 +01:00
|
|
|
int config_assign_default_dirservers(void);
|
2004-08-16 13:43:18 +02:00
|
|
|
int resolve_my_address(const char *address, uint32_t *addr);
|
2002-11-23 07:49:01 +01:00
|
|
|
int getconfig(int argc, char **argv, or_options_t *options);
|
2004-05-20 21:47:28 +02:00
|
|
|
int config_init_logs(or_options_t *options);
|
2004-05-20 04:42:50 +02:00
|
|
|
void config_parse_exit_policy(struct config_line_t *cfg,
|
|
|
|
struct exit_policy_t **dest);
|
|
|
|
void exit_policy_free(struct exit_policy_t *p);
|
2004-06-21 06:37:27 +02:00
|
|
|
const char *get_data_directory(or_options_t *options);
|
2002-07-03 18:31:22 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/********************************* connection.c ***************************/
|
|
|
|
|
2004-03-14 17:00:52 +01:00
|
|
|
#define CONN_TYPE_TO_STRING(t) (((t) < _CONN_TYPE_MIN || (t) > _CONN_TYPE_MAX) ? \
|
|
|
|
"Unknown" : conn_type_to_string[(t)])
|
2004-03-11 07:19:08 +01:00
|
|
|
|
|
|
|
extern char *conn_type_to_string[];
|
2004-05-13 09:24:49 +02:00
|
|
|
extern char *conn_state_to_string[][_CONN_TYPE_MAX+1];
|
2004-03-11 07:19:08 +01:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_t *connection_new(int type);
|
|
|
|
void connection_free(connection_t *conn);
|
2004-01-06 08:53:40 +01:00
|
|
|
void connection_free_all(void);
|
2004-05-12 22:36:44 +02:00
|
|
|
void connection_about_to_close_connection(connection_t *conn);
|
2004-02-28 20:14:11 +01:00
|
|
|
void connection_close_immediate(connection_t *conn);
|
2004-05-12 23:12:33 +02:00
|
|
|
int _connection_mark_for_close(connection_t *conn);
|
2004-02-27 23:00:26 +01:00
|
|
|
|
2004-05-12 23:12:33 +02:00
|
|
|
#define connection_mark_for_close(c) \
|
2004-02-27 23:00:26 +01:00
|
|
|
do { \
|
2004-05-12 23:12:33 +02:00
|
|
|
if (_connection_mark_for_close(c)<0) { \
|
2004-02-28 05:11:53 +01:00
|
|
|
log(LOG_WARN,"Duplicate call to connection_mark_for_close at %s:%d (first at %s:%d)", \
|
|
|
|
__FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \
|
|
|
|
} else { \
|
|
|
|
c->marked_for_close_file = __FILE__; \
|
|
|
|
c->marked_for_close = __LINE__; \
|
2004-02-27 23:00:26 +01:00
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2004-03-03 06:08:01 +01:00
|
|
|
void connection_expire_held_open(void);
|
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
int connection_connect(connection_t *conn, char *address, uint32_t addr, uint16_t port);
|
2004-07-20 12:17:43 +02:00
|
|
|
int retry_all_listeners(void);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-03-14 18:06:29 +01:00
|
|
|
void connection_bucket_init(void);
|
|
|
|
void connection_bucket_refill(struct timeval *now);
|
|
|
|
|
2003-09-05 08:04:03 +02:00
|
|
|
int connection_handle_read(connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
int connection_fetch_from_buf(char *string, size_t len, connection_t *conn);
|
2003-09-16 07:41:49 +02:00
|
|
|
|
2002-07-18 08:37:58 +02:00
|
|
|
int connection_wants_to_flush(connection_t *conn);
|
2003-09-16 07:41:49 +02:00
|
|
|
int connection_outbuf_too_full(connection_t *conn);
|
2003-09-05 08:04:03 +02:00
|
|
|
int connection_handle_write(connection_t *conn);
|
2004-10-14 04:47:09 +02:00
|
|
|
void connection_write_to_buf(const char *string, size_t len, connection_t *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
|
|
|
|
2003-09-30 21:06:22 +02:00
|
|
|
connection_t *connection_exact_get_by_addr_port(uint32_t addr, uint16_t port);
|
2004-07-01 03:16:59 +02:00
|
|
|
connection_t *connection_get_by_identity_digest(const char *digest, int type);
|
2003-09-30 21:06:22 +02:00
|
|
|
|
|
|
|
connection_t *connection_get_by_type(int type);
|
|
|
|
connection_t *connection_get_by_type_state(int type, int state);
|
|
|
|
connection_t *connection_get_by_type_state_lastwritten(int type, int state);
|
2004-05-06 13:08:04 +02:00
|
|
|
connection_t *connection_get_by_type_rendquery(int type, const char *rendquery);
|
2003-09-30 21:06:22 +02:00
|
|
|
|
2003-05-28 04:03:25 +02:00
|
|
|
#define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR)
|
2003-10-09 20:45:14 +02:00
|
|
|
#define connection_has_pending_tls_data(conn) \
|
|
|
|
((conn)->type == CONN_TYPE_OR && \
|
|
|
|
(conn)->state == OR_CONN_STATE_OPEN && \
|
2004-03-14 17:00:52 +01:00
|
|
|
tor_tls_get_pending_bytes((conn)->tls))
|
2002-09-22 00:41:48 +02:00
|
|
|
int connection_is_listener(connection_t *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
|
|
|
int connection_state_is_open(connection_t *conn);
|
2004-05-12 21:17:09 +02:00
|
|
|
int connection_state_is_connecting(connection_t *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
|
|
|
|
2003-12-19 20:55:02 +01:00
|
|
|
int connection_send_destroy(uint16_t circ_id, connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-16 21:36:19 +02:00
|
|
|
void assert_connection_ok(connection_t *conn, time_t now);
|
2004-10-13 22:05:57 +02:00
|
|
|
int connection_or_nonopen_was_started_here(connection_t *conn);
|
2003-09-16 21:36:19 +02:00
|
|
|
|
2003-04-12 00:11:11 +02:00
|
|
|
/********************************* connection_edge.c ***************************/
|
|
|
|
|
|
|
|
int connection_edge_process_inbuf(connection_t *conn);
|
2004-02-29 01:11:37 +01:00
|
|
|
int connection_edge_destroy(uint16_t circ_id, connection_t *conn);
|
2003-12-14 09:32:14 +01:00
|
|
|
int connection_edge_end(connection_t *conn, char reason, crypt_path_t *cpath_layer);
|
2003-04-12 00:11:11 +02:00
|
|
|
int connection_edge_finished_flushing(connection_t *conn);
|
2004-05-12 21:17:09 +02:00
|
|
|
int connection_edge_finished_connecting(connection_t *conn);
|
2003-04-12 00:11:11 +02:00
|
|
|
|
2004-04-05 09:41:31 +02:00
|
|
|
int connection_ap_handshake_send_begin(connection_t *ap_conn, circuit_t *circ);
|
2004-06-17 20:13:09 +02:00
|
|
|
int connection_ap_handshake_send_resolve(connection_t *ap_conn, circuit_t *circ);
|
2004-04-03 01:54:48 +02:00
|
|
|
|
2004-04-01 00:02:13 +02:00
|
|
|
int connection_ap_make_bridge(char *address, uint16_t port);
|
2004-03-27 06:45:52 +01:00
|
|
|
void connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t replylen, int success);
|
2004-06-17 20:13:09 +02:00
|
|
|
void connection_ap_handshake_socks_resolved(connection_t *conn,
|
|
|
|
int answer_type,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t answer_len,
|
2004-06-17 20:13:09 +02:00
|
|
|
const char *answer);
|
2004-03-27 06:45:52 +01:00
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
int connection_exit_begin_conn(cell_t *cell, circuit_t *circ);
|
2004-06-17 20:13:09 +02:00
|
|
|
int connection_exit_begin_resolve(cell_t *cell, circuit_t *circ);
|
2003-10-22 09:55:44 +02:00
|
|
|
void connection_exit_connect(connection_t *conn);
|
2004-04-06 23:52:01 +02:00
|
|
|
int connection_edge_is_rendezvous_stream(connection_t *conn);
|
2003-12-06 07:01:42 +01:00
|
|
|
int connection_ap_can_use_exit(connection_t *conn, routerinfo_t *exit);
|
2004-01-20 10:21:46 +01:00
|
|
|
void connection_ap_expire_beginning(void);
|
2003-11-11 03:41:31 +01:00
|
|
|
void connection_ap_attach_pending(void);
|
|
|
|
|
2004-05-20 06:16:43 +02:00
|
|
|
int socks_policy_permits_address(uint32_t addr);
|
|
|
|
|
2003-11-16 18:00:02 +01:00
|
|
|
void client_dns_init(void);
|
2004-05-13 09:24:49 +02:00
|
|
|
uint32_t client_dns_lookup_entry(const char *address);
|
|
|
|
int client_dns_incr_failures(const char *address);
|
|
|
|
void client_dns_set_entry(const char *address, uint32_t val);
|
2003-11-16 22:49:52 +01:00
|
|
|
void client_dns_clean(void);
|
2003-11-16 18:00:02 +01:00
|
|
|
|
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
|
|
|
/********************************* connection_or.c ***************************/
|
2002-06-27 00:45:49 +02:00
|
|
|
|
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
|
|
|
int connection_or_process_inbuf(connection_t *conn);
|
|
|
|
int connection_or_finished_flushing(connection_t *conn);
|
2004-05-12 21:17:09 +02:00
|
|
|
int connection_or_finished_connecting(connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-07-02 11:29:01 +02:00
|
|
|
connection_t *connection_or_connect(uint32_t addr, uint16_t port,
|
|
|
|
const char *id_digest);
|
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
|
|
|
|
2003-09-30 20:45:55 +02:00
|
|
|
int connection_tls_start_handshake(connection_t *conn, int receiving);
|
|
|
|
int connection_tls_continue_handshake(connection_t *conn);
|
|
|
|
|
2003-12-23 08:45:31 +01:00
|
|
|
void connection_or_write_cell_to_buf(const cell_t *cell, connection_t *conn);
|
2004-10-13 03:13:37 +02:00
|
|
|
void connection_or_update_nickname(connection_t *conn);
|
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2003-08-21 01:05:22 +02:00
|
|
|
/********************************* cpuworker.c *****************************/
|
|
|
|
|
|
|
|
void cpu_init(void);
|
2004-04-25 00:17:50 +02:00
|
|
|
void cpuworkers_rotate(void);
|
2003-08-21 01:05:22 +02:00
|
|
|
int connection_cpu_finished_flushing(connection_t *conn);
|
|
|
|
int connection_cpu_process_inbuf(connection_t *conn);
|
|
|
|
int assign_to_cpuworker(connection_t *cpuworker, unsigned char question_type,
|
|
|
|
void *task);
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
/********************************* directory.c ***************************/
|
|
|
|
|
2004-05-13 01:48:57 +02:00
|
|
|
void directory_post_to_dirservers(uint8_t purpose, const char *payload,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t payload_len);
|
2004-05-13 01:48:57 +02:00
|
|
|
void directory_get_from_dirserver(uint8_t purpose, const char *payload,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t payload_len);
|
2002-09-26 14:09:10 +02:00
|
|
|
int connection_dir_process_inbuf(connection_t *conn);
|
|
|
|
int connection_dir_finished_flushing(connection_t *conn);
|
2004-05-12 21:17:09 +02:00
|
|
|
int connection_dir_finished_connecting(connection_t *conn);
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
/********************************* dirserv.c ***************************/
|
2004-05-13 09:24:49 +02:00
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
int dirserv_add_own_fingerprint(const char *nickname, crypto_pk_env_t *pk);
|
|
|
|
int dirserv_parse_fingerprint_file(const char *fname);
|
|
|
|
int dirserv_router_fingerprint_is_known(const routerinfo_t *router);
|
|
|
|
void dirserv_free_fingerprint_list();
|
2004-09-29 00:24:56 +02:00
|
|
|
const char *dirserv_get_nickname_by_digest(const char *digest);
|
2004-05-12 21:49:48 +02:00
|
|
|
int dirserv_add_descriptor(const char **desc);
|
2004-06-25 02:29:31 +02:00
|
|
|
int dirserv_load_from_directory_string(const char *dir);
|
2004-05-12 21:49:48 +02:00
|
|
|
void dirserv_free_descriptors();
|
2004-08-07 00:15:25 +02:00
|
|
|
void dirserv_remove_old_servers(int age);
|
2004-10-14 05:13:08 +02:00
|
|
|
int dirserv_dump_directory_to_string(char *s, size_t maxlen,
|
2004-05-12 21:49:48 +02:00
|
|
|
crypto_pk_env_t *private_key);
|
|
|
|
void directory_set_dirty(void);
|
2004-09-27 08:57:16 +02:00
|
|
|
size_t dirserv_get_directory(const char **cp, int compress);
|
2004-06-16 23:08:29 +02:00
|
|
|
size_t dirserv_get_runningrouters(const char **rr);
|
2004-06-21 06:37:27 +02:00
|
|
|
void dirserv_set_cached_directory(const char *directory, time_t when);
|
2004-05-12 21:49:48 +02:00
|
|
|
|
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
|
|
|
/********************************* dns.c ***************************/
|
|
|
|
|
2003-06-25 09:19:30 +02:00
|
|
|
void dns_init(void);
|
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
|
|
|
int connection_dns_finished_flushing(connection_t *conn);
|
|
|
|
int connection_dns_process_inbuf(connection_t *conn);
|
2004-06-07 22:00:30 +02:00
|
|
|
void dnsworkers_rotate(void);
|
2004-02-28 23:23:44 +01:00
|
|
|
void connection_dns_remove(connection_t *conn);
|
2004-03-28 06:54:36 +02:00
|
|
|
void assert_connection_edge_not_dns_pending(connection_t *conn);
|
2004-04-09 11:39:42 +02:00
|
|
|
void assert_all_pending_dns_resolves_ok(void);
|
2004-02-28 23:23:44 +01:00
|
|
|
void dns_cancel_pending_resolve(char *question);
|
2003-02-14 08:53:55 +01:00
|
|
|
int dns_resolve(connection_t *exitconn);
|
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
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/********************************* main.c ***************************/
|
|
|
|
|
|
|
|
int connection_add(connection_t *conn);
|
|
|
|
int connection_remove(connection_t *conn);
|
2004-06-02 00:09:58 +02:00
|
|
|
int connection_in_array(connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-30 21:27:54 +02:00
|
|
|
void get_connection_array(connection_t ***array, int *n);
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
void connection_watch_events(connection_t *conn, short events);
|
2003-09-07 12:24:40 +02:00
|
|
|
int connection_is_reading(connection_t *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
|
|
|
void connection_stop_reading(connection_t *conn);
|
|
|
|
void connection_start_reading(connection_t *conn);
|
2004-03-03 06:08:01 +01:00
|
|
|
|
2004-02-27 05:42:14 +01:00
|
|
|
int connection_is_writing(connection_t *conn);
|
2002-07-18 08:37:58 +02:00
|
|
|
void connection_stop_writing(connection_t *conn);
|
|
|
|
void connection_start_writing(connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2004-04-01 00:02:13 +02:00
|
|
|
void directory_has_arrived(void);
|
2004-07-20 12:17:43 +02:00
|
|
|
int authdir_mode(void);
|
2004-07-18 23:47:04 +02:00
|
|
|
int clique_mode(void);
|
|
|
|
int server_mode(void);
|
2004-07-21 02:21:26 +02:00
|
|
|
int advertised_server_mode(void);
|
2004-07-18 23:47:04 +02:00
|
|
|
int proxy_mode(void);
|
2004-04-01 00:02:13 +02:00
|
|
|
|
2004-08-08 09:25:45 +02:00
|
|
|
void handle_signals(int is_parent);
|
2004-07-23 00:15:36 +02:00
|
|
|
void tor_cleanup(void);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/********************************* onion.c ***************************/
|
|
|
|
|
2002-11-27 05:08:20 +01:00
|
|
|
int onion_pending_add(circuit_t *circ);
|
2003-08-21 01:05:22 +02:00
|
|
|
circuit_t *onion_next_task(void);
|
2002-11-27 05:08:20 +01:00
|
|
|
void onion_pending_remove(circuit_t *circ);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-05-05 06:27:00 +02:00
|
|
|
int onion_skin_create(crypto_pk_env_t *router_key,
|
|
|
|
crypto_dh_env_t **handshake_state_out,
|
2003-12-16 09:21:58 +01:00
|
|
|
char *onion_skin_out);
|
2003-05-05 06:27:00 +02:00
|
|
|
|
2003-12-16 09:21:58 +01:00
|
|
|
int onion_skin_server_handshake(char *onion_skin,
|
2003-05-05 06:27:00 +02:00
|
|
|
crypto_pk_env_t *private_key,
|
2004-04-25 00:17:50 +02:00
|
|
|
crypto_pk_env_t *prev_private_key,
|
2003-12-16 09:21:58 +01:00
|
|
|
char *handshake_reply_out,
|
2003-05-05 06:27:00 +02:00
|
|
|
char *key_out,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t key_out_len);
|
2003-05-05 06:27:00 +02:00
|
|
|
|
|
|
|
int onion_skin_client_handshake(crypto_dh_env_t *handshake_state,
|
2003-12-16 09:21:58 +01:00
|
|
|
char *handshake_reply,
|
2003-05-05 06:27:00 +02:00
|
|
|
char *key_out,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t key_out_len);
|
2003-05-05 06:27:00 +02:00
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
/********************************* relay.c ***************************/
|
2004-05-10 19:30:51 +02:00
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
extern unsigned long stats_n_relay_cells_relayed;
|
|
|
|
extern unsigned long stats_n_relay_cells_delivered;
|
2003-09-27 23:30:10 +02:00
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
|
|
|
|
int cell_direction);
|
2003-09-27 23:30:10 +02:00
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
void relay_header_pack(char *dest, const relay_header_t *src);
|
|
|
|
void relay_header_unpack(relay_header_t *dest, const char *src);
|
|
|
|
int connection_edge_send_command(connection_t *fromconn, circuit_t *circ,
|
|
|
|
int relay_command, const char *payload,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t payload_len, crypt_path_t *cpath_layer);
|
2004-05-13 09:24:49 +02:00
|
|
|
int connection_edge_package_raw_inbuf(connection_t *conn);
|
|
|
|
void connection_edge_consider_sending_sendme(connection_t *conn);
|
|
|
|
|
|
|
|
extern uint64_t stats_n_data_cells_packaged;
|
|
|
|
extern uint64_t stats_n_data_bytes_packaged;
|
|
|
|
extern uint64_t stats_n_data_cells_received;
|
|
|
|
extern uint64_t stats_n_data_bytes_received;
|
|
|
|
|
2004-03-20 02:48:05 +01:00
|
|
|
/********************************* rephist.c ***************************/
|
|
|
|
|
|
|
|
void rep_hist_init(void);
|
|
|
|
void rep_hist_note_connect_failed(const char* nickname, time_t when);
|
|
|
|
void rep_hist_note_connect_succeeded(const char* nickname, time_t when);
|
2004-03-20 05:59:29 +01:00
|
|
|
void rep_hist_note_disconnect(const char* nickname, time_t when);
|
2004-03-20 02:48:05 +01:00
|
|
|
void rep_hist_note_connection_died(const char* nickname, time_t when);
|
|
|
|
void rep_hist_note_extend_succeeded(const char *from_name,
|
2004-04-03 00:23:15 +02:00
|
|
|
const char *to_name);
|
2004-03-20 02:48:05 +01:00
|
|
|
void rep_hist_note_extend_failed(const char *from_name, const char *to_name);
|
2004-03-20 05:59:29 +01:00
|
|
|
void rep_hist_dump_stats(time_t now, int severity);
|
2004-07-20 22:57:46 +02:00
|
|
|
void rep_hist_note_bytes_read(int num_bytes, time_t when);
|
|
|
|
void rep_hist_note_bytes_written(int num_bytes, time_t when);
|
2004-08-07 04:46:16 +02:00
|
|
|
int rep_hist_bandwidth_assess(void);
|
|
|
|
char *rep_hist_get_bandwidth_lines(void);
|
2004-03-20 02:48:05 +01:00
|
|
|
|
2004-04-03 00:23:15 +02:00
|
|
|
/********************************* rendclient.c ***************************/
|
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
void rend_client_introcirc_has_opened(circuit_t *circ);
|
|
|
|
void rend_client_rendcirc_has_opened(circuit_t *circ);
|
2004-10-14 04:47:09 +02:00
|
|
|
int rend_client_introduction_acked(circuit_t *circ, const char *request, size_t request_len);
|
2004-05-05 23:32:43 +02:00
|
|
|
void rend_client_refetch_renddesc(const char *query);
|
|
|
|
int rend_client_remove_intro_point(char *failed_intro, const char *query);
|
2004-10-14 04:47:09 +02:00
|
|
|
int rend_client_rendezvous_acked(circuit_t *circ, const char *request, size_t request_len);
|
|
|
|
int rend_client_receive_rendezvous(circuit_t *circ, const char *request, size_t request_len);
|
2004-04-03 01:38:26 +02:00
|
|
|
void rend_client_desc_fetched(char *query, int success);
|
2004-04-03 00:23:15 +02:00
|
|
|
|
2004-04-05 19:51:00 +02:00
|
|
|
char *rend_client_get_random_intro(char *query);
|
2004-04-03 03:59:53 +02:00
|
|
|
int rend_parse_rendezvous_address(char *address);
|
|
|
|
|
2004-04-05 09:41:31 +02:00
|
|
|
int rend_client_send_introduction(circuit_t *introcirc, circuit_t *rendcirc);
|
2004-04-03 06:22:22 +02:00
|
|
|
|
2004-03-30 21:52:42 +02:00
|
|
|
/********************************* rendcommon.c ***************************/
|
|
|
|
|
2004-03-31 04:07:38 +02:00
|
|
|
typedef struct rend_service_descriptor_t {
|
|
|
|
crypto_pk_env_t *pk;
|
|
|
|
time_t timestamp;
|
|
|
|
int n_intro_points;
|
|
|
|
char **intro_points;
|
|
|
|
} rend_service_descriptor_t;
|
|
|
|
|
2004-05-12 22:58:27 +02:00
|
|
|
int rend_cmp_service_ids(const char *one, const char *two);
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
void rend_process_relay_cell(circuit_t *circ, int command, size_t length,
|
2004-04-03 05:37:11 +02:00
|
|
|
const char *payload);
|
|
|
|
|
2004-03-31 04:07:38 +02:00
|
|
|
void rend_service_descriptor_free(rend_service_descriptor_t *desc);
|
|
|
|
int rend_encode_service_descriptor(rend_service_descriptor_t *desc,
|
|
|
|
crypto_pk_env_t *key,
|
|
|
|
char **str_out,
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t *len_out);
|
|
|
|
rend_service_descriptor_t *rend_parse_service_descriptor(const char *str, size_t len);
|
2004-03-31 05:42:56 +02:00
|
|
|
int rend_get_service_id(crypto_pk_env_t *pk, char *out);
|
|
|
|
|
2004-04-08 00:00:54 +02:00
|
|
|
typedef struct rend_cache_entry_t {
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t len; /* Length of desc */
|
2004-04-08 00:00:54 +02:00
|
|
|
time_t received; /* When did we get the descriptor? */
|
|
|
|
char *desc; /* Service descriptor */
|
|
|
|
rend_service_descriptor_t *parsed; /* Parsed value of 'desc' */
|
|
|
|
} rend_cache_entry_t;
|
|
|
|
|
2004-03-31 06:10:10 +02:00
|
|
|
void rend_cache_init(void);
|
|
|
|
void rend_cache_clean(void);
|
2004-05-05 23:32:43 +02:00
|
|
|
int rend_valid_service_id(const char *query);
|
2004-10-14 04:47:09 +02:00
|
|
|
int rend_cache_lookup_desc(const char *query, const char **desc, size_t *desc_len);
|
2004-05-05 23:32:43 +02:00
|
|
|
int rend_cache_lookup_entry(const char *query, rend_cache_entry_t **entry_out);
|
2004-10-14 04:47:09 +02:00
|
|
|
int rend_cache_store(const char *desc, size_t desc_len);
|
2004-03-31 04:07:38 +02:00
|
|
|
|
2004-03-31 23:35:23 +02:00
|
|
|
/********************************* rendservice.c ***************************/
|
|
|
|
|
|
|
|
int rend_config_services(or_options_t *options);
|
2004-04-13 19:16:47 +02:00
|
|
|
int rend_service_load_keys(void);
|
2004-04-13 07:20:52 +02:00
|
|
|
void rend_services_init(void);
|
2004-04-13 19:16:47 +02:00
|
|
|
void rend_services_introduce(void);
|
|
|
|
void rend_services_upload(int force);
|
2004-03-31 23:35:23 +02:00
|
|
|
|
2004-05-13 09:24:49 +02:00
|
|
|
void rend_service_intro_has_opened(circuit_t *circuit);
|
2004-10-14 04:47:09 +02:00
|
|
|
int rend_service_intro_established(circuit_t *circuit, const char *request, size_t request_len);
|
2004-05-13 09:24:49 +02:00
|
|
|
void rend_service_rendezvous_has_opened(circuit_t *circuit);
|
2004-10-14 04:47:09 +02:00
|
|
|
int rend_service_introduce(circuit_t *circuit, const char *request, size_t request_len);
|
2004-04-14 23:40:50 +02:00
|
|
|
void rend_service_relaunch_rendezvous(circuit_t *oldcirc);
|
2004-04-07 00:05:49 +02:00
|
|
|
int rend_service_set_connection_addr_port(connection_t *conn, circuit_t *circ);
|
2004-04-09 22:02:16 +02:00
|
|
|
void rend_service_dump_stats(int severity);
|
2004-04-03 05:37:11 +02:00
|
|
|
|
|
|
|
/********************************* rendmid.c *******************************/
|
2004-10-14 04:47:09 +02:00
|
|
|
int rend_mid_establish_intro(circuit_t *circ, const char *request, size_t request_len);
|
|
|
|
int rend_mid_introduce(circuit_t *circ, const char *request, size_t request_len);
|
|
|
|
int rend_mid_establish_rendezvous(circuit_t *circ, const char *request, size_t request_len);
|
|
|
|
int rend_mid_rendezvous(circuit_t *circ, const char *request, size_t request_len);
|
2004-04-02 00:21:01 +02:00
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
/********************************* router.c ***************************/
|
|
|
|
|
|
|
|
void set_onion_key(crypto_pk_env_t *k);
|
|
|
|
crypto_pk_env_t *get_onion_key(void);
|
|
|
|
crypto_pk_env_t *get_previous_onion_key(void);
|
|
|
|
time_t get_onion_key_set_at(void);
|
|
|
|
void set_identity_key(crypto_pk_env_t *k);
|
|
|
|
crypto_pk_env_t *get_identity_key(void);
|
2004-06-05 03:50:35 +02:00
|
|
|
void dup_onion_keys(crypto_pk_env_t **key, crypto_pk_env_t **last);
|
2004-05-12 21:49:48 +02:00
|
|
|
int init_keys(void);
|
|
|
|
crypto_pk_env_t *init_key_from_file(const char *fname);
|
|
|
|
void rotate_onion_key(void);
|
2004-08-15 10:15:12 +02:00
|
|
|
void router_set_bandwidth_capacity(int bw);
|
|
|
|
int router_get_bandwidth_capacity(void);
|
2004-05-12 21:49:48 +02:00
|
|
|
|
|
|
|
void router_retry_connections(void);
|
2004-07-20 21:45:29 +02:00
|
|
|
int router_is_clique_mode(routerinfo_t *router);
|
2004-05-12 21:49:48 +02:00
|
|
|
void router_upload_dir_desc_to_dirservers(void);
|
|
|
|
int router_compare_to_my_exit_policy(connection_t *conn);
|
|
|
|
routerinfo_t *router_get_my_routerinfo(void);
|
|
|
|
const char *router_get_my_descriptor(void);
|
|
|
|
int router_is_me(routerinfo_t *router);
|
|
|
|
int router_rebuild_descriptor(void);
|
2004-10-14 04:47:09 +02:00
|
|
|
int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
|
2004-05-12 21:49:48 +02:00
|
|
|
crypto_pk_env_t *ident_key);
|
2004-08-18 06:44:24 +02:00
|
|
|
int is_legal_nickname(const char *s);
|
|
|
|
int is_legal_nickname_or_hexdigest(const char *s);
|
2004-05-12 21:49:48 +02:00
|
|
|
|
|
|
|
/********************************* routerlist.c ***************************/
|
|
|
|
|
2004-10-12 17:55:20 +02:00
|
|
|
typedef struct trusted_dir_server_t {
|
|
|
|
char *address;
|
|
|
|
uint32_t addr;
|
|
|
|
uint16_t dir_port;
|
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
int is_running;
|
|
|
|
} trusted_dir_server_t;
|
|
|
|
|
2004-09-08 08:52:33 +02:00
|
|
|
int router_reload_router_list(void);
|
2004-10-14 03:44:32 +02:00
|
|
|
routerinfo_t *router_pick_directory_server(int requireothers);
|
2004-10-12 17:55:20 +02:00
|
|
|
trusted_dir_server_t *router_pick_trusteddirserver(int requireothers);
|
2004-10-14 03:44:32 +02:00
|
|
|
int all_trusted_directory_servers_down(void);
|
2004-05-12 21:49:48 +02:00
|
|
|
struct smartlist_t;
|
2004-10-15 03:58:11 +02:00
|
|
|
void routerlist_add_family(struct smartlist_t *sl, routerinfo_t *router);
|
2004-08-18 13:20:15 +02:00
|
|
|
void add_nickname_list_to_smartlist(struct smartlist_t *sl, const char *list, int warn_if_down);
|
2004-08-18 12:32:50 +02:00
|
|
|
routerinfo_t *routerlist_find_my_routerinfo(void);
|
2004-07-03 01:40:03 +02:00
|
|
|
int router_nickname_matches(routerinfo_t *router, const char *nickname);
|
2004-08-20 23:34:36 +02:00
|
|
|
int router_is_unreliable_router(routerinfo_t *router, int need_uptime, int need_bw);
|
2004-08-18 08:10:12 +02:00
|
|
|
routerinfo_t *routerlist_sl_choose_by_bandwidth(smartlist_t *sl);
|
2004-05-20 21:12:28 +02:00
|
|
|
routerinfo_t *router_choose_random_node(char *preferred, char *excluded,
|
2004-08-15 10:15:12 +02:00
|
|
|
struct smartlist_t *excludedsmartlist,
|
2004-08-15 22:14:44 +02:00
|
|
|
int preferuptime, int preferbandwidth,
|
2004-08-17 08:27:32 +02:00
|
|
|
int allow_unverified, int strict);
|
2004-05-12 21:49:48 +02:00
|
|
|
routerinfo_t *router_get_by_addr_port(uint32_t addr, uint16_t port);
|
2004-07-01 03:16:59 +02:00
|
|
|
routerinfo_t *router_get_by_nickname(const char *nickname);
|
|
|
|
routerinfo_t *router_get_by_hexdigest(const char *hexdigest);
|
|
|
|
routerinfo_t *router_get_by_digest(const char *digest);
|
2004-07-20 22:09:59 +02:00
|
|
|
int router_digest_is_trusted_dir(const char *digest);
|
2004-05-12 21:49:48 +02:00
|
|
|
void router_get_routerlist(routerlist_t **prouterlist);
|
|
|
|
void routerlist_free(routerlist_t *routerlist);
|
2004-05-17 22:31:01 +02:00
|
|
|
void routerlist_clear_trusted_directories(void);
|
2004-05-12 21:49:48 +02:00
|
|
|
void routerinfo_free(routerinfo_t *router);
|
|
|
|
routerinfo_t *routerinfo_copy(const routerinfo_t *router);
|
2004-07-03 01:40:03 +02:00
|
|
|
void router_mark_as_down(const char *digest);
|
2004-08-07 00:15:25 +02:00
|
|
|
void routerlist_remove_old_routers(int age);
|
2004-05-17 22:31:01 +02:00
|
|
|
int router_load_routerlist_from_file(char *routerfile, int trusted);
|
|
|
|
int router_load_routerlist_from_string(const char *s, int trusted);
|
2004-10-03 04:37:52 +02:00
|
|
|
int router_load_routerlist_from_directory(const char *s,crypto_pk_env_t *pkey,
|
|
|
|
int check_version);
|
2004-05-12 21:49:48 +02:00
|
|
|
int router_compare_addr_to_exit_policy(uint32_t addr, uint16_t port,
|
|
|
|
struct exit_policy_t *policy);
|
|
|
|
#define ADDR_POLICY_ACCEPTED 0
|
|
|
|
#define ADDR_POLICY_REJECTED -1
|
|
|
|
#define ADDR_POLICY_UNKNOWN 1
|
|
|
|
int router_exit_policy_all_routers_reject(uint32_t addr, uint16_t port);
|
|
|
|
int router_exit_policy_rejects_all(routerinfo_t *router);
|
2004-06-25 02:29:31 +02:00
|
|
|
void running_routers_free(running_routers_t *rr);
|
|
|
|
void routerlist_update_from_runningrouters(routerlist_t *list,
|
|
|
|
running_routers_t *rr);
|
2004-08-07 11:01:56 +02:00
|
|
|
int router_update_status_from_smartlist(routerinfo_t *r,
|
|
|
|
time_t list_time,
|
|
|
|
smartlist_t *running_list);
|
2004-10-12 17:55:20 +02:00
|
|
|
void add_trusted_dir_server(const char *addr, uint16_t port,const char *digest);
|
2004-10-13 21:56:42 +02:00
|
|
|
void clear_trusted_dir_servers(void);
|
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
|
|
|
|
/********************************* routerparse.c ************************/
|
|
|
|
|
2004-07-13 21:16:49 +02:00
|
|
|
typedef struct tor_version_t {
|
|
|
|
int major;
|
|
|
|
int minor;
|
|
|
|
int micro;
|
|
|
|
enum { VER_PRE=0, VER_RC=1, VER_RELEASE=2 } status;
|
|
|
|
int patchlevel;
|
|
|
|
enum { IS_CVS=0, IS_NOT_CVS=1} cvs;
|
|
|
|
} tor_version_t;
|
|
|
|
|
2004-05-12 21:49:48 +02:00
|
|
|
int router_get_router_hash(const char *s, char *digest);
|
|
|
|
int router_get_dir_hash(const char *s, char *digest);
|
2004-06-25 02:29:31 +02:00
|
|
|
int router_get_runningrouters_hash(const char *s, char *digest);
|
2004-05-12 21:49:48 +02:00
|
|
|
int router_parse_list_from_string(const char **s,
|
2004-07-17 01:05:40 +02:00
|
|
|
routerlist_t **dest,
|
2004-07-22 22:30:02 +02:00
|
|
|
smartlist_t *good_nickname_list,
|
|
|
|
time_t published);
|
2004-05-12 21:49:48 +02:00
|
|
|
int router_parse_routerlist_from_directory(const char *s,
|
|
|
|
routerlist_t **dest,
|
2004-10-03 04:37:52 +02:00
|
|
|
crypto_pk_env_t *pkey,
|
|
|
|
int check_version);
|
2004-06-25 02:29:31 +02:00
|
|
|
running_routers_t *router_parse_runningrouters(const char *str);
|
2004-05-12 21:49:48 +02:00
|
|
|
routerinfo_t *router_parse_entry_from_string(const char *s, const char *end);
|
|
|
|
int router_add_exit_policy_from_string(routerinfo_t *router, const char *s);
|
2004-05-20 04:42:50 +02:00
|
|
|
struct exit_policy_t *router_parse_exit_policy_from_string(const char *s);
|
2004-06-01 20:19:01 +02:00
|
|
|
int check_software_version_against_directory(const char *directory,
|
|
|
|
int ignoreversion);
|
2004-07-13 21:16:49 +02:00
|
|
|
int tor_version_parse(const char *s, tor_version_t *out);
|
2004-09-27 08:00:43 +02:00
|
|
|
int tor_version_as_new_as(const char *platform, const char *cutoff);
|
2004-07-13 21:16:49 +02:00
|
|
|
int tor_version_compare(tor_version_t *a, tor_version_t *b);
|
2004-05-12 21:49:48 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#endif
|
2003-04-07 04:12:02 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|