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
|
|
|
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
|
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
#include "or.h"
|
|
|
|
|
|
|
|
/********* START VARIABLES **********/
|
|
|
|
|
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
|
|
|
extern or_options_t options; /* command-line and config-file options */
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
#if 0
|
|
|
|
/* these are now out of date :( -RD */
|
2002-06-27 00:45:49 +02:00
|
|
|
char *conn_type_to_string[] = {
|
|
|
|
"OP listener", /* 0 */
|
|
|
|
"OP", /* 1 */
|
|
|
|
"OR listener", /* 2 */
|
|
|
|
"OR", /* 3 */
|
|
|
|
"App" /* 4 */
|
|
|
|
};
|
|
|
|
|
|
|
|
char *conn_state_to_string[][10] = {
|
|
|
|
{ "ready" }, /* op listener, 0 */
|
|
|
|
{ "awaiting keys", /* op, 0 */
|
|
|
|
"open", /* 1 */
|
|
|
|
"close", /* 2 */
|
|
|
|
"close_wait" }, /* 3 */
|
|
|
|
{ "ready" }, /* or listener, 0 */
|
|
|
|
{ "connecting (as client)", /* or, 0 */
|
|
|
|
"sending auth (as client)", /* 1 */
|
|
|
|
"waiting for auth (as client)", /* 2 */
|
|
|
|
"sending nonce (as client)", /* 3 */
|
|
|
|
"waiting for auth (as server)", /* 4 */
|
|
|
|
"sending auth (as server)", /* 5 */
|
|
|
|
"waiting for nonce (as server)",/* 6 */
|
|
|
|
"open" }, /* 7 */
|
2002-06-30 09:37:49 +02:00
|
|
|
{ "connecting", /* exit, 0 */
|
2002-06-27 00:45:49 +02:00
|
|
|
"open", /* 1 */
|
|
|
|
"waiting for dest info", /* 2 */
|
|
|
|
"flushing buffer, then will close",/* 3 */
|
|
|
|
"close_wait" } /* 4 */
|
|
|
|
};
|
2002-06-30 09:37:49 +02:00
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/********* END VARIABLES ************/
|
|
|
|
|
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 tv_cmp(struct timeval *a, struct timeval *b) {
|
|
|
|
if (a->tv_sec > b->tv_sec)
|
|
|
|
return 1;
|
|
|
|
if (a->tv_sec < b->tv_sec)
|
|
|
|
return -1;
|
|
|
|
if (a->tv_usec > b->tv_usec)
|
|
|
|
return 1;
|
|
|
|
if (a->tv_usec < b->tv_usec)
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void tv_add(struct timeval *a, struct timeval *b) {
|
|
|
|
a->tv_usec += b->tv_usec;
|
|
|
|
a->tv_sec += b->tv_sec + (a->tv_usec / 1000000);
|
|
|
|
a->tv_usec %= 1000000;
|
|
|
|
}
|
|
|
|
|
|
|
|
void tv_addms(struct timeval *a, long ms) {
|
|
|
|
a->tv_usec += (ms * 1000) % 1000000;
|
|
|
|
a->tv_sec += ((ms * 1000) / 1000000) + (a->tv_usec / 1000000);
|
|
|
|
a->tv_usec %= 1000000;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************/
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_t *connection_new(int type) {
|
|
|
|
connection_t *conn;
|
|
|
|
|
|
|
|
conn = (connection_t *)malloc(sizeof(connection_t));
|
|
|
|
if(!conn)
|
|
|
|
return NULL;
|
|
|
|
memset(conn,0,sizeof(connection_t)); /* zero it out to start */
|
|
|
|
|
|
|
|
conn->type = type;
|
2002-06-30 09:37:49 +02:00
|
|
|
if(buf_new(&conn->inbuf, &conn->inbuflen, &conn->inbuf_datalen) < 0 ||
|
|
|
|
buf_new(&conn->outbuf, &conn->outbuflen, &conn->outbuf_datalen) < 0)
|
|
|
|
return NULL;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
conn->receiver_bucket = 10240; /* should be enough to do the handshake */
|
|
|
|
conn->bandwidth = conn->receiver_bucket / 10; /* give it a default */
|
2002-06-27 00:45:49 +02:00
|
|
|
return conn;
|
|
|
|
}
|
|
|
|
|
|
|
|
void connection_free(connection_t *conn) {
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
buf_free(conn->inbuf);
|
|
|
|
buf_free(conn->outbuf);
|
|
|
|
if(conn->address)
|
|
|
|
free(conn->address);
|
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
|
|
|
if(conn->dest_addr)
|
|
|
|
free(conn->dest_addr);
|
|
|
|
if(conn->dest_port)
|
|
|
|
free(conn->dest_port);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/* FIXME should we do these for all connections, or just ORs, or what */
|
|
|
|
if(conn->type == CONN_TYPE_OR ||
|
|
|
|
conn->type == CONN_TYPE_OP) {
|
2002-06-30 09:37:49 +02:00
|
|
|
EVP_CIPHER_CTX_cleanup(&conn->f_ctx);
|
|
|
|
EVP_CIPHER_CTX_cleanup(&conn->b_ctx);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if(conn->s > 0)
|
|
|
|
close(conn->s);
|
|
|
|
free(conn);
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_create_listener(RSA *prkey, struct sockaddr_in *local, int type) {
|
|
|
|
connection_t *conn;
|
|
|
|
int s;
|
|
|
|
int one=1;
|
|
|
|
|
|
|
|
s = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
|
|
|
|
if (s < 0)
|
|
|
|
{
|
|
|
|
log(LOG_ERR,"connection_create_listener(): Socket creation failed.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
|
|
|
|
|
|
|
|
if(bind(s,(struct sockaddr *)local,sizeof(*local)) < 0) {
|
|
|
|
perror("bind ");
|
|
|
|
log(LOG_ERR,"Could not bind to local port %u.",ntohs(local->sin_port));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* start local server */
|
|
|
|
if(listen(s,SOMAXCONN) < 0) {
|
|
|
|
log(LOG_ERR,"Could not listen on local port %u.",ntohs(local->sin_port));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fcntl(s, F_SETFL, O_NONBLOCK); /* set s to non-blocking */
|
|
|
|
|
|
|
|
conn = connection_new(type);
|
2002-06-30 09:37:49 +02:00
|
|
|
if(!conn)
|
|
|
|
return -1;
|
2002-06-27 00:45:49 +02:00
|
|
|
conn->s = s;
|
|
|
|
|
|
|
|
if(connection_add(conn) < 0) { /* no space, forget it */
|
|
|
|
connection_free(conn);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remember things so you can tell the baby sockets */
|
|
|
|
memcpy(&conn->local,local,sizeof(struct sockaddr_in));
|
|
|
|
conn->prkey = prkey;
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"connection_create_listener(): Listening on local port %u.",ntohs(local->sin_port));
|
|
|
|
|
|
|
|
conn->state = LISTENER_STATE_READY;
|
|
|
|
connection_watch_events(conn, POLLIN);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_handle_listener_read(connection_t *conn, int new_type, int new_state) {
|
|
|
|
|
|
|
|
int news; /* the new socket */
|
|
|
|
connection_t *newconn;
|
|
|
|
struct sockaddr_in remote; /* information about the remote peer when connecting to other routers */
|
|
|
|
int remotelen = sizeof(struct sockaddr_in); /* length of the remote address */
|
|
|
|
|
|
|
|
news = accept(conn->s,(struct sockaddr *)&remote,&remotelen);
|
|
|
|
if (news == -1) { /* accept() error */
|
|
|
|
if(errno==EAGAIN)
|
|
|
|
return 0; /* he hung up before we could accept(). that's fine. */
|
|
|
|
/* else there was a real error. */
|
|
|
|
log(LOG_ERR,"connection_handle_listener_read(): accept() failed. Closing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"Connection accepted on socket %d.",news);
|
|
|
|
|
2002-07-16 04:12:58 +02:00
|
|
|
fcntl(news, F_SETFL, O_NONBLOCK); /* set s to non-blocking */
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
newconn = connection_new(new_type);
|
|
|
|
newconn->s = news;
|
|
|
|
|
|
|
|
/* learn things from parent, so we can perform auth */
|
|
|
|
memcpy(&newconn->local,&conn->local,sizeof(struct sockaddr_in));
|
|
|
|
newconn->prkey = conn->prkey;
|
|
|
|
// newconn->address = strdup(get_string_from_remote()) FIXME ;
|
|
|
|
|
|
|
|
if(connection_add(newconn) < 0) { /* no space, forget it */
|
|
|
|
connection_free(newconn);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"connection_handle_listener_read(): socket %d entered state %d.",newconn->s, new_state);
|
|
|
|
newconn->state = new_state;
|
|
|
|
connection_watch_events(newconn, POLLIN);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Integrated onion proxy into or/
The 'or' process can now be told (by the global_role variable) what
roles this server should play -- connect to all ORs, listen for ORs,
listen for OPs, listen for APs, or any combination.
* everything in /src/op/ is now obsolete.
* connection_ap.c now handles all interactions with application proxies
* "port" is now or_port, op_port, ap_port. But routers are still always
referenced (say, in conn_get_by_addr_port()) by addr / or_port. We
should make routers.c actually read these new ports (currently I've
kludged it so op_port = or_port+10, ap_port=or_port+20)
* circuits currently know if they're at the beginning of the path because
circ->cpath is set. They use this instead for crypts (both ways),
if it's set.
* I still obey the "send a 0 back to the AP when you're ready" protocol,
but I think we should phase it out. I can simply not read from the AP
socket until I'm ready.
I need to do a lot of cleanup work here, but the code appears to work, so
now's a good time for a checkin.
svn:r22
2002-07-02 11:36:58 +02:00
|
|
|
/* private function, to create the 'local' variable used below */
|
|
|
|
static int learn_local(struct sockaddr_in *local) {
|
2002-06-27 00:45:49 +02:00
|
|
|
/* local host information */
|
|
|
|
char localhostname[512];
|
|
|
|
struct hostent *localhost;
|
|
|
|
|
|
|
|
/* obtain local host information */
|
|
|
|
if(gethostname(localhostname,512) < 0) {
|
|
|
|
log(LOG_ERR,"Error obtaining local hostname.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
localhost = gethostbyname(localhostname);
|
|
|
|
if (!localhost) {
|
|
|
|
log(LOG_ERR,"Error obtaining local host info.");
|
|
|
|
return -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
|
|
|
memset((void *)local,0,sizeof(struct sockaddr_in));
|
|
|
|
local->sin_family = AF_INET;
|
|
|
|
local->sin_addr.s_addr = INADDR_ANY;
|
|
|
|
memcpy((void *)&local->sin_addr,(void *)localhost->h_addr,sizeof(struct in_addr));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int retry_all_connections(int role, routerinfo_t **router_array, int rarray_len,
|
|
|
|
RSA *prkey, uint16_t or_listenport, uint16_t op_listenport, uint16_t ap_listenport) {
|
|
|
|
|
|
|
|
/* start all connections that should be up but aren't */
|
|
|
|
|
|
|
|
routerinfo_t *router;
|
|
|
|
int i;
|
|
|
|
struct sockaddr_in local; /* local address */
|
|
|
|
|
|
|
|
if(learn_local(&local) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
local.sin_port = htons(or_listenport);
|
|
|
|
if(role & ROLE_OR_CONNECT_ALL) {
|
|
|
|
for (i=0;i<rarray_len;i++) {
|
|
|
|
router = router_array[i];
|
2002-07-08 10:59:15 +02:00
|
|
|
if(!connection_exact_get_by_addr_port(router->addr,router->or_port)) { /* not in the list */
|
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
|
|
|
log(LOG_DEBUG,"retry_all_connections(): connecting to OR %s:%u.",router->address,ntohs(router->or_port));
|
|
|
|
connection_or_connect_as_or(router, prkey, &local);
|
|
|
|
}
|
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
|
|
|
if(role & ROLE_OR_LISTEN) {
|
|
|
|
if(!connection_get_by_type(CONN_TYPE_OR_LISTENER)) {
|
|
|
|
connection_or_create_listener(prkey, &local);
|
|
|
|
}
|
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
|
|
|
if(role & ROLE_OP_LISTEN) {
|
|
|
|
local.sin_port = htons(op_listenport);
|
|
|
|
if(!connection_get_by_type(CONN_TYPE_OP_LISTENER)) {
|
|
|
|
connection_op_create_listener(prkey, &local);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(role & ROLE_AP_LISTEN) {
|
|
|
|
local.sin_port = htons(ap_listenport);
|
|
|
|
if(!connection_get_by_type(CONN_TYPE_AP_LISTENER)) {
|
|
|
|
connection_ap_create_listener(NULL, &local); /* no need to tell it the private key. */
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Integrated onion proxy into or/
The 'or' process can now be told (by the global_role variable) what
roles this server should play -- connect to all ORs, listen for ORs,
listen for OPs, listen for APs, or any combination.
* everything in /src/op/ is now obsolete.
* connection_ap.c now handles all interactions with application proxies
* "port" is now or_port, op_port, ap_port. But routers are still always
referenced (say, in conn_get_by_addr_port()) by addr / or_port. We
should make routers.c actually read these new ports (currently I've
kludged it so op_port = or_port+10, ap_port=or_port+20)
* circuits currently know if they're at the beginning of the path because
circ->cpath is set. They use this instead for crypts (both ways),
if it's set.
* I still obey the "send a 0 back to the AP when you're ready" protocol,
but I think we should phase it out. I can simply not read from the AP
socket until I'm ready.
I need to do a lot of cleanup work here, but the code appears to work, so
now's a good time for a checkin.
svn:r22
2002-07-02 11:36:58 +02:00
|
|
|
connection_t *connection_connect_to_router_as_op(routerinfo_t *router, RSA *prkey, uint16_t local_or_port) {
|
|
|
|
struct sockaddr_in local; /* local address */
|
|
|
|
|
|
|
|
if(learn_local(&local) < 0)
|
|
|
|
return NULL;
|
|
|
|
local.sin_port = htons(local_or_port);
|
2002-07-03 19:30:59 +02:00
|
|
|
return connection_or_connect_as_op(router, prkey, &local);
|
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-06-27 00:45:49 +02:00
|
|
|
int connection_read_to_buf(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 read_result;
|
|
|
|
|
|
|
|
read_result = read_to_buf(conn->s, conn->receiver_bucket, &conn->inbuf, &conn->inbuflen,
|
|
|
|
&conn->inbuf_datalen, &conn->inbuf_reached_eof);
|
|
|
|
log(LOG_DEBUG,"connection_read_to_buf(): read_to_buf returned %d.",read_result);
|
|
|
|
if(read_result >= 0) {
|
|
|
|
conn->receiver_bucket -= read_result;
|
|
|
|
if(conn->receiver_bucket <= 0) {
|
|
|
|
|
|
|
|
connection_stop_reading(conn);
|
|
|
|
|
|
|
|
/* If we're not in 'open' state here, then we're never going to finish the
|
|
|
|
* handshake, because we'll never increment the receiver_bucket. But we
|
|
|
|
* can't check for that here, because the buf we just read might have enough
|
|
|
|
* on it to finish the handshake. So we check for that in check_conn_read().
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return read_result;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int connection_fetch_from_buf(char *string, int len, connection_t *conn) {
|
|
|
|
return fetch_from_buf(string, len, &conn->inbuf, &conn->inbuflen, &conn->inbuf_datalen);
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_flush_buf(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
|
|
|
return flush_buf(conn->s, &conn->outbuf, &conn->outbuflen, &conn->outbuf_flushlen, &conn->outbuf_datalen);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int connection_write_to_buf(char *string, int len, connection_t *conn) {
|
|
|
|
if(!len)
|
|
|
|
return 0;
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
|
|
|
|
if( (conn->type != CONN_TYPE_OR && conn->type != CONN_TYPE_OR) ||
|
|
|
|
(!connection_state_is_open(conn)) ||
|
|
|
|
(options.LinkPadding == 0) ) {
|
|
|
|
/* connection types other than or and op, or or/op not in 'open' state, should flush immediately */
|
|
|
|
/* also flush immediately if we're not doing LinkPadding, since otherwise it will never flush */
|
|
|
|
connection_watch_events(conn, POLLOUT | POLLIN);
|
|
|
|
conn->outbuf_flushlen += len;
|
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
return write_to_buf(string, len, &conn->outbuf, &conn->outbuflen, &conn->outbuf_datalen);
|
|
|
|
}
|
|
|
|
|
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) {
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
if(conn->receiver_bucket > 10*conn->bandwidth)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void connection_increment_receiver_bucket (connection_t *conn) {
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
if(connection_receiver_bucket_should_increase(conn)) {
|
|
|
|
/* yes, the receiver_bucket can become overfull here. But not by much. */
|
|
|
|
conn->receiver_bucket += conn->bandwidth*1.1;
|
|
|
|
if(connection_state_is_open(conn)) {
|
|
|
|
/* if we're in state 'open', then start reading again */
|
|
|
|
connection_start_reading(conn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_state_is_open(connection_t *conn) {
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
if((conn->type == CONN_TYPE_OR && conn->state == OR_CONN_STATE_OPEN) ||
|
|
|
|
(conn->type == CONN_TYPE_OP && conn->state == OP_CONN_STATE_OPEN) ||
|
|
|
|
(conn->type == CONN_TYPE_AP && conn->state == AP_CONN_STATE_OPEN) ||
|
|
|
|
(conn->type == CONN_TYPE_EXIT && conn->state == EXIT_CONN_STATE_OPEN))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void connection_send_cell(connection_t *conn) {
|
|
|
|
cell_t cell;
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
if(conn->type != CONN_TYPE_OR && conn->type != CONN_TYPE_OP) {
|
|
|
|
/* this conn doesn't speak cells. do nothing. */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!connection_state_is_open(conn)) {
|
|
|
|
/* it's not in 'open' state, all data should already be waiting to be flushed */
|
|
|
|
assert(conn->outbuf_datalen == conn->outbuf_flushlen);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0 /* use to send evenly spaced cells, but not padding */
|
|
|
|
if(conn->outbuf_datalen - conn->outbuf_flushlen >= sizeof(cell_t)) {
|
|
|
|
conn->outbuf_flushlen += sizeof(cell_t); /* instruct it to send a cell */
|
|
|
|
connection_watch_events(conn, POLLOUT | POLLIN);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if 1 /* experimental code, that sends padding cells too. 'probably' works :) */
|
|
|
|
if(conn->outbuf_datalen - conn->outbuf_flushlen < sizeof(cell_t)) {
|
|
|
|
/* we need to queue a padding cell first */
|
|
|
|
memset(&cell,0,sizeof(cell_t));
|
|
|
|
cell.command = CELL_PADDING;
|
|
|
|
connection_write_cell_to_buf(&cell, conn);
|
|
|
|
}
|
|
|
|
|
|
|
|
conn->outbuf_flushlen += sizeof(cell_t); /* instruct it to send a cell */
|
|
|
|
connection_watch_events(conn, POLLOUT | POLLIN);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
connection_increment_send_timeval(conn); /* update when we'll send the next cell */
|
|
|
|
}
|
|
|
|
|
|
|
|
void connection_increment_send_timeval(connection_t *conn) {
|
|
|
|
/* add "1000000 * sizeof(cell_t) / conn->bandwidth" microseconds to conn->send_timeval */
|
|
|
|
/* FIXME should perhaps use ceil() of this. For now I simply add 1. */
|
|
|
|
|
|
|
|
tv_addms(&conn->send_timeval, 1+1000 * sizeof(cell_t) / conn->bandwidth);
|
|
|
|
}
|
|
|
|
|
|
|
|
void connection_init_timeval(connection_t *conn) {
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
if(gettimeofday(&conn->send_timeval,NULL) < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
connection_increment_send_timeval(conn);
|
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
int connection_send_destroy(aci_t aci, connection_t *conn) {
|
|
|
|
cell_t cell;
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
assert(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
if(conn->type == CONN_TYPE_OP ||
|
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
|
|
|
conn->type == CONN_TYPE_AP ||
|
2002-06-30 09:37:49 +02:00
|
|
|
conn->type == CONN_TYPE_EXIT) {
|
2002-06-27 00:45:49 +02:00
|
|
|
log(LOG_DEBUG,"connection_send_destroy(): At an edge. Marking connection for close.");
|
|
|
|
conn->marked_for_close = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
assert(conn->type == CONN_TYPE_OR);
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
cell.aci = aci;
|
|
|
|
cell.command = CELL_DESTROY;
|
|
|
|
log(LOG_DEBUG,"connection_send_destroy(): Sending destroy (aci %d).",aci);
|
|
|
|
return connection_write_cell_to_buf(&cell, conn);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_write_cell_to_buf(cell_t *cellp, connection_t *conn) {
|
|
|
|
/* FIXME in the future, we should modify windows, etc, here */
|
|
|
|
|
|
|
|
if(connection_encrypt_cell_header(cellp,conn)<0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return connection_write_to_buf((char *)cellp, sizeof(cell_t), conn);
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_encrypt_cell_header(cell_t *cellp, connection_t *conn) {
|
|
|
|
char newheader[8];
|
|
|
|
int newsize;
|
|
|
|
int x;
|
|
|
|
char *px;
|
|
|
|
|
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
|
|
|
#if 0
|
2002-06-27 00:45:49 +02:00
|
|
|
printf("Sending: Cell header plaintext: ");
|
|
|
|
px = (char *)cellp;
|
|
|
|
for(x=0;x<8;x++) {
|
|
|
|
printf("%u ",px[x]);
|
|
|
|
}
|
|
|
|
printf("\n");
|
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
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
if(!EVP_EncryptUpdate(&conn->f_ctx, newheader, &newsize, (char *)cellp, 8)) {
|
|
|
|
log(LOG_ERR,"Could not encrypt data for connection %s:%u.",conn->address,ntohs(conn->port));
|
|
|
|
return -1;
|
|
|
|
}
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
#if 0
|
2002-06-27 00:45:49 +02:00
|
|
|
printf("Sending: Cell header crypttext: ");
|
|
|
|
for(x=0;x<8;x++) {
|
|
|
|
printf("%u ",newheader[x]);
|
|
|
|
}
|
|
|
|
printf("\n");
|
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
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
memcpy(cellp,newheader,8);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_process_inbuf(connection_t *conn) {
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
switch(conn->type) {
|
|
|
|
case CONN_TYPE_OP:
|
|
|
|
return connection_op_process_inbuf(conn);
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
return connection_or_process_inbuf(conn);
|
2002-06-30 09:37:49 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
return connection_exit_process_inbuf(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
|
|
|
case CONN_TYPE_AP:
|
|
|
|
return connection_ap_process_inbuf(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
default:
|
|
|
|
log(LOG_DEBUG,"connection_process_inbuf() got unexpected conn->type.");
|
|
|
|
return -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
|
|
|
int connection_package_raw_inbuf(connection_t *conn) {
|
|
|
|
int amount_to_process;
|
|
|
|
cell_t cell;
|
|
|
|
circuit_t *circ;
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
assert(conn->type == CONN_TYPE_EXIT || conn->type == CONN_TYPE_AP);
|
|
|
|
|
|
|
|
amount_to_process = conn->inbuf_datalen;
|
|
|
|
|
|
|
|
if(!amount_to_process)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if(amount_to_process > CELL_PAYLOAD_SIZE) {
|
|
|
|
cell.length = CELL_PAYLOAD_SIZE;
|
|
|
|
} else {
|
|
|
|
cell.length = amount_to_process;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(connection_fetch_from_buf(cell.payload, cell.length, conn) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
circ = circuit_get_by_conn(conn);
|
|
|
|
if(!circ) {
|
|
|
|
log(LOG_DEBUG,"connection_raw_package_inbuf(): conn has no circuits!");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"connection_raw_package_inbuf(): Packaging %d bytes.",cell.length);
|
|
|
|
if(circ->n_conn == conn) { /* send it backward. we're an exit. */
|
|
|
|
cell.aci = circ->p_aci;
|
|
|
|
cell.command = CELL_DATA;
|
|
|
|
if(circuit_deliver_data_cell(&cell, circ, circ->p_conn, 'e') < 0) {
|
|
|
|
log(LOG_DEBUG,"connection_raw_package_inbuf(): circuit_deliver_data_cell (backward) failed. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else { /* send it forward. we're an AP */
|
|
|
|
cell.aci = circ->n_aci;
|
|
|
|
cell.command = CELL_DATA;
|
|
|
|
if(circuit_deliver_data_cell(&cell, circ, circ->n_conn, 'e') < 0) {
|
|
|
|
/* yes, we use 'e' here, because the AP connection must *encrypt* its input. */
|
|
|
|
log(LOG_DEBUG,"connection_raw_package_inbuf(): circuit_deliver_data_cell (forward) failed. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(amount_to_process > CELL_PAYLOAD_SIZE)
|
|
|
|
return connection_package_raw_inbuf(conn);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
int connection_finished_flushing(connection_t *conn) {
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"connection_finished_flushing() entered. Socket %u.", conn->s);
|
|
|
|
|
|
|
|
switch(conn->type) {
|
Integrated onion proxy into or/
The 'or' process can now be told (by the global_role variable) what
roles this server should play -- connect to all ORs, listen for ORs,
listen for OPs, listen for APs, or any combination.
* everything in /src/op/ is now obsolete.
* connection_ap.c now handles all interactions with application proxies
* "port" is now or_port, op_port, ap_port. But routers are still always
referenced (say, in conn_get_by_addr_port()) by addr / or_port. We
should make routers.c actually read these new ports (currently I've
kludged it so op_port = or_port+10, ap_port=or_port+20)
* circuits currently know if they're at the beginning of the path because
circ->cpath is set. They use this instead for crypts (both ways),
if it's set.
* I still obey the "send a 0 back to the AP when you're ready" protocol,
but I think we should phase it out. I can simply not read from the AP
socket until I'm ready.
I need to do a lot of cleanup work here, but the code appears to work, so
now's a good time for a checkin.
svn:r22
2002-07-02 11:36:58 +02:00
|
|
|
case CONN_TYPE_AP:
|
|
|
|
return connection_ap_finished_flushing(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
case CONN_TYPE_OP:
|
|
|
|
return connection_op_finished_flushing(conn);
|
|
|
|
case CONN_TYPE_OR:
|
|
|
|
return connection_or_finished_flushing(conn);
|
2002-06-30 09:37:49 +02:00
|
|
|
case CONN_TYPE_EXIT:
|
|
|
|
return connection_exit_finished_flushing(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
default:
|
|
|
|
log(LOG_DEBUG,"connection_finished_flushing() got unexpected conn->type.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_process_cell_from_inbuf(connection_t *conn) {
|
|
|
|
/* check if there's a whole cell there.
|
|
|
|
* if yes, pull it off, decrypt it, and process it.
|
|
|
|
*/
|
|
|
|
char crypted[128];
|
|
|
|
char outbuf[1024];
|
|
|
|
int outlen;
|
|
|
|
int x;
|
|
|
|
cell_t *cellp;
|
|
|
|
|
|
|
|
if(conn->inbuf_datalen < 128) /* entire response available? */
|
|
|
|
return 0; /* not yet */
|
|
|
|
|
|
|
|
if(connection_fetch_from_buf(crypted,128,conn) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
#if 0
|
2002-06-27 00:45:49 +02:00
|
|
|
printf("Cell header crypttext: ");
|
|
|
|
for(x=0;x<8;x++) {
|
|
|
|
printf("%u ",crypted[x]);
|
|
|
|
}
|
|
|
|
printf("\n");
|
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
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
/* decrypt */
|
|
|
|
if(!EVP_DecryptUpdate(&conn->b_ctx,(unsigned char *)outbuf,&outlen,crypted,8)) {
|
|
|
|
log(LOG_ERR,"connection_process_cell_from_inbuf(): Decryption failed, dropping.");
|
|
|
|
return connection_process_inbuf(conn); /* process the remainder of the buffer */
|
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"connection_process_cell_from_inbuf(): Cell decrypted (%d bytes).",outlen);
|
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
|
|
|
#if 0
|
2002-06-27 00:45:49 +02:00
|
|
|
printf("Cell header plaintext: ");
|
|
|
|
for(x=0;x<8;x++) {
|
|
|
|
printf("%u ",outbuf[x]);
|
|
|
|
}
|
|
|
|
printf("\n");
|
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
|
|
|
#endif
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/* copy the rest of the cell */
|
|
|
|
memcpy((char *)outbuf+8, (char *)crypted+8, sizeof(cell_t)-8);
|
|
|
|
cellp = (cell_t *)outbuf;
|
|
|
|
log(LOG_DEBUG,"connection_process_cell_from_inbuf(): Decrypted cell is of type %u (ACI %u).",cellp->command,cellp->aci);
|
|
|
|
command_process_cell(cellp, conn);
|
|
|
|
|
|
|
|
return connection_process_inbuf(conn); /* process the remainder of the buffer */
|
|
|
|
}
|
|
|
|
|