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-11-23 09:49:03 +01:00
|
|
|
extern or_options_t options; /* command-line and config-file options */
|
|
|
|
|
2002-11-24 09:45:54 +01:00
|
|
|
void command_time_process_cell(cell_t *cell, connection_t *conn,
|
|
|
|
int *num, int *time,
|
|
|
|
void (*func)(cell_t *, connection_t *)) {
|
|
|
|
struct timeval start, end;
|
|
|
|
int time_passed;
|
|
|
|
|
|
|
|
*num += 1;
|
|
|
|
|
|
|
|
if(gettimeofday(&start,NULL) < 0) {
|
|
|
|
log(LOG_ERR,"command_time_process_cell(): gettimeofday failed.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
(*func)(cell, conn);
|
|
|
|
|
|
|
|
if(gettimeofday(&end,NULL) < 0) {
|
|
|
|
log(LOG_ERR,"command_time_process_cell(): gettimeofday failed.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(end.tv_usec < start.tv_usec) {
|
|
|
|
end.tv_sec--;
|
|
|
|
end.tv_usec += 1000000;
|
|
|
|
}
|
|
|
|
time_passed = ((end.tv_sec - start.tv_sec)*1000000) + (end.tv_usec - start.tv_usec);
|
|
|
|
if(time_passed > 5000) { /* more than 5ms */
|
|
|
|
log(LOG_INFO,"command_time_process_cell(): That call just took %d ms.",time_passed/1000);
|
|
|
|
}
|
|
|
|
*time += time_passed;
|
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
void command_process_cell(cell_t *cell, connection_t *conn) {
|
2002-11-24 09:45:54 +01:00
|
|
|
static int num_create=0, num_data=0, num_destroy=0, num_sendme=0, num_connected=0;
|
|
|
|
static int create_time=0, data_time=0, destroy_time=0, sendme_time=0, connected_time=0;
|
|
|
|
static long current_second = 0; /* from previous calls to gettimeofday */
|
|
|
|
struct timeval now;
|
|
|
|
|
|
|
|
if(gettimeofday(&now,NULL) < 0) {
|
|
|
|
log(LOG_ERR,"command_process_cell(): gettimeofday failed.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(now.tv_sec > current_second) { /* the second has rolled over */
|
|
|
|
/* print stats */
|
|
|
|
log(LOG_INFO,"At end of second:");
|
|
|
|
log(LOG_INFO,"Create: %d (%d ms)", num_create, create_time/1000);
|
|
|
|
log(LOG_INFO,"Data: %d (%d ms)", num_data, data_time/1000);
|
|
|
|
log(LOG_INFO,"Destroy: %d (%d ms)", num_destroy, destroy_time/1000);
|
|
|
|
log(LOG_INFO,"Sendme: %d (%d ms)", num_sendme, sendme_time/1000);
|
|
|
|
log(LOG_INFO,"Connected: %d (%d ms)", num_connected, connected_time/1000);
|
|
|
|
|
|
|
|
/* zero out stats */
|
|
|
|
num_create = num_data = num_destroy = num_sendme = num_connected = 0;
|
|
|
|
create_time = data_time = destroy_time = sendme_time = connected_time = 0;
|
|
|
|
|
|
|
|
/* remember which second it is, for next time */
|
|
|
|
current_second = now.tv_sec;
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
switch(cell->command) {
|
|
|
|
case CELL_PADDING:
|
|
|
|
/* do nothing */
|
|
|
|
break;
|
|
|
|
case CELL_CREATE:
|
2002-11-24 09:45:54 +01:00
|
|
|
log(LOG_INFO,"Starting to process create cell.");
|
|
|
|
command_time_process_cell(cell, conn, &num_create, &create_time,
|
|
|
|
command_process_create_cell);
|
2002-06-27 00:45:49 +02:00
|
|
|
break;
|
|
|
|
case CELL_DATA:
|
2002-11-24 09:45:54 +01:00
|
|
|
command_time_process_cell(cell, conn, &num_data, &data_time,
|
|
|
|
command_process_data_cell);
|
2002-06-27 00:45:49 +02:00
|
|
|
break;
|
|
|
|
case CELL_DESTROY:
|
2002-11-24 09:45:54 +01:00
|
|
|
command_time_process_cell(cell, conn, &num_destroy, &destroy_time,
|
|
|
|
command_process_destroy_cell);
|
2002-06-27 00:45:49 +02:00
|
|
|
break;
|
2002-07-18 08:37:58 +02:00
|
|
|
case CELL_SENDME:
|
2002-11-24 09:45:54 +01:00
|
|
|
command_time_process_cell(cell, conn, &num_sendme, &sendme_time,
|
|
|
|
command_process_sendme_cell);
|
2002-07-18 08:37:58 +02:00
|
|
|
break;
|
2002-09-17 10:14:37 +02:00
|
|
|
case CELL_CONNECTED:
|
2002-11-24 09:45:54 +01:00
|
|
|
command_time_process_cell(cell, conn, &num_connected, &connected_time,
|
|
|
|
command_process_connected_cell);
|
2002-09-17 10:14:37 +02:00
|
|
|
break;
|
2002-07-18 08:37:58 +02:00
|
|
|
default:
|
|
|
|
log(LOG_DEBUG,"Cell of unknown type (%d) received. Dropping.", cell->command);
|
|
|
|
break;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-10-03 04:17:41 +02:00
|
|
|
/* helper function for command_process_create_cell */
|
|
|
|
static int deliver_onion_to_conn(aci_t aci, unsigned char *onion, uint32_t onionlen, connection_t *conn) {
|
|
|
|
char *buf;
|
|
|
|
int buflen, dataleft;
|
|
|
|
cell_t cell;
|
|
|
|
|
|
|
|
assert(aci && onion && onionlen);
|
|
|
|
|
|
|
|
buflen = onionlen+4;
|
|
|
|
buf = malloc(buflen);
|
|
|
|
if(!buf)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"deliver_onion_to_conn(): Setting onion length to %u.",onionlen);
|
|
|
|
*(uint32_t*)buf = htonl(onionlen);
|
|
|
|
memcpy((void *)(buf+4),(void *)onion,onionlen);
|
|
|
|
|
|
|
|
dataleft = buflen;
|
|
|
|
while(dataleft > 0) {
|
|
|
|
memset(&cell,0,sizeof(cell_t));
|
|
|
|
cell.command = CELL_CREATE;
|
|
|
|
cell.aci = aci;
|
|
|
|
if(dataleft >= CELL_PAYLOAD_SIZE)
|
|
|
|
cell.length = CELL_PAYLOAD_SIZE;
|
|
|
|
else
|
|
|
|
cell.length = dataleft;
|
|
|
|
memcpy(cell.payload, buf+buflen-dataleft, cell.length);
|
|
|
|
dataleft -= cell.length;
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"deliver_onion_to_conn(): Delivering create cell, payload %d bytes.",cell.length);
|
|
|
|
if(connection_write_cell_to_buf(&cell, conn) < 0) {
|
|
|
|
log(LOG_DEBUG,"deliver_onion_to_conn(): Could not buffer new create cells. Closing.");
|
|
|
|
free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
void command_process_create_cell(cell_t *cell, connection_t *conn) {
|
|
|
|
circuit_t *circ;
|
|
|
|
connection_t *n_conn;
|
2002-10-03 04:17:41 +02:00
|
|
|
int retval;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
circ = circuit_get_by_aci_conn(cell->aci, conn);
|
|
|
|
|
|
|
|
if(circ && circ->state != CIRCUIT_STATE_OPEN_WAIT) {
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): received CREATE cell, not in open_wait. Dropping.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!circ) { /* if it's not there, create it */
|
|
|
|
circ = circuit_new(cell->aci, conn);
|
|
|
|
circ->state = CIRCUIT_STATE_OPEN_WAIT;
|
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
|
|
|
circ->onionlen = ntohl(*(int*)cell->payload);
|
2002-06-27 00:45:49 +02:00
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Onion length is %u.",circ->onionlen);
|
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(circ->onionlen > 50000 || circ->onionlen < 1) { /* too big or too small */
|
2002-06-27 00:45:49 +02:00
|
|
|
log(LOG_DEBUG,"That's ludicrous. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
circ->onion = (unsigned char *)malloc(circ->onionlen);
|
|
|
|
if(!circ->onion) {
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Out of memory. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if(circ->onionlen < cell->length-4) { /* protect from buffer overflow */
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Onion too small. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
memcpy((void *)circ->onion,(void *)(cell->payload+4),cell->length-4);
|
|
|
|
circ->recvlen = cell->length-4;
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Primary create cell handled, have received %d of %d onion bytes.",
|
|
|
|
circ->recvlen,circ->onionlen);
|
|
|
|
|
|
|
|
} else { /* pull over as much of the onion as we can */
|
|
|
|
if(cell->length + circ->recvlen > circ->onionlen) { /* protect from buffer overflow */
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): payload too big for onion. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
memcpy((void *)(circ->onion+circ->recvlen),(void *)cell->payload,cell->length);
|
|
|
|
circ->recvlen += cell->length;
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Secondary create cell handled, have received %d of %d onion bytes.",
|
|
|
|
circ->recvlen,circ->onionlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(circ->recvlen != circ->onionlen) {
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Onion not all here yet. Ok.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we're all ready to go now. */
|
|
|
|
circ->state = CIRCUIT_STATE_OPEN;
|
|
|
|
|
2002-11-23 09:49:03 +01:00
|
|
|
conn->onions_handled_this_second++;
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Processing onion %d for this second.",conn->onions_handled_this_second);
|
|
|
|
if(conn->onions_handled_this_second > options.OnionsPerSecond) {
|
2002-11-24 09:45:54 +01:00
|
|
|
log(LOG_INFO,"command_process_create_cell(): Received too many onions (now %d) this second. Closing.", conn->onions_handled_this_second);
|
2002-11-23 09:49:03 +01:00
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
if(process_onion(circ, conn) < 0) {
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Onion processing failed. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(circ->n_addr && circ->n_port) { /* must send create cells to the next router */
|
2002-07-08 10:59:15 +02:00
|
|
|
n_conn = connection_twin_get_by_addr_port(circ->n_addr,circ->n_port);
|
2002-06-27 00:45:49 +02:00
|
|
|
if(!n_conn || n_conn->type != CONN_TYPE_OR) {
|
|
|
|
/* i've disabled making connections through OPs, but it's definitely
|
|
|
|
* possible here. I'm not sure if it would be a bug or a feature. -RD
|
|
|
|
*/
|
2002-06-30 09:37:49 +02:00
|
|
|
/* note also that this will close circuits where the onion has the same
|
|
|
|
* router twice in a row in the path. i think that's ok. -RD
|
|
|
|
*/
|
2002-06-27 00:45:49 +02:00
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Next router not connected. Closing.");
|
|
|
|
circuit_close(circ);
|
2002-07-10 21:05:13 +02:00
|
|
|
return;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2002-07-19 01:44:57 +02:00
|
|
|
|
|
|
|
circ->n_addr = n_conn->addr; /* these are different if we found a twin instead */
|
|
|
|
circ->n_port = n_conn->port;
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
circ->n_conn = n_conn;
|
2002-08-24 09:55:49 +02:00
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): n_conn is %s:%u",n_conn->address,n_conn->port);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/* send the CREATE cells on to the next hop */
|
|
|
|
pad_onion(circ->onion,circ->onionlen, sizeof(onion_layer_t));
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Padded the onion with random data.");
|
|
|
|
|
2002-10-03 04:17:41 +02:00
|
|
|
retval = deliver_onion_to_conn(circ->n_aci, circ->onion, circ->onionlen, n_conn);
|
|
|
|
// retval = pack_create(circ->n_aci, circ->onion, circ->onionlen, &cellbuf, &cellbuflen);
|
2002-06-27 00:45:49 +02:00
|
|
|
free((void *)circ->onion);
|
|
|
|
circ->onion = NULL;
|
2002-10-03 04:17:41 +02:00
|
|
|
if (retval == -1) {
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Could not deliver the onion to next conn. Closing.");
|
2002-06-27 00:45:49 +02:00
|
|
|
circuit_close(circ);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
2002-06-30 09:37:49 +02:00
|
|
|
} else { /* this is destined for an exit */
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): Creating new exit connection.");
|
|
|
|
n_conn = connection_new(CONN_TYPE_EXIT);
|
2002-06-27 00:45:49 +02:00
|
|
|
if(!n_conn) {
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): connection_new failed. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
2002-06-30 09:37:49 +02:00
|
|
|
n_conn->state = EXIT_CONN_STATE_CONNECTING_WAIT;
|
2002-07-18 08:37:58 +02:00
|
|
|
n_conn->receiver_bucket = -1; /* edge connections don't do receiver buckets */
|
|
|
|
n_conn->bandwidth = -1;
|
2002-06-27 00:45:49 +02:00
|
|
|
n_conn->s = -1; /* not yet valid */
|
|
|
|
if(connection_add(n_conn) < 0) { /* no space, forget it */
|
|
|
|
log(LOG_DEBUG,"command_process_create_cell(): connection_add failed. Closing.");
|
|
|
|
connection_free(n_conn);
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
circ->n_conn = n_conn;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-07-18 08:37:58 +02:00
|
|
|
void command_process_sendme_cell(cell_t *cell, connection_t *conn) {
|
2002-06-27 00:45:49 +02:00
|
|
|
circuit_t *circ;
|
|
|
|
|
2002-07-18 08:37:58 +02:00
|
|
|
circ = circuit_get_by_aci_conn(cell->aci, conn);
|
|
|
|
|
|
|
|
if(!circ) {
|
|
|
|
log(LOG_DEBUG,"command_process_sendme_cell(): unknown circuit %d. Dropping.", cell->aci);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(circ->state == CIRCUIT_STATE_OPEN_WAIT) {
|
|
|
|
log(LOG_DEBUG,"command_process_sendme_cell(): circuit in open_wait. Dropping.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if(circ->state == CIRCUIT_STATE_OR_WAIT) {
|
|
|
|
log(LOG_DEBUG,"command_process_sendme_cell(): circuit in or_wait. Dropping.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* at this point both circ->n_conn and circ->p_conn are guaranteed to be set */
|
|
|
|
|
2002-11-24 09:45:54 +01:00
|
|
|
if(cell->length != RECEIVE_WINDOW_INCREMENT) {
|
|
|
|
log(LOG_WARNING,"command_process_sendme_cell(): non-standard sendme value %d.",cell->length);
|
|
|
|
}
|
|
|
|
// assert(cell->length == RECEIVE_WINDOW_INCREMENT);
|
2002-07-18 08:37:58 +02:00
|
|
|
|
|
|
|
if(cell->aci == circ->p_aci) { /* it's an outgoing cell */
|
|
|
|
circ->n_receive_window += cell->length;
|
|
|
|
log(LOG_DEBUG,"connection_process_sendme_cell(): n_receive_window for aci %d is %d.",circ->n_aci,circ->n_receive_window);
|
|
|
|
if(circ->n_conn->type == CONN_TYPE_EXIT) {
|
|
|
|
connection_start_reading(circ->n_conn);
|
|
|
|
connection_package_raw_inbuf(circ->n_conn); /* handle whatever might still be on the inbuf */
|
|
|
|
} else {
|
|
|
|
cell->aci = circ->n_aci; /* switch it */
|
|
|
|
if(connection_write_cell_to_buf(cell, circ->n_conn) < 0) { /* (clobbers cell) */
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else { /* it's an ingoing cell */
|
|
|
|
circ->p_receive_window += cell->length;
|
|
|
|
log(LOG_DEBUG,"connection_process_sendme_cell(): p_receive_window for aci %d is %d.",circ->p_aci,circ->p_receive_window);
|
|
|
|
if(circ->p_conn->type == CONN_TYPE_AP) {
|
|
|
|
connection_start_reading(circ->p_conn);
|
|
|
|
connection_package_raw_inbuf(circ->p_conn); /* handle whatever might still be on the inbuf */
|
|
|
|
} else {
|
|
|
|
cell->aci = circ->p_aci; /* switch it */
|
|
|
|
if(connection_write_cell_to_buf(cell, circ->p_conn) < 0) { /* (clobbers cell) */
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void command_process_data_cell(cell_t *cell, connection_t *conn) {
|
|
|
|
circuit_t *circ;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
circ = circuit_get_by_aci_conn(cell->aci, conn);
|
|
|
|
|
|
|
|
if(!circ) {
|
2002-07-18 08:37:58 +02:00
|
|
|
log(LOG_DEBUG,"command_process_data_cell(): unknown circuit %d. Dropping.", cell->aci);
|
2002-06-27 00:45:49 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(circ->state == CIRCUIT_STATE_OPEN_WAIT) {
|
|
|
|
log(LOG_DEBUG,"command_process_data_cell(): circuit in open_wait. Dropping data cell.");
|
|
|
|
return;
|
|
|
|
}
|
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(circ->state == CIRCUIT_STATE_OR_WAIT) {
|
|
|
|
log(LOG_DEBUG,"command_process_data_cell(): circuit in or_wait. Dropping data cell.");
|
|
|
|
return;
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
/* at this point both circ->n_conn and circ->p_conn are guaranteed to be set */
|
|
|
|
|
|
|
|
if(cell->aci == circ->p_aci) { /* it's an outgoing cell */
|
|
|
|
cell->aci = circ->n_aci; /* switch it */
|
2002-07-18 08:37:58 +02:00
|
|
|
if(--circ->p_receive_window < 0) { /* is it less than 0 after decrement? */
|
|
|
|
log(LOG_DEBUG,"connection_process_data_cell(): Too many data cells on aci %d. Closing.", circ->p_aci);
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"connection_process_data_cell(): p_receive_window for aci %d is %d.",circ->p_aci,circ->p_receive_window);
|
2002-06-27 00:45:49 +02:00
|
|
|
if(circuit_deliver_data_cell(cell, circ, circ->n_conn, 'd') < 0) {
|
|
|
|
log(LOG_DEBUG,"command_process_data_cell(): circuit_deliver_data_cell (forward) failed. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else { /* it's an ingoing cell */
|
|
|
|
cell->aci = circ->p_aci; /* switch it */
|
2002-07-18 08:37:58 +02:00
|
|
|
if(--circ->n_receive_window < 0) { /* is it less than 0 after decrement? */
|
|
|
|
log(LOG_DEBUG,"connection_process_data_cell(): Too many data cells on aci %d. Closing.", circ->n_aci);
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"connection_process_data_cell(): n_receive_window for aci %d is %d.",circ->n_aci,circ->n_receive_window);
|
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(circ->p_conn->type == CONN_TYPE_AP) { /* we want to decrypt, not encrypt */
|
|
|
|
if(circuit_deliver_data_cell(cell, circ, circ->p_conn, 'd') < 0) {
|
|
|
|
log(LOG_DEBUG,"command_process_data_cell(): circuit_deliver_data_cell (backward to AP) failed. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if(circuit_deliver_data_cell(cell, circ, circ->p_conn, 'e') < 0) {
|
|
|
|
log(LOG_DEBUG,"command_process_data_cell(): circuit_deliver_data_cell (backward) failed. Closing.");
|
|
|
|
circuit_close(circ);
|
|
|
|
return;
|
|
|
|
}
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void command_process_destroy_cell(cell_t *cell, connection_t *conn) {
|
|
|
|
circuit_t *circ;
|
|
|
|
|
|
|
|
circ = circuit_get_by_aci_conn(cell->aci, conn);
|
|
|
|
|
|
|
|
if(!circ) {
|
2002-07-18 08:37:58 +02:00
|
|
|
log(LOG_DEBUG,"command_process_destroy_cell(): unknown circuit %d. Dropping.", cell->aci);
|
2002-06-27 00:45:49 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"command_process_destroy_cell(): Received for aci %d.",cell->aci);
|
|
|
|
circuit_remove(circ);
|
|
|
|
if(cell->aci == circ->p_aci) /* the destroy came from behind */
|
|
|
|
connection_send_destroy(circ->n_aci, circ->n_conn);
|
|
|
|
if(cell->aci == circ->n_aci) /* the destroy came from ahead */
|
|
|
|
connection_send_destroy(circ->p_aci, circ->p_conn);
|
|
|
|
circuit_free(circ);
|
|
|
|
}
|
|
|
|
|
2002-09-17 10:14:37 +02:00
|
|
|
void command_process_connected_cell(cell_t *cell, connection_t *conn) {
|
|
|
|
circuit_t *circ;
|
|
|
|
|
|
|
|
circ = circuit_get_by_aci_conn(cell->aci, conn);
|
|
|
|
|
|
|
|
if(!circ) {
|
|
|
|
log(LOG_DEBUG,"command_process_connected_cell(): unknown circuit %d. Dropping.", cell->aci);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(circ->n_conn != conn) {
|
|
|
|
log(LOG_WARNING,"command_process_connected_cell(): cell didn't come from n_conn! (aci %d)",cell->aci);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"command_process_connected_cell(): Received for aci %d.",cell->aci);
|
|
|
|
connection_send_connected(circ->p_aci, circ->p_conn);
|
|
|
|
}
|
|
|
|
|