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"
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
int connection_exit_process_inbuf(connection_t *conn) {
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
assert(conn && conn->type == CONN_TYPE_EXIT);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
if(conn->inbuf_reached_eof) {
|
|
|
|
/* eof reached, kill it. */
|
2002-06-30 09:37:49 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_inbuf(): conn reached eof. Closing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_inbuf(): state %d.",conn->state);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
switch(conn->state) {
|
2002-06-30 09:37:49 +02:00
|
|
|
case EXIT_CONN_STATE_CONNECTING:
|
|
|
|
log(LOG_DEBUG,"connection_exit_process_inbuf(): text from server while in 'connecting' state. Leaving it on buffer.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0;
|
2002-06-30 09:37:49 +02:00
|
|
|
case EXIT_CONN_STATE_OPEN:
|
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
|
|
|
return connection_package_raw_inbuf(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
int connection_exit_finished_flushing(connection_t *conn) {
|
2002-06-27 00:45:49 +02:00
|
|
|
int e, len=sizeof(e);
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
assert(conn && conn->type == CONN_TYPE_EXIT);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
switch(conn->state) {
|
2002-06-30 09:37:49 +02:00
|
|
|
case EXIT_CONN_STATE_CONNECTING:
|
2002-06-27 00:45:49 +02:00
|
|
|
if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, &e, &len) < 0) { /* not yet */
|
|
|
|
if(errno != EINPROGRESS){
|
|
|
|
/* yuck. kill it. */
|
2002-06-30 09:37:49 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_finished_flushing(): in-progress connect failed. Removing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
} else {
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_finished_flushing(): in-progress connect still waiting.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0; /* no change, see if next time is better */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* the connect has finished. */
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_finished_flushing() : Connection to %s:%u established.",
|
2002-08-24 09:55:49 +02:00
|
|
|
conn->address,conn->port);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
conn->state = EXIT_CONN_STATE_OPEN;
|
2002-07-18 08:37:58 +02:00
|
|
|
if(connection_wants_to_flush(conn)) /* in case there are any queued data cells */
|
|
|
|
connection_start_writing(conn);
|
|
|
|
connection_start_reading(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0;
|
2002-06-30 09:37:49 +02:00
|
|
|
case EXIT_CONN_STATE_OPEN:
|
2002-06-27 00:45:49 +02:00
|
|
|
/* FIXME down the road, we'll clear out circuits that are pending to close */
|
2002-07-18 08:37:58 +02:00
|
|
|
connection_stop_writing(conn);
|
|
|
|
connection_consider_sending_sendme(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0;
|
|
|
|
default:
|
2002-06-30 09:37:49 +02:00
|
|
|
log(LOG_DEBUG,"Bug: connection_exit_finished_flushing() called in unexpected state.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
int connection_exit_process_data_cell(cell_t *cell, connection_t *conn) {
|
2002-06-27 00:45:49 +02:00
|
|
|
struct hostent *rent;
|
|
|
|
struct sockaddr_in dest_addr;
|
2002-07-05 08:27:23 +02:00
|
|
|
int s; /* for the new socket, if we're on connecting_wait */
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/* an outgoing data cell has arrived */
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
assert(conn && conn->type == CONN_TYPE_EXIT);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
switch(conn->state) {
|
2002-06-30 09:37:49 +02:00
|
|
|
case EXIT_CONN_STATE_CONNECTING_WAIT:
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): state is connecting_wait. cell length %d.", cell->length);
|
2002-06-27 00:45:49 +02:00
|
|
|
if(!conn->ss_received) { /* this cell contains the ss */
|
|
|
|
if(cell->length != sizeof(ss_t)) {
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): Supposed to contain SS but wrong size. Closing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
memcpy(&conn->ss, cell->payload, cell->length);
|
|
|
|
if(conn->ss.addr_fmt != SS_ADDR_FMT_ASCII_HOST_PORT) { /* unrecognized address format */
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): SS has unrecognized address format. Closing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
conn->ss_received = 1;
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): SS received.");
|
2002-06-27 00:45:49 +02:00
|
|
|
} else if (!conn->addr) { /* this cell contains the dest addr */
|
|
|
|
if(!memchr(cell->payload,0,cell->length)) {
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): dest_addr cell has no \\0. Closing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
conn->address = strdup(cell->payload);
|
|
|
|
rent = gethostbyname(cell->payload);
|
|
|
|
if (!rent) {
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_ERR,"connection_exit_process_data_cell(): Could not resolve dest addr %s.",cell->payload);
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
memcpy(&conn->addr, rent->h_addr,rent->h_length);
|
2002-07-18 08:37:58 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): addr is %s.",cell->payload);
|
2002-06-27 00:45:49 +02:00
|
|
|
} else if (!conn->port) { /* this cell contains the dest port */
|
|
|
|
if(!memchr(cell->payload,'\0',cell->length)) {
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): dest_port cell has no \\0. Closing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
conn->port = atoi(cell->payload);
|
|
|
|
if(!conn->port) { /* bad port */
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): dest_port cell isn't a valid number. Closing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* all the necessary info is here. Start the connect() */
|
|
|
|
s=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
|
|
|
|
if (s < 0)
|
|
|
|
{
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_ERR,"connection_exit_process_data_cell(): Error creating network socket.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
fcntl(s, F_SETFL, O_NONBLOCK); /* set s to non-blocking */
|
|
|
|
|
|
|
|
memset((void *)&dest_addr,0,sizeof(dest_addr));
|
|
|
|
dest_addr.sin_family = AF_INET;
|
2002-08-24 09:55:49 +02:00
|
|
|
dest_addr.sin_port = htons(conn->port);
|
2002-06-27 00:45:49 +02:00
|
|
|
memcpy((void *)&dest_addr.sin_addr, &conn->addr, sizeof(uint32_t));
|
|
|
|
|
2002-08-24 09:55:49 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): Connecting to %s:%u.",conn->address,conn->port);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
if(connect(s,(struct sockaddr *)&dest_addr,sizeof(dest_addr)) < 0){
|
|
|
|
if(errno != EINPROGRESS){
|
|
|
|
/* yuck. kill it. */
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): Connect failed.");
|
2002-06-27 00:45:49 +02:00
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
/* it's in progress. set state appropriately and return. */
|
|
|
|
conn->s = s;
|
|
|
|
connection_set_poll_socket(conn);
|
2002-06-30 09:37:49 +02:00
|
|
|
conn->state = EXIT_CONN_STATE_CONNECTING;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): connect in progress, socket %d.",s);
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_watch_events(conn, POLLOUT | POLLIN);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* it succeeded. we're connected. */
|
2002-08-24 09:55:49 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): Connection to %s:%u established.",conn->address,conn->port);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
conn->s = s;
|
|
|
|
connection_set_poll_socket(conn);
|
2002-06-30 09:37:49 +02:00
|
|
|
conn->state = EXIT_CONN_STATE_OPEN;
|
2002-06-27 00:45:49 +02:00
|
|
|
connection_watch_events(conn, POLLIN);
|
2002-07-05 08:27:23 +02:00
|
|
|
return 0;
|
2002-07-10 20:39:33 +02:00
|
|
|
} else {
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): in connecting_wait, but I've already received everything. Closing.");
|
2002-07-10 14:37:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2002-07-10 20:39:33 +02:00
|
|
|
return 0;
|
2002-06-30 09:37:49 +02:00
|
|
|
case EXIT_CONN_STATE_CONNECTING:
|
2002-07-10 22:17:27 +02:00
|
|
|
log(LOG_DEBUG,"connection_exit_process_data_cell(): Data receiving while connecting. Queueing.");
|
2002-07-18 08:37:58 +02:00
|
|
|
/* we stay listening for writable, so connect() can finish */
|
|
|
|
/* fall through to the next state -- write the cell and consider sending back a sendme */
|
2002-06-30 09:37:49 +02:00
|
|
|
case EXIT_CONN_STATE_OPEN:
|
2002-07-18 08:37:58 +02:00
|
|
|
if(connection_write_to_buf(cell->payload, cell->length, conn) < 0)
|
|
|
|
return -1;
|
|
|
|
return connection_consider_sending_sendme(conn);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|