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$ */
|
|
|
|
|
|
|
|
#ifndef __OR_H
|
|
|
|
#define __OR_H
|
|
|
|
|
2002-09-03 20:44:24 +02:00
|
|
|
#include "orconfig.h"
|
|
|
|
|
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
|
|
|
#ifdef HAVE_SYS_POLL_H
|
2002-06-27 00:45:49 +02:00
|
|
|
#include <sys/poll.h>
|
2002-09-03 20:44:24 +02:00
|
|
|
#elif HAVE_POLL_H
|
|
|
|
#include <poll.h>
|
|
|
|
#else
|
|
|
|
#include "../common/fakepoll.h"
|
|
|
|
#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
|
2003-10-22 08:03:11 +02:00
|
|
|
#ifdef HAVE_PWD_H
|
|
|
|
#include <pwd.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_GRP_H
|
|
|
|
#include <grp.h>
|
|
|
|
#endif
|
2003-08-12 05:08:41 +02:00
|
|
|
#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>
|
2003-08-12 05:08:41 +02:00
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
#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"
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-02-18 02:35:55 +01:00
|
|
|
#define MAXCONNECTIONS 1000 /* upper bound on max connections.
|
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
|
|
|
can be lowered by config file */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-02-18 02:55:51 +01:00
|
|
|
#define DEFAULT_BANDWIDTH_OP (1024 * 1000)
|
2003-09-26 20:27:35 +02:00
|
|
|
#define MAX_NICKNAME_LEN 32
|
2003-09-27 23:30:10 +02:00
|
|
|
#define MAX_DIR_SIZE 50000 /* XXX, big enough? */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
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
|
2002-06-27 00:45:49 +02:00
|
|
|
#define CONN_TYPE_OR_LISTENER 3
|
|
|
|
#define CONN_TYPE_OR 4
|
2002-06-30 09:37:49 +02:00
|
|
|
#define CONN_TYPE_EXIT 5
|
|
|
|
#define CONN_TYPE_AP_LISTENER 6
|
|
|
|
#define CONN_TYPE_AP 7
|
2002-09-26 14:09:10 +02:00
|
|
|
#define CONN_TYPE_DIR_LISTENER 8
|
|
|
|
#define CONN_TYPE_DIR 9
|
2003-06-17 16:31:05 +02:00
|
|
|
#define CONN_TYPE_DNSWORKER 10
|
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
|
|
|
|
|
|
|
#define LISTENER_STATE_READY 0
|
|
|
|
|
2003-09-30 10:18:10 +02:00
|
|
|
#define _DNSWORKER_STATE_MIN 1
|
|
|
|
#define DNSWORKER_STATE_IDLE 1
|
|
|
|
#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
|
|
|
|
#define CPUWORKER_STATE_IDLE 1
|
|
|
|
#define CPUWORKER_STATE_BUSY_ONION 2
|
|
|
|
#define CPUWORKER_STATE_BUSY_HANDSHAKE 3
|
|
|
|
#define _CPUWORKER_STATE_MAX 3
|
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
|
|
|
|
#define OR_CONN_STATE_CONNECTING 1 /* waiting for connect() to finish */
|
|
|
|
#define OR_CONN_STATE_HANDSHAKING 2 /* SSL is handshaking, not done yet */
|
|
|
|
#define OR_CONN_STATE_OPEN 3 /* ready to send/receive cells. */
|
|
|
|
#define _OR_CONN_STATE_MAX 3
|
|
|
|
|
|
|
|
#define _EXIT_CONN_STATE_MIN 1
|
|
|
|
#define EXIT_CONN_STATE_RESOLVING 1 /* waiting for response from dns farm */
|
|
|
|
#define EXIT_CONN_STATE_CONNECTING 2 /* waiting for connect() to finish */
|
|
|
|
#define EXIT_CONN_STATE_OPEN 3
|
|
|
|
#define _EXIT_CONN_STATE_MAX 3
|
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 */
|
|
|
|
#define _AP_CONN_STATE_MIN 4
|
|
|
|
#define AP_CONN_STATE_SOCKS_WAIT 4
|
2003-11-11 03:41:31 +01:00
|
|
|
#define AP_CONN_STATE_CIRCUIT_WAIT 5
|
2003-09-27 09:33:07 +02:00
|
|
|
#define AP_CONN_STATE_OPEN 6
|
|
|
|
#define _AP_CONN_STATE_MAX 6
|
|
|
|
|
|
|
|
#define _DIR_CONN_STATE_MIN 1
|
|
|
|
#define DIR_CONN_STATE_CONNECTING_FETCH 1
|
|
|
|
#define DIR_CONN_STATE_CONNECTING_UPLOAD 2
|
|
|
|
#define DIR_CONN_STATE_CLIENT_SENDING_FETCH 3
|
|
|
|
#define DIR_CONN_STATE_CLIENT_SENDING_UPLOAD 4
|
|
|
|
#define DIR_CONN_STATE_CLIENT_READING_FETCH 5
|
|
|
|
#define DIR_CONN_STATE_CLIENT_READING_UPLOAD 6
|
|
|
|
#define DIR_CONN_STATE_SERVER_COMMAND_WAIT 7
|
|
|
|
#define DIR_CONN_STATE_SERVER_WRITING 8
|
|
|
|
#define _DIR_CONN_STATE_MAX 8
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-05-06 01:24:46 +02:00
|
|
|
#define CIRCUIT_STATE_BUILDING 0 /* I'm the OP, still haven't done all my handshakes */
|
2003-09-16 22:57:09 +02:00
|
|
|
#define CIRCUIT_STATE_ONIONSKIN_PENDING 1 /* waiting to process the onionskin */
|
2003-05-06 01:24:46 +02:00
|
|
|
#define CIRCUIT_STATE_OR_WAIT 2 /* I'm the OP, my firsthop is still connecting */
|
2003-09-16 22:57:09 +02:00
|
|
|
#define CIRCUIT_STATE_OPEN 3 /* onionskin(s) processed, ready to send/receive cells */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
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
|
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-05-02 23:29:25 +02:00
|
|
|
#define RELAY_HEADER_SIZE 8
|
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-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
|
|
|
|
|
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
|
|
|
/* default cipher function */
|
2003-07-08 10:38:24 +02:00
|
|
|
#define DEFAULT_CIPHER CRYPTO_CIPHER_AES_CTR
|
2003-07-30 21:12:03 +02:00
|
|
|
/* Used to en/decrypt onion skins */
|
|
|
|
#define ONION_CIPHER DEFAULT_CIPHER
|
|
|
|
/* Used to en/decrypt RELAY cells */
|
|
|
|
#define CIRCUIT_CIPHER DEFAULT_CIPHER
|
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
|
|
|
|
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
|
2003-04-12 00:11:11 +02:00
|
|
|
#define EDGE_EXIT CONN_TYPE_EXIT
|
|
|
|
#define EDGE_AP CONN_TYPE_AP
|
2003-06-12 12:16:33 +02:00
|
|
|
#define CELL_DIRECTION(x) ((x) == EDGE_EXIT ? CELL_DIRECTION_IN : CELL_DIRECTION_OUT)
|
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
|
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
|
|
|
|
2003-03-24 05:02:24 +01:00
|
|
|
#define CELL_PAYLOAD_SIZE 248
|
|
|
|
#define CELL_NETWORK_SIZE 256
|
2002-07-19 20:48:28 +02:00
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
/* legal characters in a filename */
|
|
|
|
#define CONFIG_LEGAL_FILENAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-_/"
|
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-11-11 04:01:48 +01:00
|
|
|
typedef uint16_t circ_id_t;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-07-19 20:48:28 +02:00
|
|
|
/* cell definition */
|
2002-12-03 23:18:23 +01:00
|
|
|
typedef struct {
|
2003-11-11 04:01:48 +01:00
|
|
|
circ_id_t circ_id;
|
2002-07-19 20:48:28 +02:00
|
|
|
unsigned char command;
|
2003-05-02 23:29:25 +02:00
|
|
|
unsigned char length; /* of payload if relay cell */
|
2002-07-19 20:48:28 +02:00
|
|
|
uint32_t seq; /* sequence number */
|
2003-04-16 19:44:33 +02:00
|
|
|
|
2003-03-24 05:02:24 +01:00
|
|
|
unsigned char payload[CELL_PAYLOAD_SIZE];
|
2002-07-19 20:48:28 +02:00
|
|
|
} cell_t;
|
2003-05-01 08:42:29 +02:00
|
|
|
#define CELL_RELAY_COMMAND(c) (*(uint8_t*)((c).payload))
|
|
|
|
#define SET_CELL_RELAY_COMMAND(c,cmd) (*(uint8_t*)((c).payload) = (cmd))
|
2003-05-02 23:29:25 +02:00
|
|
|
#define STREAM_ID_SIZE 7
|
|
|
|
#define SET_CELL_STREAM_ID(c,id) memcpy((c).payload+1,(id),STREAM_ID_SIZE)
|
2003-11-14 21:45:47 +01:00
|
|
|
#define CELL_RELAY_COMMAND_END_REASON(c) (*(uint8_t)((c).payload+1))
|
2003-05-02 23:29:25 +02:00
|
|
|
|
|
|
|
#define ZERO_STREAM "\0\0\0\0\0\0\0\0"
|
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
|
|
|
|
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
|
|
|
struct connection_t {
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-07-05 07:46:06 +02:00
|
|
|
uint8_t type;
|
2003-09-05 08:04:03 +02:00
|
|
|
uint8_t state;
|
|
|
|
uint8_t wants_to_read; /* should we start reading again once
|
|
|
|
* the bandwidth throttler allows it?
|
|
|
|
*/
|
2003-09-07 12:24:40 +02:00
|
|
|
uint8_t wants_to_write; /* should we start writing again once
|
|
|
|
* the bandwidth throttler allows reads?
|
|
|
|
*/
|
2002-06-27 00:45:49 +02:00
|
|
|
int s; /* our socket */
|
2003-09-05 08:04:03 +02:00
|
|
|
int poll_index; /* index of this conn into the poll_array */
|
|
|
|
int marked_for_close; /* should we close this conn on the next
|
|
|
|
* iteration of the main loop?
|
|
|
|
*/
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
buf_t *inbuf;
|
2003-09-05 08:04:03 +02:00
|
|
|
int inbuf_reached_eof; /* did read() return 0 on this conn? */
|
2003-11-17 00:43:08 +01:00
|
|
|
time_t timestamp_lastread; /* when was the last time poll() said we could read? */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
buf_t *outbuf;
|
2002-08-24 06:59:21 +02:00
|
|
|
int outbuf_flushlen; /* how much data should we try to flush from the outbuf? */
|
2003-11-17 00:43:08 +01:00
|
|
|
time_t timestamp_lastwritten; /* when was the last time poll() said we could write? */
|
2002-10-02 01:37:31 +02:00
|
|
|
|
2003-11-17 00:43:08 +01:00
|
|
|
time_t timestamp_created; /* when was this connection_t created? */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-05 08:04:03 +02:00
|
|
|
uint32_t addr; /* these two uniquely identify a router. Both in host order. */
|
|
|
|
uint16_t port; /* if non-zero, they identify the guy on the other end
|
|
|
|
* of the connection. */
|
|
|
|
char *address; /* FQDN (or IP) of the guy on the other end.
|
|
|
|
* strdup into this, because free_connection frees it
|
|
|
|
*/
|
2003-09-25 07:17:11 +02:00
|
|
|
crypto_pk_env_t *onion_pkey; /* public RSA key for the other side's onions */
|
|
|
|
crypto_pk_env_t *link_pkey; /* public RSA key for the other side's TLS */
|
|
|
|
crypto_pk_env_t *identity_pkey; /* public RSA key for the other side's signing */
|
2003-09-27 23:30:10 +02:00
|
|
|
char *nickname;
|
2003-09-05 08:04:03 +02:00
|
|
|
|
|
|
|
/* Used only by OR connections: */
|
2003-09-08 07:16:18 +02:00
|
|
|
tor_tls *tls;
|
2003-11-11 04:01:48 +01:00
|
|
|
circ_id_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.*/
|
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: */
|
|
|
|
uint32_t bandwidth; /* connection bandwidth. */
|
|
|
|
int receiver_bucket; /* when this hits 0, stop receiving. Every second we
|
|
|
|
* add 'bandwidth' to this, capping it at 10*bandwidth.
|
|
|
|
*/
|
|
|
|
|
2003-09-05 08:04:03 +02:00
|
|
|
/* Used only by edge connections: */
|
2003-05-02 23:29:25 +02:00
|
|
|
char stream_id[STREAM_ID_SIZE];
|
2003-09-05 08:04:03 +02:00
|
|
|
struct connection_t *next_stream; /* points to the next stream at this edge, if any */
|
2003-05-02 23:29:25 +02:00
|
|
|
struct crypt_path_t *cpath_layer; /* a pointer to which node in the circ this conn exits at */
|
2003-09-05 08:04:03 +02:00
|
|
|
int package_window; /* how many more relay cells can i send into the circuit? */
|
|
|
|
int deliver_window; /* how many more relay cells can end at me? */
|
2002-09-22 13:09:07 +02:00
|
|
|
|
2003-09-05 08:04:03 +02:00
|
|
|
int done_sending; /* for half-open connections; not used currently */
|
|
|
|
int done_receiving;
|
2003-10-21 10:37:07 +02:00
|
|
|
char has_sent_end; /* for debugging: set once we've set the stream end,
|
|
|
|
and check in circuit_about_to_close_connection() */
|
2003-11-11 03:41:31 +01:00
|
|
|
|
|
|
|
/* Used only by AP connections */
|
|
|
|
socks_request_t *socks_request;
|
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
|
|
|
|
|
|
|
|
struct exit_policy_t {
|
|
|
|
char policy_type;
|
|
|
|
char *string;
|
2003-11-14 21:45:47 +01:00
|
|
|
uint32_t addr;
|
|
|
|
uint32_t msk;
|
|
|
|
uint16_t prt;
|
2003-04-07 06:38:19 +02:00
|
|
|
|
|
|
|
struct exit_policy_t *next;
|
|
|
|
};
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/* config stuff we know about the other ORs in the network */
|
2002-12-03 23:18:23 +01:00
|
|
|
typedef struct {
|
2002-06-27 00:45:49 +02:00
|
|
|
char *address;
|
2003-09-12 00:19:48 +02:00
|
|
|
char *nickname;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
uint32_t addr; /* all host order */
|
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
|
|
|
uint16_t or_port;
|
2003-10-21 11:48:17 +02:00
|
|
|
uint16_t socks_port;
|
2002-09-24 12:43:57 +02:00
|
|
|
uint16_t dir_port;
|
2003-09-26 20:27:35 +02:00
|
|
|
|
|
|
|
time_t published_on;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
crypto_pk_env_t *onion_pkey; /* public RSA key for onions */
|
|
|
|
crypto_pk_env_t *link_pkey; /* public RSA key for TLS */
|
|
|
|
crypto_pk_env_t *identity_pkey; /* public RSA key for signing */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-27 23:30:10 +02:00
|
|
|
int is_running;
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/* link info */
|
2002-09-24 12:43:57 +02:00
|
|
|
uint32_t bandwidth;
|
2003-04-07 06:38:19 +02:00
|
|
|
struct exit_policy_t *exit_policy;
|
2002-06-27 00:45:49 +02:00
|
|
|
} routerinfo_t;
|
|
|
|
|
2003-05-09 04:00:33 +02:00
|
|
|
#define MAX_ROUTERS_IN_DIR 1024
|
2003-05-06 19:38:16 +02:00
|
|
|
typedef struct {
|
|
|
|
routerinfo_t **routers;
|
|
|
|
int n_routers;
|
2003-05-09 04:25:37 +02:00
|
|
|
char *software_versions;
|
2003-09-27 23:30:10 +02:00
|
|
|
time_t published_on;
|
2003-12-05 10:51:49 +01:00
|
|
|
} routerlist_t;
|
2003-05-06 19:38:16 +02:00
|
|
|
|
2003-05-02 23:29:25 +02: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 */
|
|
|
|
crypto_cipher_env_t *f_crypto;
|
|
|
|
crypto_cipher_env_t *b_crypto;
|
2003-05-02 00:55:51 +02:00
|
|
|
|
2003-05-06 01:24:46 +02:00
|
|
|
crypto_dh_env_t *handshake_state;
|
|
|
|
|
|
|
|
uint32_t addr;
|
|
|
|
uint16_t port;
|
|
|
|
|
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
|
2003-05-02 23:29:25 +02:00
|
|
|
struct crypt_path_t *next;
|
|
|
|
struct crypt_path_t *prev; /* doubly linked list */
|
|
|
|
|
2003-05-20 08:41:23 +02:00
|
|
|
int package_window;
|
|
|
|
int deliver_window;
|
2003-05-02 23:29:25 +02:00
|
|
|
};
|
2003-05-02 00:55:51 +02:00
|
|
|
|
2003-05-07 04:28:42 +02:00
|
|
|
#define DH_KEY_LEN CRYPTO_DH_SIZE
|
|
|
|
#define DH_ONIONSKIN_LEN DH_KEY_LEN+16
|
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
|
|
|
|
2003-11-16 18:00:02 +01:00
|
|
|
typedef struct {
|
|
|
|
int desired_path_len;
|
|
|
|
char *chosen_exit; /* nickname of planned exit node */
|
|
|
|
} cpath_build_state_t;
|
2003-11-14 21:45:47 +01:00
|
|
|
|
2003-04-16 08:18:31 +02:00
|
|
|
/* struct for a path (circuit) through the network */
|
2003-08-21 01:05:22 +02:00
|
|
|
struct circuit_t {
|
2002-06-27 00:45:49 +02:00
|
|
|
uint32_t n_addr;
|
|
|
|
uint16_t n_port;
|
|
|
|
connection_t *p_conn;
|
2003-05-28 01:39:04 +02:00
|
|
|
connection_t *n_conn; /* for the OR conn, if there is one */
|
|
|
|
connection_t *p_streams;
|
|
|
|
connection_t *n_streams;
|
2003-05-20 08:41:23 +02:00
|
|
|
int package_window;
|
|
|
|
int deliver_window;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-11-11 04:01:48 +01:00
|
|
|
circ_id_t p_circ_id; /* circuit identifiers */
|
|
|
|
circ_id_t n_circ_id;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-05-02 00:55:51 +02:00
|
|
|
crypto_cipher_env_t *p_crypto; /* used only for intermediate hops */
|
2002-08-22 09:30:03 +02:00
|
|
|
crypto_cipher_env_t *n_crypto;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-11-14 21:45:47 +01:00
|
|
|
cpath_build_state_t *build_state;
|
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
|
|
|
|
2003-05-06 07:54:42 +02:00
|
|
|
char onionskin[DH_ONIONSKIN_LEN]; /* for storage while onionskin pending */
|
2003-11-17 00:43:08 +01:00
|
|
|
time_t timestamp_created;
|
|
|
|
time_t timestamp_dirty; /* when the circuit was first used, or 0 if clean */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-05 08:04:03 +02:00
|
|
|
uint8_t state;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
void *next;
|
2003-08-21 01:05:22 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct circuit_t circuit_t;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-12-03 23:18:23 +01:00
|
|
|
typedef struct {
|
2003-10-25 14:01:09 +02:00
|
|
|
char *LogLevel;
|
|
|
|
char *LogFile;
|
|
|
|
char *DebugLogFile;
|
|
|
|
char *DataDirectory;
|
|
|
|
char *RouterFile;
|
|
|
|
char *Nickname;
|
|
|
|
char *Address;
|
|
|
|
char *PidFile;
|
2003-11-12 20:34:34 +01:00
|
|
|
char *ExitNodes;
|
|
|
|
char *EntryNodes;
|
2003-10-25 14:01:09 +02:00
|
|
|
char *ExitPolicy;
|
|
|
|
char *SocksBindAddress;
|
|
|
|
char *ORBindAddress;
|
|
|
|
char *DirBindAddress;
|
2003-11-13 07:49:25 +01:00
|
|
|
char *RecommendedVersions;
|
2003-10-25 14:01:09 +02:00
|
|
|
char *User;
|
|
|
|
char *Group;
|
2003-11-14 00:01:56 +01:00
|
|
|
double PathlenCoinWeight;
|
2003-10-25 14:01:09 +02:00
|
|
|
int ORPort;
|
|
|
|
int SocksPort;
|
|
|
|
int DirPort;
|
|
|
|
int MaxConn;
|
|
|
|
int TrafficShaping;
|
|
|
|
int LinkPadding;
|
|
|
|
int IgnoreVersion;
|
|
|
|
int RunAsDaemon;
|
|
|
|
int DirRebuildPeriod;
|
|
|
|
int DirFetchPostPeriod;
|
|
|
|
int KeepalivePeriod;
|
|
|
|
int MaxOnionsPending;
|
|
|
|
int NewCircuitPeriod;
|
|
|
|
int TotalBandwidth;
|
|
|
|
int NumCpus;
|
|
|
|
int loglevel;
|
2002-07-03 18:31:22 +02:00
|
|
|
} or_options_t;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-11-11 03:41:31 +01:00
|
|
|
#define MAX_SOCKS_REPLY_LEN 256
|
|
|
|
/* Not 256; addresses must fit in a begin cell. */
|
|
|
|
#define MAX_SOCKS_ADDR_LEN 200
|
|
|
|
struct socks_request_t {
|
|
|
|
char socks_version;
|
|
|
|
int replylen;
|
|
|
|
char reply[MAX_SOCKS_REPLY_LEN];
|
2003-11-16 18:00:02 +01:00
|
|
|
char address[MAX_SOCKS_ADDR_LEN];
|
2003-11-11 03:41:31 +01:00
|
|
|
uint16_t port;
|
|
|
|
};
|
|
|
|
|
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 12:42:07 +02:00
|
|
|
int find_on_inbuf(char *string, int string_len, buf_t *buf);
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
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
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
int read_to_buf(int s, int at_most, buf_t *buf, int *reached_eof);
|
|
|
|
int read_to_buf_tls(tor_tls *tls, int at_most, buf_t *buf);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
int flush_buf(int s, buf_t *buf, int *buf_flushlen);
|
|
|
|
int flush_buf_tls(tor_tls *tls, buf_t *buf, int *buf_flushlen);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-25 12:42:07 +02:00
|
|
|
int write_to_buf(const char *string, int string_len, buf_t *buf);
|
2003-09-25 07:17:11 +02:00
|
|
|
int fetch_from_buf(char *string, int string_len, buf_t *buf);
|
|
|
|
int fetch_from_buf_http(buf_t *buf,
|
2003-09-17 22:09:06 +02:00
|
|
|
char *headers_out, int max_headerlen,
|
|
|
|
char *body_out, int 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
|
|
|
|
|
|
|
/********************************* circuit.c ***************************/
|
|
|
|
|
|
|
|
void circuit_add(circuit_t *circ);
|
|
|
|
void circuit_remove(circuit_t *circ);
|
2003-11-11 04:01:48 +01:00
|
|
|
circuit_t *circuit_new(circ_id_t p_circ_id, connection_t *p_conn);
|
2003-09-16 07:41:49 +02:00
|
|
|
void circuit_free(circuit_t *circ);
|
2003-11-12 03:32:20 +01:00
|
|
|
void circuit_free_cpath(crypt_path_t *cpath);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-11-11 04:01:48 +01:00
|
|
|
circuit_t *circuit_get_by_circ_id_conn(circ_id_t circ_id, connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
circuit_t *circuit_get_by_conn(connection_t *conn);
|
2003-11-17 01:57:56 +01:00
|
|
|
circuit_t *circuit_get_newest(connection_t *conn, int must_be_open);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-11-18 08:48:00 +01:00
|
|
|
void circuit_expire_building(void);
|
|
|
|
int circuit_count_building(void);
|
|
|
|
|
2003-05-02 23:29:25 +02:00
|
|
|
int circuit_deliver_relay_cell(cell_t *cell, circuit_t *circ,
|
|
|
|
int cell_direction, crypt_path_t *layer_hint);
|
|
|
|
int relay_crypt(circuit_t *circ, char *in, int inlen, char cell_direction,
|
2003-05-20 08:41:23 +02:00
|
|
|
crypt_path_t **layer_hint, char *recognized, connection_t **conn);
|
2003-05-02 23:29:25 +02:00
|
|
|
int relay_check_recognized(circuit_t *circ, int cell_direction, char *stream, connection_t **conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-05-20 08:41:23 +02:00
|
|
|
void circuit_resume_edge_reading(circuit_t *circ, int edge_type, crypt_path_t *layer_hint);
|
|
|
|
int circuit_consider_stop_edge_reading(circuit_t *circ, int edge_type, crypt_path_t *layer_hint);
|
|
|
|
int circuit_consider_sending_sendme(circuit_t *circ, int edge_type, crypt_path_t *layer_hint);
|
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
|
|
|
void circuit_close(circuit_t *circ);
|
|
|
|
void circuit_about_to_close_connection(connection_t *conn);
|
|
|
|
|
2003-10-15 20:37:19 +02:00
|
|
|
void circuit_dump_by_conn(connection_t *conn, int severity);
|
2002-09-22 00:41:48 +02:00
|
|
|
|
2003-04-16 18:17:27 +02:00
|
|
|
void circuit_expire_unused_circuits(void);
|
2003-11-19 03:22:52 +01:00
|
|
|
int circuit_launch_new(void);
|
|
|
|
void circuit_increment_failure_count(void);
|
|
|
|
void circuit_reset_failure_count(void);
|
2003-05-06 01:24:46 +02:00
|
|
|
int circuit_establish_circuit(void);
|
2003-04-16 08:18:31 +02:00
|
|
|
void circuit_n_conn_open(connection_t *or_conn);
|
2003-05-06 01:24:46 +02:00
|
|
|
int circuit_send_next_onion_skin(circuit_t *circ);
|
|
|
|
int circuit_extend(cell_t *cell, circuit_t *circ);
|
|
|
|
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_ok(const crypt_path_t *c);
|
|
|
|
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
|
|
|
|
2003-10-02 22:00:38 +02:00
|
|
|
extern unsigned long stats_n_relay_cells_relayed;
|
|
|
|
extern unsigned long stats_n_relay_cells_delivered;
|
|
|
|
|
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 ***************************/
|
|
|
|
|
2002-11-23 07:49:01 +01:00
|
|
|
int getconfig(int argc, char **argv, or_options_t *options);
|
2002-07-03 18:31:22 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/********************************* connection.c ***************************/
|
|
|
|
|
|
|
|
connection_t *connection_new(int type);
|
|
|
|
void connection_free(connection_t *conn);
|
|
|
|
|
2003-10-25 14:01:09 +02:00
|
|
|
int connection_create_listener(char *bindaddress, uint16_t bindport, int type);
|
2003-09-08 12:59:00 +02:00
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
int connection_connect(connection_t *conn, char *address, uint32_t addr, uint16_t port);
|
2003-10-25 14:01:09 +02:00
|
|
|
int retry_all_connections(void);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-05 08:04:03 +02:00
|
|
|
int connection_handle_read(connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
int connection_read_to_buf(connection_t *conn);
|
|
|
|
|
|
|
|
int connection_fetch_from_buf(char *string, int len, connection_t *conn);
|
2002-09-28 07:53:00 +02:00
|
|
|
int connection_find_on_inbuf(char *string, int 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);
|
2003-10-04 04:38:18 +02:00
|
|
|
void connection_write_to_buf(const char *string, int 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_twin_get_by_addr_port(uint32_t addr, uint16_t port);
|
|
|
|
connection_t *connection_exact_get_by_addr_port(uint32_t addr, uint16_t port);
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
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_receiver_bucket_should_increase(connection_t *conn);
|
|
|
|
|
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 && \
|
|
|
|
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);
|
|
|
|
|
2003-11-11 04:01:48 +01:00
|
|
|
int connection_send_destroy(circ_id_t circ_id, connection_t *conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
int connection_process_inbuf(connection_t *conn);
|
|
|
|
int connection_finished_flushing(connection_t *conn);
|
|
|
|
|
2003-09-16 21:36:19 +02:00
|
|
|
void assert_connection_ok(connection_t *conn, time_t now);
|
|
|
|
|
2003-04-12 00:11:11 +02:00
|
|
|
/********************************* connection_edge.c ***************************/
|
|
|
|
|
|
|
|
int connection_edge_process_inbuf(connection_t *conn);
|
2003-10-22 09:55:44 +02:00
|
|
|
void connection_edge_end(connection_t *conn, char reason, crypt_path_t *cpath_layer);
|
2003-10-21 10:37:07 +02:00
|
|
|
|
2003-10-22 11:08:10 +02:00
|
|
|
int connection_edge_send_command(connection_t *fromconn, circuit_t *circ, int relay_command,
|
|
|
|
void *payload, int payload_len, crypt_path_t *cpath_layer);
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2003-09-16 07:41:49 +02:00
|
|
|
int connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, connection_t *conn,
|
|
|
|
int edge_type, crypt_path_t *layer_hint);
|
2003-04-12 00:11:11 +02:00
|
|
|
int connection_edge_finished_flushing(connection_t *conn);
|
|
|
|
|
2003-10-09 20:45:14 +02:00
|
|
|
int connection_edge_package_raw_inbuf(connection_t *conn);
|
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-10-22 09:55:44 +02:00
|
|
|
void connection_exit_connect(connection_t *conn);
|
2003-12-06 07:01:42 +01:00
|
|
|
int connection_ap_can_use_exit(connection_t *conn, routerinfo_t *exit);
|
2003-11-11 03:41:31 +01:00
|
|
|
void connection_ap_attach_pending(void);
|
|
|
|
|
2003-10-02 22:00:38 +02:00
|
|
|
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;
|
|
|
|
|
2003-11-16 18:00:02 +01:00
|
|
|
void client_dns_init(void);
|
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);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2003-09-25 12:42:07 +02:00
|
|
|
void connection_or_init_conn_from_router(connection_t *conn, routerinfo_t *router);
|
2003-05-28 04:03:25 +02:00
|
|
|
connection_t *connection_or_connect(routerinfo_t *router);
|
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-10-09 20:45:14 +02:00
|
|
|
void connection_or_write_cell_to_buf(const cell_t *cellp, 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);
|
|
|
|
int connection_cpu_finished_flushing(connection_t *conn);
|
|
|
|
int connection_cpu_process_inbuf(connection_t *conn);
|
|
|
|
int cpuworker_main(void *data);
|
|
|
|
int assign_to_cpuworker(connection_t *cpuworker, unsigned char question_type,
|
|
|
|
void *task);
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
/********************************* directory.c ***************************/
|
|
|
|
|
2003-09-17 22:09:06 +02:00
|
|
|
void directory_initiate_command(routerinfo_t *router, int command);
|
2002-09-26 14:09:10 +02:00
|
|
|
int connection_dir_process_inbuf(connection_t *conn);
|
|
|
|
int connection_dir_finished_flushing(connection_t *conn);
|
|
|
|
|
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);
|
2003-06-27 02:57:04 +02:00
|
|
|
void dns_cancel_pending_resolve(char *question, connection_t *onlyconn);
|
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);
|
|
|
|
void connection_set_poll_socket(connection_t *conn);
|
|
|
|
|
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);
|
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
|
|
|
|
|
|
|
int main(int argc, char *argv[]);
|
|
|
|
|
|
|
|
/********************************* onion.c ***************************/
|
|
|
|
|
2003-11-11 04:01:48 +01:00
|
|
|
int decide_circ_id_type(char *local_nick, char *remote_nick);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
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-09-14 04:58:50 +02:00
|
|
|
int onionskin_answer(circuit_t *circ, unsigned char *payload, unsigned char *keys);
|
2003-08-21 01:05:22 +02:00
|
|
|
|
2003-11-12 20:34:34 +01:00
|
|
|
char **parse_nickname_list(char *start, int *num);
|
|
|
|
|
2003-11-14 21:45:47 +01:00
|
|
|
int onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t *state,
|
|
|
|
routerinfo_t **router_out);
|
2003-04-16 18:19:27 +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-05-06 07:54:42 +02:00
|
|
|
char *onion_skin_out); /* Must be DH_ONIONSKIN_LEN bytes long */
|
2003-05-05 06:27:00 +02:00
|
|
|
|
2003-05-06 07:54:42 +02:00
|
|
|
int onion_skin_server_handshake(char *onion_skin, /* DH_ONIONSKIN_LEN bytes long */
|
2003-05-05 06:27:00 +02:00
|
|
|
crypto_pk_env_t *private_key,
|
2003-05-06 07:54:42 +02:00
|
|
|
char *handshake_reply_out, /* DH_KEY_LEN bytes long */
|
2003-05-05 06:27:00 +02:00
|
|
|
char *key_out,
|
|
|
|
int key_out_len);
|
|
|
|
|
|
|
|
int onion_skin_client_handshake(crypto_dh_env_t *handshake_state,
|
2003-05-06 07:54:42 +02:00
|
|
|
char *handshake_reply,/* Must be DH_KEY_LEN bytes long*/
|
2003-05-05 06:27:00 +02:00
|
|
|
char *key_out,
|
|
|
|
int key_out_len);
|
|
|
|
|
2003-11-14 21:45:47 +01:00
|
|
|
cpath_build_state_t *onion_new_cpath_build_state(void);
|
2003-11-12 03:55:38 +01:00
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
/********************************* router.c ***************************/
|
|
|
|
|
|
|
|
void set_onion_key(crypto_pk_env_t *k);
|
|
|
|
crypto_pk_env_t *get_onion_key(void);
|
|
|
|
void set_identity_key(crypto_pk_env_t *k);
|
|
|
|
crypto_pk_env_t *get_identity_key(void);
|
|
|
|
crypto_pk_env_t *get_link_key(void);
|
|
|
|
int init_keys(void);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
void router_retry_connections(void);
|
2003-12-06 06:54:04 +01:00
|
|
|
void router_upload_desc_to_dirservers(void);
|
|
|
|
int router_compare_to_my_exit_policy(connection_t *conn);
|
|
|
|
const char *router_get_my_descriptor(void);
|
|
|
|
int router_rebuild_descriptor(void);
|
|
|
|
int router_dump_router_to_string(char *s, int maxlen, routerinfo_t *router,
|
|
|
|
crypto_pk_env_t *ident_key);
|
|
|
|
|
|
|
|
/********************************* routerlist.c ***************************/
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
routerinfo_t *router_pick_directory_server(void);
|
2003-12-03 11:28:51 +01:00
|
|
|
routerinfo_t *router_pick_randomly_from_running(void);
|
2002-09-26 14:09:10 +02:00
|
|
|
routerinfo_t *router_get_by_addr_port(uint32_t addr, uint16_t port);
|
2003-09-25 07:17:11 +02:00
|
|
|
routerinfo_t *router_get_by_link_pk(crypto_pk_env_t *pk);
|
2003-09-30 23:27:16 +02:00
|
|
|
routerinfo_t *router_get_by_nickname(char *nickname);
|
2003-12-06 06:54:04 +01:00
|
|
|
void router_get_routerlist(routerlist_t **prouterlist);
|
|
|
|
void routerinfo_free(routerinfo_t *router);
|
2003-09-30 23:27:16 +02:00
|
|
|
void router_mark_as_down(char *nickname);
|
2003-12-06 06:54:04 +01:00
|
|
|
int router_set_routerlist_from_file(char *routerfile);
|
2003-09-30 21:27:54 +02:00
|
|
|
int router_get_dir_hash(char *s, char *digest);
|
2003-12-06 06:54:04 +01:00
|
|
|
int router_get_router_hash(char *s, char *digest);
|
|
|
|
int router_set_routerlist_from_directory(char *s, crypto_pk_env_t *pkey);
|
|
|
|
routerinfo_t *router_get_entry_from_string(char**s);
|
|
|
|
int router_add_exit_policy_from_string(routerinfo_t *router, char *s);
|
2003-11-16 06:33:45 +01:00
|
|
|
int router_supports_exit_address(uint32_t addr, uint16_t port,
|
|
|
|
routerinfo_t *router);
|
2003-11-14 21:45:47 +01:00
|
|
|
int router_compare_addr_to_exit_policy(uint32_t addr, uint16_t port,
|
|
|
|
struct exit_policy_t *policy);
|
2003-12-03 09:06:55 +01:00
|
|
|
int router_exit_policy_all_routers_reject(uint32_t addr, uint16_t port);
|
|
|
|
int router_exit_policy_rejects_all(routerinfo_t *router);
|
2003-04-08 08:44:38 +02:00
|
|
|
|
2003-09-27 23:30:10 +02:00
|
|
|
/********************************* dirserv.c ***************************/
|
2003-09-30 21:27:54 +02:00
|
|
|
int dirserv_add_own_fingerprint(const char *nickname, crypto_pk_env_t *pk);
|
2003-09-27 23:30:10 +02:00
|
|
|
int dirserv_parse_fingerprint_file(const char *fname);
|
|
|
|
int dirserv_router_fingerprint_is_known(const routerinfo_t *router);
|
|
|
|
void dirserv_free_fingerprint_list();
|
|
|
|
int dirserv_add_descriptor(const char **desc);
|
|
|
|
int dirserv_init_from_directory_string(const char *dir);
|
|
|
|
void dirserv_free_descriptors();
|
|
|
|
int dirserv_dump_directory_to_string(char *s, int maxlen,
|
|
|
|
crypto_pk_env_t *private_key);
|
|
|
|
void directory_set_dirty();
|
|
|
|
size_t dirserv_get_directory(const char **cp);
|
|
|
|
|
|
|
|
|
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:
|
|
|
|
*/
|