2003-10-08 04:04:08 +02:00
|
|
|
/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
|
2003-04-12 00:11:11 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
|
|
|
|
|
|
|
#include "or.h"
|
2003-11-14 21:45:47 +01:00
|
|
|
#include "tree.h"
|
2003-04-12 00:11:11 +02:00
|
|
|
|
|
|
|
extern or_options_t options; /* command-line and config-file options */
|
2003-12-14 07:50:44 +01:00
|
|
|
extern char *conn_state_to_string[][_CONN_TYPE_MAX+1];
|
2003-04-12 00:11:11 +02:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
static int connection_ap_handshake_process_socks(connection_t *conn);
|
|
|
|
|
|
|
|
static int connection_exit_begin_conn(cell_t *cell, circuit_t *circ);
|
2003-10-22 11:08:10 +02:00
|
|
|
static void connection_edge_consider_sending_sendme(connection_t *conn);
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2003-11-14 21:45:47 +01:00
|
|
|
static uint32_t client_dns_lookup_entry(const char *address);
|
|
|
|
static void client_dns_set_entry(const char *address, uint32_t val);
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
void relay_header_pack(char *dest, const relay_header_t *src) {
|
2004-03-20 10:30:30 +01:00
|
|
|
*(uint8_t*)(dest) = src->command;
|
|
|
|
|
2004-04-03 05:07:25 +02:00
|
|
|
set_uint16(dest+1, htons(src->recognized));
|
|
|
|
set_uint16(dest+3, htons(src->stream_id));
|
2004-01-02 10:03:38 +01:00
|
|
|
memcpy(dest+5, src->integrity, 4);
|
2004-04-03 05:07:25 +02:00
|
|
|
set_uint16(dest+9, htons(src->length));
|
2003-12-19 06:09:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void relay_header_unpack(relay_header_t *dest, const char *src) {
|
2004-03-20 10:30:30 +01:00
|
|
|
dest->command = *(uint8_t*)(src);
|
|
|
|
|
2004-04-03 05:07:25 +02:00
|
|
|
dest->recognized = ntohs(get_uint16(src+1));
|
|
|
|
dest->stream_id = ntohs(get_uint16(src+3));
|
2004-03-20 10:30:30 +01:00
|
|
|
memcpy(dest->integrity, src+5, 4);
|
2004-04-03 05:07:25 +02:00
|
|
|
dest->length = ntohs(get_uint16(src+9));
|
2003-12-19 06:09:51 +01:00
|
|
|
}
|
|
|
|
|
2004-04-01 00:02:13 +02:00
|
|
|
/* mark and return -1 if there was an unexpected error with the conn,
|
|
|
|
* else return 0.
|
|
|
|
*/
|
2003-04-12 00:11:11 +02:00
|
|
|
int connection_edge_process_inbuf(connection_t *conn) {
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
assert(conn->type == CONN_TYPE_AP || conn->type == CONN_TYPE_EXIT);
|
|
|
|
|
|
|
|
if(conn->inbuf_reached_eof) {
|
|
|
|
#ifdef HALF_OPEN
|
2003-12-17 22:09:31 +01:00
|
|
|
/* eof reached; we're done reading, but we might want to write more. */
|
2003-04-12 00:11:11 +02:00
|
|
|
conn->done_receiving = 1;
|
|
|
|
shutdown(conn->s, 0); /* XXX check return, refactor NM */
|
2003-10-21 10:37:07 +02:00
|
|
|
if (conn->done_sending) {
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_DONE);
|
2003-10-21 10:37:07 +02:00
|
|
|
} else {
|
|
|
|
connection_edge_send_command(conn, circuit_get_by_conn(conn), RELAY_COMMAND_END,
|
|
|
|
NULL, 0, conn->cpath_layer);
|
|
|
|
}
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
2003-12-17 22:09:31 +01:00
|
|
|
#else
|
2003-04-12 00:11:11 +02:00
|
|
|
/* eof reached, kill it. */
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"conn (fd %d) reached eof. Closing.", conn->s);
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_DONE);
|
2004-03-03 09:46:18 +01:00
|
|
|
conn->hold_open_until_flushed = 1; /* just because we shouldn't read
|
|
|
|
doesn't mean we shouldn't write */
|
2004-03-03 07:26:34 +01:00
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(conn->state) {
|
|
|
|
case AP_CONN_STATE_SOCKS_WAIT:
|
2003-10-21 10:37:07 +02:00
|
|
|
if(connection_ap_handshake_process_socks(conn) < 0) {
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_MISC);
|
2004-03-03 07:26:34 +01:00
|
|
|
conn->hold_open_until_flushed = 1;
|
2003-10-21 10:37:07 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
case AP_CONN_STATE_OPEN:
|
|
|
|
case EXIT_CONN_STATE_OPEN:
|
2003-11-30 11:10:29 +01:00
|
|
|
if(conn->package_window <= 0) {
|
2004-04-05 02:47:48 +02:00
|
|
|
/* XXX this is still getting called rarely :( */
|
2003-11-30 11:10:29 +01:00
|
|
|
log_fn(LOG_WARN,"called with package_window %d. Tell Roger.", conn->package_window);
|
|
|
|
return 0;
|
|
|
|
}
|
2003-10-21 10:37:07 +02:00
|
|
|
if(connection_edge_package_raw_inbuf(conn) < 0) {
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_MISC);
|
2003-10-21 10:37:07 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
case EXIT_CONN_STATE_CONNECTING:
|
2004-04-05 02:47:48 +02:00
|
|
|
case AP_CONN_STATE_RENDDESC_WAIT:
|
2004-04-01 00:02:13 +02:00
|
|
|
case AP_CONN_STATE_CIRCUIT_WAIT:
|
|
|
|
case AP_CONN_STATE_CONNECT_WAIT:
|
|
|
|
log_fn(LOG_INFO,"data from edge while in '%s' state. Leaving it on buffer.",
|
|
|
|
conn_state_to_string[conn->type][conn->state]);
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2004-01-20 10:21:46 +01:00
|
|
|
log_fn(LOG_WARN,"Got unexpected state %d. Closing.",conn->state);
|
2004-04-01 00:02:13 +02:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_MISC);
|
2004-01-20 10:21:46 +01:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
|
2004-02-29 01:11:37 +01:00
|
|
|
int connection_edge_destroy(uint16_t circ_id, connection_t *conn) {
|
|
|
|
assert(conn->type == CONN_TYPE_AP || conn->type == CONN_TYPE_EXIT);
|
|
|
|
|
2004-03-03 08:24:53 +01:00
|
|
|
if(conn->marked_for_close)
|
|
|
|
return 0; /* already marked; probably got an 'end' */
|
2004-02-29 01:11:37 +01:00
|
|
|
log_fn(LOG_INFO,"CircID %d: At an edge. Marking connection for close.",
|
|
|
|
circ_id);
|
|
|
|
conn->has_sent_end = 1; /* we're closing the circuit, nothing to send to */
|
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_DESTROY);
|
2004-03-03 07:26:34 +01:00
|
|
|
conn->hold_open_until_flushed = 1;
|
2004-02-29 01:11:37 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-12-16 10:48:17 +01:00
|
|
|
static char *connection_edge_end_reason(char *payload, uint16_t length) {
|
2003-10-22 09:55:44 +02:00
|
|
|
if(length < 1) {
|
|
|
|
log_fn(LOG_WARN,"End cell arrived with length 0. Should be at least 1.");
|
|
|
|
return "MALFORMED";
|
|
|
|
}
|
2004-02-29 23:04:52 +01:00
|
|
|
if(*payload < _MIN_END_STREAM_REASON || *payload > _MAX_END_STREAM_REASON) {
|
2003-10-22 09:55:44 +02:00
|
|
|
log_fn(LOG_WARN,"Reason for ending (%d) not recognized.",*payload);
|
|
|
|
return "MALFORMED";
|
|
|
|
}
|
|
|
|
switch(*payload) {
|
|
|
|
case END_STREAM_REASON_MISC: return "misc error";
|
|
|
|
case END_STREAM_REASON_RESOLVEFAILED: return "resolve failed";
|
|
|
|
case END_STREAM_REASON_CONNECTFAILED: return "connect failed";
|
|
|
|
case END_STREAM_REASON_EXITPOLICY: return "exit policy failed";
|
|
|
|
case END_STREAM_REASON_DESTROY: return "destroyed";
|
|
|
|
case END_STREAM_REASON_DONE: return "closed normally";
|
2004-02-29 00:56:50 +01:00
|
|
|
case END_STREAM_REASON_TIMEOUT: return "gave up (timeout)";
|
2003-10-22 09:55:44 +02:00
|
|
|
}
|
|
|
|
assert(0);
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
2003-12-14 09:32:14 +01:00
|
|
|
int connection_edge_end(connection_t *conn, char reason, crypt_path_t *cpath_layer) {
|
2003-10-22 09:55:44 +02:00
|
|
|
char payload[5];
|
|
|
|
int payload_len=1;
|
|
|
|
circuit_t *circ;
|
2003-10-21 10:37:07 +02:00
|
|
|
|
|
|
|
if(conn->has_sent_end) {
|
|
|
|
log_fn(LOG_WARN,"It appears I've already sent the end. Are you calling me twice?");
|
2003-12-14 09:32:14 +01:00
|
|
|
return -1;
|
2003-10-21 10:37:07 +02:00
|
|
|
}
|
|
|
|
|
2003-10-22 09:55:44 +02:00
|
|
|
payload[0] = reason;
|
|
|
|
if(reason == END_STREAM_REASON_EXITPOLICY) {
|
2004-04-06 22:25:18 +02:00
|
|
|
/* this is safe even for rend circs, because they never fail
|
|
|
|
* because of exitpolicy */
|
2004-04-03 05:07:25 +02:00
|
|
|
set_uint32(payload+1, htonl(conn->addr));
|
2003-11-16 18:00:02 +01:00
|
|
|
payload_len += 4;
|
2003-10-22 09:55:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
circ = circuit_get_by_conn(conn);
|
2004-02-27 23:00:26 +01:00
|
|
|
if(circ && !circ->marked_for_close) {
|
2003-10-21 10:37:07 +02:00
|
|
|
log_fn(LOG_DEBUG,"Marking conn (fd %d) and sending end.",conn->s);
|
|
|
|
connection_edge_send_command(conn, circ, RELAY_COMMAND_END,
|
|
|
|
payload, payload_len, cpath_layer);
|
2004-02-27 23:00:26 +01:00
|
|
|
} else {
|
|
|
|
log_fn(LOG_DEBUG,"Marking conn (fd %d); no circ to send end.",conn->s);
|
2003-10-21 10:37:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
conn->has_sent_end = 1;
|
2003-12-14 09:32:14 +01:00
|
|
|
return 0;
|
2003-10-21 10:37:07 +02:00
|
|
|
}
|
|
|
|
|
2004-04-01 22:33:29 +02:00
|
|
|
/* Make a relay cell out of 'relay_command' and 'payload', and
|
|
|
|
* send it onto the open circuit 'circ'. If it's a control cell,
|
|
|
|
* set fromconn to NULL, else it's the stream that's sending the
|
|
|
|
* relay cell. Use cpath_layer NULL if you're responding to the OP;
|
|
|
|
* If it's an outgoing cell it must specify the destination hop.
|
|
|
|
*
|
|
|
|
* If you can't send the cell, mark the circuit for close and
|
|
|
|
* return -1. Else return 0.
|
|
|
|
*/
|
2004-04-01 00:02:13 +02:00
|
|
|
int connection_edge_send_command(connection_t *fromconn, circuit_t *circ,
|
2004-04-03 05:37:11 +02:00
|
|
|
int relay_command, const char *payload,
|
2004-04-01 00:02:13 +02:00
|
|
|
int payload_len, crypt_path_t *cpath_layer) {
|
2003-04-12 00:11:11 +02:00
|
|
|
cell_t cell;
|
2003-12-19 06:09:51 +01:00
|
|
|
relay_header_t rh;
|
2003-06-12 12:16:33 +02:00
|
|
|
int cell_direction;
|
2003-04-12 00:11:11 +02:00
|
|
|
|
|
|
|
if(!circ) {
|
2004-02-28 08:01:22 +01:00
|
|
|
log_fn(LOG_WARN,"no circ. Closing conn.");
|
2004-01-19 05:58:39 +01:00
|
|
|
assert(fromconn);
|
2004-02-28 04:06:31 +01:00
|
|
|
connection_mark_for_close(fromconn, 0);
|
2003-12-16 23:56:50 +01:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
memset(&cell, 0, sizeof(cell_t));
|
2003-12-19 06:09:51 +01:00
|
|
|
cell.command = CELL_RELAY;
|
2003-12-16 23:56:50 +01:00
|
|
|
if(cpath_layer) {
|
2003-11-11 04:01:48 +01:00
|
|
|
cell.circ_id = circ->n_circ_id;
|
2003-06-12 12:16:33 +02:00
|
|
|
cell_direction = CELL_DIRECTION_OUT;
|
|
|
|
} else {
|
2003-11-11 04:01:48 +01:00
|
|
|
cell.circ_id = circ->p_circ_id;
|
2003-06-12 12:16:33 +02:00
|
|
|
cell_direction = CELL_DIRECTION_IN;
|
|
|
|
}
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
memset(&rh, 0, sizeof(rh));
|
|
|
|
rh.command = relay_command;
|
|
|
|
if(fromconn)
|
|
|
|
rh.stream_id = fromconn->stream_id; /* else it's 0 */
|
|
|
|
rh.length = payload_len;
|
|
|
|
relay_header_pack(cell.payload, &rh);
|
|
|
|
if(payload_len)
|
|
|
|
memcpy(cell.payload+RELAY_HEADER_SIZE, payload, payload_len);
|
2003-12-16 23:56:50 +01:00
|
|
|
|
2003-10-08 06:10:59 +02:00
|
|
|
log_fn(LOG_DEBUG,"delivering %d cell %s.", relay_command,
|
2003-10-04 10:19:23 +02:00
|
|
|
cell_direction == CELL_DIRECTION_OUT ? "forward" : "backward");
|
2003-04-12 00:11:11 +02:00
|
|
|
|
2003-12-23 08:45:31 +01:00
|
|
|
if(circuit_package_relay_cell(&cell, circ, cell_direction, cpath_layer) < 0) {
|
|
|
|
log_fn(LOG_WARN,"circuit_package_relay_cell failed. Closing.");
|
2004-03-02 18:48:17 +01:00
|
|
|
circuit_mark_for_close(circ);
|
2003-10-22 11:08:10 +02:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
2003-10-22 11:08:10 +02:00
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
|
2003-09-14 10:17:14 +02:00
|
|
|
/* an incoming relay cell has arrived. return -1 if you want to tear down the
|
|
|
|
* circuit, else 0. */
|
2004-04-01 00:02:13 +02:00
|
|
|
int connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
|
|
|
|
connection_t *conn, int edge_type,
|
|
|
|
crypt_path_t *layer_hint) {
|
2003-04-12 00:11:11 +02:00
|
|
|
static int num_seen=0;
|
2003-11-14 21:45:47 +01:00
|
|
|
uint32_t addr;
|
2003-12-19 06:09:51 +01:00
|
|
|
relay_header_t rh;
|
2003-04-12 00:11:11 +02:00
|
|
|
|
|
|
|
assert(cell && circ);
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
relay_header_unpack(&rh, cell->payload);
|
|
|
|
// log_fn(LOG_DEBUG,"command %d stream %d", rh.command, rh.stream_id);
|
2003-04-12 00:11:11 +02:00
|
|
|
num_seen++;
|
2003-06-18 00:18:26 +02:00
|
|
|
log_fn(LOG_DEBUG,"Now seen %d relay cells here.", num_seen);
|
2003-04-12 00:11:11 +02:00
|
|
|
|
2003-05-02 23:29:25 +02:00
|
|
|
/* either conn is NULL, in which case we've got a control cell, or else
|
|
|
|
* conn points to the recognized stream. */
|
2003-04-12 00:11:11 +02:00
|
|
|
|
|
|
|
if(conn && conn->state != AP_CONN_STATE_OPEN && conn->state != EXIT_CONN_STATE_OPEN) {
|
2004-01-20 19:17:43 +01:00
|
|
|
if(rh.command == RELAY_COMMAND_END) {
|
2004-03-03 07:26:34 +01:00
|
|
|
log_fn(LOG_INFO,"Edge got end (%s) before we're connected. Marking for close.",
|
2003-12-19 06:09:51 +01:00
|
|
|
connection_edge_end_reason(cell->payload+RELAY_HEADER_SIZE, rh.length));
|
2004-04-08 05:30:47 +02:00
|
|
|
if(CIRCUIT_IS_ORIGIN(circ))
|
|
|
|
circuit_log_path(LOG_INFO,circ);
|
2004-02-29 23:07:44 +01:00
|
|
|
conn->has_sent_end = 1; /* we just got an 'end', don't need to send one */
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, 0);
|
2004-03-03 07:26:34 +01:00
|
|
|
/* XXX This is where we should check if reason is EXITPOLICY, and reattach */
|
|
|
|
/* XXX here we should send a socks reject back if necessary, and hold
|
|
|
|
* open til flushed */
|
2003-09-27 23:09:56 +02:00
|
|
|
return 0;
|
2004-01-20 10:21:46 +01:00
|
|
|
}
|
|
|
|
if(conn->type == CONN_TYPE_AP && rh.command == RELAY_COMMAND_CONNECTED) {
|
2004-03-03 05:54:16 +01:00
|
|
|
if(conn->state != AP_CONN_STATE_CONNECT_WAIT) {
|
2004-03-03 07:26:34 +01:00
|
|
|
log_fn(LOG_WARN,"Got 'connected' while not in state connect_wait. Dropping.");
|
2004-01-20 10:21:46 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2004-02-28 08:01:22 +01:00
|
|
|
// log_fn(LOG_INFO,"Connected! Notifying application.");
|
2004-01-20 10:21:46 +01:00
|
|
|
conn->state = AP_CONN_STATE_OPEN;
|
|
|
|
if (rh.length >= 4) {
|
2004-04-03 05:07:25 +02:00
|
|
|
addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE));
|
2004-01-20 10:21:46 +01:00
|
|
|
client_dns_set_entry(conn->socks_request->address, addr);
|
|
|
|
}
|
2004-02-28 08:01:22 +01:00
|
|
|
log_fn(LOG_INFO,"'connected' received after %d seconds.",
|
2004-01-20 10:21:46 +01:00
|
|
|
(int)(time(NULL) - conn->timestamp_lastread));
|
2004-02-28 08:01:22 +01:00
|
|
|
circuit_log_path(LOG_INFO,circ);
|
2004-03-03 07:26:34 +01:00
|
|
|
connection_ap_handshake_socks_reply(conn, NULL, 0, 1);
|
2004-03-27 06:45:52 +01:00
|
|
|
conn->socks_request->has_finished = 1;
|
2004-04-01 00:02:13 +02:00
|
|
|
/* handle anything that might have queued */
|
|
|
|
if (connection_edge_package_raw_inbuf(conn) < 0) {
|
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_MISC);
|
|
|
|
return 0;
|
|
|
|
}
|
2004-01-20 10:21:46 +01:00
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
} else {
|
2003-12-14 07:50:44 +01:00
|
|
|
log_fn(LOG_WARN,"Got an unexpected relay command %d, in state %d (%s). Closing.",
|
2003-12-19 06:09:51 +01:00
|
|
|
rh.command, conn->state, conn_state_to_string[conn->type][conn->state]);
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_MISC);
|
2003-09-27 23:09:56 +02:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
switch(rh.command) {
|
2003-12-23 08:45:31 +01:00
|
|
|
case RELAY_COMMAND_DROP:
|
|
|
|
log_fn(LOG_INFO,"Got a relay-level padding cell. Dropping.");
|
|
|
|
return 0;
|
2003-05-01 08:42:29 +02:00
|
|
|
case RELAY_COMMAND_BEGIN:
|
2004-04-06 22:25:18 +02:00
|
|
|
if (edge_type == EDGE_AP &&
|
|
|
|
circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"relay begin request unsupported at AP. Dropping.");
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-05-06 01:24:46 +02:00
|
|
|
if(conn) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"begin cell for known stream. Dropping.");
|
2003-05-06 01:24:46 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-11-17 08:20:51 +01:00
|
|
|
connection_exit_begin_conn(cell, circ);
|
|
|
|
return 0;
|
2003-05-01 08:42:29 +02:00
|
|
|
case RELAY_COMMAND_DATA:
|
2003-10-02 22:00:38 +02:00
|
|
|
++stats_n_data_cells_received;
|
2003-05-20 08:41:23 +02:00
|
|
|
if((edge_type == EDGE_AP && --layer_hint->deliver_window < 0) ||
|
|
|
|
(edge_type == EDGE_EXIT && --circ->deliver_window < 0)) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"(relay data) circ deliver_window below 0. Killing.");
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_MISC);
|
2003-09-14 10:17:14 +02:00
|
|
|
return -1;
|
2003-05-20 08:41:23 +02:00
|
|
|
}
|
2003-12-19 06:09:51 +01:00
|
|
|
log_fn(LOG_DEBUG,"circ deliver_window now %d.", edge_type == EDGE_AP ?
|
|
|
|
layer_hint->deliver_window : circ->deliver_window);
|
2003-05-20 08:41:23 +02:00
|
|
|
|
2003-12-16 23:56:50 +01:00
|
|
|
circuit_consider_sending_sendme(circ, edge_type, layer_hint);
|
2003-05-20 08:41:23 +02:00
|
|
|
|
2003-04-12 00:11:11 +02:00
|
|
|
if(!conn) {
|
2003-12-19 06:09:51 +01:00
|
|
|
log_fn(LOG_INFO,"data cell dropped, unknown stream.");
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-05-20 08:41:23 +02:00
|
|
|
|
|
|
|
if(--conn->deliver_window < 0) { /* is it below 0 after decrement? */
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"(relay data) conn deliver_window below 0. Killing.");
|
2003-04-12 00:11:11 +02:00
|
|
|
return -1; /* somebody's breaking protocol. kill the whole circuit. */
|
|
|
|
}
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
stats_n_data_bytes_received += rh.length;
|
2003-10-04 04:38:18 +02:00
|
|
|
connection_write_to_buf(cell->payload + RELAY_HEADER_SIZE,
|
2003-12-19 06:09:51 +01:00
|
|
|
rh.length, conn);
|
2003-10-22 11:08:10 +02:00
|
|
|
connection_edge_consider_sending_sendme(conn);
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
2003-05-01 08:42:29 +02:00
|
|
|
case RELAY_COMMAND_END:
|
2003-04-12 00:11:11 +02:00
|
|
|
if(!conn) {
|
2003-12-19 06:09:51 +01:00
|
|
|
log_fn(LOG_INFO,"end cell (%s) dropped, unknown stream.",
|
|
|
|
connection_edge_end_reason(cell->payload+RELAY_HEADER_SIZE, rh.length));
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-12-19 06:09:51 +01:00
|
|
|
if(rh.length >= 5 &&
|
2003-11-14 21:45:47 +01:00
|
|
|
*(cell->payload+RELAY_HEADER_SIZE) == END_STREAM_REASON_EXITPOLICY) {
|
2004-03-03 07:26:34 +01:00
|
|
|
|
|
|
|
/* XXX this will never be reached, since we're in 'connect_wait' state
|
|
|
|
* but this is only reached when we're in 'open' state. Put it higher. */
|
|
|
|
|
2003-10-22 09:55:44 +02:00
|
|
|
/* No need to close the connection. We'll hold it open while
|
|
|
|
* we try a new exit node.
|
2003-11-16 18:00:02 +01:00
|
|
|
* cell->payload+RELAY_HEADER_SIZE+1 holds the destination addr.
|
2003-10-22 09:55:44 +02:00
|
|
|
*/
|
2004-04-03 05:07:25 +02:00
|
|
|
addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1));
|
2003-11-16 18:00:02 +01:00
|
|
|
client_dns_set_entry(conn->socks_request->address, addr);
|
2003-11-16 06:33:45 +01:00
|
|
|
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2004-04-03 00:23:15 +02:00
|
|
|
if(connection_ap_handshake_attach_circuit(conn) >= 0)
|
2004-02-18 02:21:20 +01:00
|
|
|
return 0;
|
|
|
|
/* else, conn will get closed below */
|
2003-10-22 09:55:44 +02:00
|
|
|
}
|
2004-01-11 00:40:38 +01:00
|
|
|
/* XXX add to this log_fn the exit node's nickname? */
|
2003-11-14 21:45:47 +01:00
|
|
|
log_fn(LOG_INFO,"end cell (%s) for stream %d. Removing stream.",
|
2003-12-19 06:09:51 +01:00
|
|
|
connection_edge_end_reason(cell->payload+RELAY_HEADER_SIZE, rh.length),
|
|
|
|
conn->stream_id);
|
2003-04-12 00:11:11 +02:00
|
|
|
|
|
|
|
#ifdef HALF_OPEN
|
|
|
|
conn->done_sending = 1;
|
|
|
|
shutdown(conn->s, 1); /* XXX check return; refactor NM */
|
2003-10-21 10:37:07 +02:00
|
|
|
if (conn->done_receiving) {
|
2004-02-28 05:44:48 +01:00
|
|
|
/* We just *got* an end; no reason to send one. */
|
|
|
|
conn->has_sent_end = 1;
|
|
|
|
connection_mark_for_close(conn, 0);
|
2004-03-03 07:26:34 +01:00
|
|
|
conn->hold_open_until_flushed = 1;
|
2003-10-21 10:37:07 +02:00
|
|
|
}
|
|
|
|
#else
|
2004-02-28 05:25:54 +01:00
|
|
|
/* We just *got* an end; no reason to send one. */
|
|
|
|
conn->has_sent_end = 1;
|
|
|
|
connection_mark_for_close(conn, 0);
|
2004-03-03 07:26:34 +01:00
|
|
|
conn->hold_open_until_flushed = 1;
|
2003-04-12 00:11:11 +02:00
|
|
|
#endif
|
2003-11-17 08:20:51 +01:00
|
|
|
return 0;
|
2003-05-06 01:24:46 +02:00
|
|
|
case RELAY_COMMAND_EXTEND:
|
|
|
|
if(conn) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"'extend' for non-zero stream. Dropping.");
|
2003-05-06 01:24:46 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return circuit_extend(cell, circ);
|
|
|
|
case RELAY_COMMAND_EXTENDED:
|
|
|
|
if(edge_type == EDGE_EXIT) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"'extended' unsupported at exit. Dropping.");
|
2003-05-06 01:24:46 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-06-18 00:18:26 +02:00
|
|
|
log_fn(LOG_DEBUG,"Got an extended cell! Yay.");
|
2003-05-06 01:24:46 +02:00
|
|
|
if(circuit_finish_handshake(circ, cell->payload+RELAY_HEADER_SIZE) < 0) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"circuit_finish_handshake failed.");
|
2003-05-06 01:24:46 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-11-17 08:20:51 +01:00
|
|
|
if (circuit_send_next_onion_skin(circ)<0) {
|
2003-12-14 07:50:44 +01:00
|
|
|
log_fn(LOG_INFO,"circuit_send_next_onion_skin() failed.");
|
2003-11-17 08:20:51 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2003-06-12 12:16:33 +02:00
|
|
|
case RELAY_COMMAND_TRUNCATE:
|
|
|
|
if(edge_type == EDGE_AP) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"'truncate' unsupported at AP. Dropping.");
|
2003-06-12 12:16:33 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if(circ->n_conn) {
|
2003-11-11 04:01:48 +01:00
|
|
|
connection_send_destroy(circ->n_circ_id, circ->n_conn);
|
2003-06-12 12:16:33 +02:00
|
|
|
circ->n_conn = NULL;
|
|
|
|
}
|
2003-06-18 00:18:26 +02:00
|
|
|
log_fn(LOG_DEBUG, "Processed 'truncate', replying.");
|
2003-10-04 10:19:23 +02:00
|
|
|
connection_edge_send_command(NULL, circ, RELAY_COMMAND_TRUNCATED,
|
|
|
|
NULL, 0, NULL);
|
|
|
|
return 0;
|
2003-06-12 12:16:33 +02:00
|
|
|
case RELAY_COMMAND_TRUNCATED:
|
|
|
|
if(edge_type == EDGE_EXIT) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"'truncated' unsupported at exit. Dropping.");
|
2003-06-12 12:16:33 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-11-17 08:20:51 +01:00
|
|
|
circuit_truncated(circ, layer_hint);
|
|
|
|
return 0;
|
2003-05-01 08:42:29 +02:00
|
|
|
case RELAY_COMMAND_CONNECTED:
|
2004-02-28 08:01:22 +01:00
|
|
|
if(conn) {
|
|
|
|
log_fn(LOG_WARN,"'connected' unsupported while open. Closing conn.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
log_fn(LOG_INFO,"'connected' received, no conn attached anymore. Ignoring.");
|
|
|
|
return 0;
|
2003-05-01 08:42:29 +02:00
|
|
|
case RELAY_COMMAND_SENDME:
|
2003-04-12 00:11:11 +02:00
|
|
|
if(!conn) {
|
2003-05-20 08:41:23 +02:00
|
|
|
if(edge_type == EDGE_AP) {
|
|
|
|
assert(layer_hint);
|
|
|
|
layer_hint->package_window += CIRCWINDOW_INCREMENT;
|
2003-12-19 06:09:51 +01:00
|
|
|
log_fn(LOG_DEBUG,"circ-level sendme at AP, packagewindow %d.",
|
|
|
|
layer_hint->package_window);
|
2003-05-20 08:41:23 +02:00
|
|
|
circuit_resume_edge_reading(circ, EDGE_AP, layer_hint);
|
|
|
|
} else {
|
|
|
|
assert(!layer_hint);
|
|
|
|
circ->package_window += CIRCWINDOW_INCREMENT;
|
2003-12-19 06:09:51 +01:00
|
|
|
log_fn(LOG_DEBUG,"circ-level sendme at exit, packagewindow %d.",
|
|
|
|
circ->package_window);
|
2003-05-20 08:41:23 +02:00
|
|
|
circuit_resume_edge_reading(circ, EDGE_EXIT, layer_hint);
|
|
|
|
}
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-05-20 08:41:23 +02:00
|
|
|
conn->package_window += STREAMWINDOW_INCREMENT;
|
2003-07-03 05:40:47 +02:00
|
|
|
log_fn(LOG_DEBUG,"stream-level sendme, packagewindow now %d.", conn->package_window);
|
2003-04-12 00:11:11 +02:00
|
|
|
connection_start_reading(conn);
|
2003-10-09 20:45:14 +02:00
|
|
|
connection_edge_package_raw_inbuf(conn); /* handle whatever might still be on the inbuf */
|
2003-11-17 08:20:51 +01:00
|
|
|
return 0;
|
2004-04-03 05:37:11 +02:00
|
|
|
case RELAY_COMMAND_ESTABLISH_INTRO:
|
|
|
|
case RELAY_COMMAND_ESTABLISH_RENDEZVOUS:
|
|
|
|
case RELAY_COMMAND_INTRODUCE1:
|
|
|
|
case RELAY_COMMAND_INTRODUCE2:
|
|
|
|
case RELAY_COMMAND_RENDEZVOUS1:
|
|
|
|
case RELAY_COMMAND_RENDEZVOUS2:
|
2004-04-03 06:55:22 +02:00
|
|
|
case RELAY_COMMAND_INTRO_ESTABLISHED:
|
|
|
|
case RELAY_COMMAND_RENDEZVOUS_ESTABLISHED:
|
2004-04-03 05:37:11 +02:00
|
|
|
rend_process_relay_cell(circ, rh.command, rh.length,
|
|
|
|
cell->payload+RELAY_HEADER_SIZE);
|
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
2003-12-19 06:09:51 +01:00
|
|
|
log_fn(LOG_WARN,"unknown relay command %d.",rh.command);
|
2003-11-17 08:20:51 +01:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int connection_edge_finished_flushing(connection_t *conn) {
|
2003-11-23 19:16:06 +01:00
|
|
|
unsigned char connected_payload[4];
|
2003-04-12 00:11:11 +02:00
|
|
|
int e, len=sizeof(e);
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
assert(conn->type == CONN_TYPE_AP || conn->type == CONN_TYPE_EXIT);
|
|
|
|
|
|
|
|
switch(conn->state) {
|
|
|
|
case EXIT_CONN_STATE_CONNECTING:
|
2003-08-12 05:08:41 +02:00
|
|
|
if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) { /* not yet */
|
2003-08-14 19:13:52 +02:00
|
|
|
if(!ERRNO_CONN_EINPROGRESS(errno)) {
|
2003-04-12 00:11:11 +02:00
|
|
|
/* yuck. kill it. */
|
2003-06-18 00:18:26 +02:00
|
|
|
log_fn(LOG_DEBUG,"in-progress exit connect failed. Removing.");
|
2004-02-28 05:11:53 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_CONNECTFAILED);
|
2003-04-12 00:11:11 +02:00
|
|
|
return -1;
|
|
|
|
} else {
|
2003-06-18 00:18:26 +02:00
|
|
|
log_fn(LOG_DEBUG,"in-progress exit connect still waiting.");
|
2003-04-12 00:11:11 +02:00
|
|
|
return 0; /* no change, see if next time is better */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* the connect has finished. */
|
|
|
|
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"Exit connection to %s:%u established.",
|
2003-04-12 00:11:11 +02:00
|
|
|
conn->address,conn->port);
|
|
|
|
|
|
|
|
conn->state = EXIT_CONN_STATE_OPEN;
|
|
|
|
connection_watch_events(conn, POLLIN); /* stop writing, continue reading */
|
2003-05-01 08:42:29 +02:00
|
|
|
if(connection_wants_to_flush(conn)) /* in case there are any queued relay cells */
|
2003-04-12 00:11:11 +02:00
|
|
|
connection_start_writing(conn);
|
2003-10-04 10:19:23 +02:00
|
|
|
/* deliver a 'connected' relay cell back through the circuit. */
|
2004-04-06 23:52:01 +02:00
|
|
|
if(connection_edge_is_rendezvous_stream(conn)) {
|
2004-04-06 22:25:18 +02:00
|
|
|
if(connection_edge_send_command(conn, circuit_get_by_conn(conn),
|
|
|
|
RELAY_COMMAND_CONNECTED, NULL, 0, conn->cpath_layer) < 0)
|
|
|
|
return 0; /* circuit is closed, don't continue */
|
|
|
|
} else {
|
|
|
|
*(uint32_t*)connected_payload = htonl(conn->addr);
|
|
|
|
if(connection_edge_send_command(conn, circuit_get_by_conn(conn),
|
|
|
|
RELAY_COMMAND_CONNECTED, connected_payload, 4, conn->cpath_layer) < 0)
|
|
|
|
return 0; /* circuit is closed, don't continue */
|
|
|
|
}
|
2003-12-07 23:03:47 +01:00
|
|
|
assert(conn->package_window > 0);
|
|
|
|
return connection_edge_process_inbuf(conn); /* in case the server has written anything */
|
2003-04-12 00:11:11 +02:00
|
|
|
case AP_CONN_STATE_OPEN:
|
|
|
|
case EXIT_CONN_STATE_OPEN:
|
|
|
|
connection_stop_writing(conn);
|
2003-10-22 11:08:10 +02:00
|
|
|
connection_edge_consider_sending_sendme(conn);
|
2003-10-04 04:38:18 +02:00
|
|
|
return 0;
|
2003-10-04 03:37:01 +02:00
|
|
|
case AP_CONN_STATE_SOCKS_WAIT:
|
2004-04-05 02:47:48 +02:00
|
|
|
case AP_CONN_STATE_RENDDESC_WAIT:
|
2004-01-01 08:01:09 +01:00
|
|
|
case AP_CONN_STATE_CIRCUIT_WAIT:
|
2004-03-03 05:54:16 +01:00
|
|
|
case AP_CONN_STATE_CONNECT_WAIT:
|
2003-10-04 03:37:01 +02:00
|
|
|
connection_stop_writing(conn);
|
|
|
|
return 0;
|
2003-04-12 00:11:11 +02:00
|
|
|
default:
|
2004-04-01 00:02:13 +02:00
|
|
|
log_fn(LOG_WARN,"BUG: called in unexpected state %d.", conn->state);
|
2003-09-26 12:03:50 +02:00
|
|
|
return -1;
|
2003-04-12 00:11:11 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-10-02 22:00:38 +02:00
|
|
|
uint64_t stats_n_data_cells_packaged = 0;
|
|
|
|
uint64_t stats_n_data_bytes_packaged = 0;
|
|
|
|
uint64_t stats_n_data_cells_received = 0;
|
|
|
|
uint64_t stats_n_data_bytes_received = 0;
|
|
|
|
|
2003-10-09 20:45:14 +02:00
|
|
|
int connection_edge_package_raw_inbuf(connection_t *conn) {
|
2003-10-04 10:19:23 +02:00
|
|
|
int amount_to_process, length;
|
|
|
|
char payload[CELL_PAYLOAD_SIZE];
|
2003-09-13 00:45:31 +02:00
|
|
|
circuit_t *circ;
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
assert(conn);
|
|
|
|
assert(!connection_speaks_cells(conn));
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-10-09 20:45:14 +02:00
|
|
|
repeat_connection_edge_package_raw_inbuf:
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
circ = circuit_get_by_conn(conn);
|
|
|
|
if(!circ) {
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"conn has no circuits! Closing.");
|
2003-09-13 00:45:31 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
if(circuit_consider_stop_edge_reading(circ, conn->type, conn->cpath_layer))
|
|
|
|
return 0;
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
if(conn->package_window <= 0) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"called with package_window %d. Tell Roger.", conn->package_window);
|
2003-09-13 00:45:31 +02:00
|
|
|
connection_stop_reading(conn);
|
|
|
|
return 0;
|
|
|
|
}
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-25 07:17:11 +02:00
|
|
|
amount_to_process = buf_datalen(conn->inbuf);
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
if(!amount_to_process)
|
|
|
|
return 0;
|
2003-12-16 10:48:17 +01:00
|
|
|
|
|
|
|
if(amount_to_process > RELAY_PAYLOAD_SIZE) {
|
|
|
|
length = RELAY_PAYLOAD_SIZE;
|
2003-09-13 00:45:31 +02:00
|
|
|
} else {
|
2003-10-04 10:19:23 +02:00
|
|
|
length = amount_to_process;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
2003-10-04 10:19:23 +02:00
|
|
|
stats_n_data_bytes_packaged += length;
|
2003-10-02 22:00:38 +02:00
|
|
|
stats_n_data_cells_packaged += 1;
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-10-04 10:19:23 +02:00
|
|
|
connection_fetch_from_buf(payload, length, conn);
|
|
|
|
|
2003-12-16 10:48:17 +01:00
|
|
|
log_fn(LOG_DEBUG,"(%d) Packaging %d bytes (%d waiting).", conn->s, length,
|
2003-09-25 07:17:11 +02:00
|
|
|
(int)buf_datalen(conn->inbuf));
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-10-22 11:08:10 +02:00
|
|
|
if(connection_edge_send_command(conn, circ, RELAY_COMMAND_DATA,
|
|
|
|
payload, length, conn->cpath_layer) < 0)
|
|
|
|
return 0; /* circuit is closed, don't continue */
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
if(conn->type == CONN_TYPE_EXIT) {
|
|
|
|
assert(circ->package_window > 0);
|
|
|
|
circ->package_window--;
|
2003-10-04 10:19:23 +02:00
|
|
|
} else { /* we're an AP */
|
2003-09-13 00:45:31 +02:00
|
|
|
assert(conn->type == CONN_TYPE_AP);
|
|
|
|
assert(conn->cpath_layer->package_window > 0);
|
|
|
|
conn->cpath_layer->package_window--;
|
|
|
|
}
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
if(--conn->package_window <= 0) { /* is it 0 after decrement? */
|
|
|
|
connection_stop_reading(conn);
|
|
|
|
log_fn(LOG_DEBUG,"conn->package_window reached 0.");
|
|
|
|
circuit_consider_stop_edge_reading(circ, conn->type, conn->cpath_layer);
|
|
|
|
return 0; /* don't process the inbuf any more */
|
|
|
|
}
|
|
|
|
log_fn(LOG_DEBUG,"conn->package_window is now %d",conn->package_window);
|
2003-12-16 10:48:17 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
/* handle more if there's more, or return 0 if there isn't */
|
2003-10-09 20:45:14 +02:00
|
|
|
goto repeat_connection_edge_package_raw_inbuf;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2004-03-08 00:50:15 +01:00
|
|
|
#define MAX_STREAM_RETRIES 4
|
2004-01-20 10:21:46 +01:00
|
|
|
void connection_ap_expire_beginning(void) {
|
|
|
|
connection_t **carray;
|
|
|
|
connection_t *conn;
|
2004-02-29 10:15:29 +01:00
|
|
|
circuit_t *circ;
|
2004-01-20 10:21:46 +01:00
|
|
|
int n, i;
|
|
|
|
time_t now = time(NULL);
|
|
|
|
|
|
|
|
get_connection_array(&carray, &n);
|
|
|
|
|
|
|
|
for (i = 0; i < n; ++i) {
|
|
|
|
conn = carray[i];
|
|
|
|
if (conn->type != CONN_TYPE_AP ||
|
2004-03-03 05:54:16 +01:00
|
|
|
conn->state != AP_CONN_STATE_CONNECT_WAIT)
|
2004-01-20 10:21:46 +01:00
|
|
|
continue;
|
2004-03-08 00:50:15 +01:00
|
|
|
if (now - conn->timestamp_lastread < 15)
|
|
|
|
continue;
|
|
|
|
conn->num_retries++;
|
|
|
|
circ = circuit_get_by_conn(conn);
|
2004-04-06 00:43:01 +02:00
|
|
|
if(circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) {
|
|
|
|
if (now - conn->timestamp_lastread > 45) {
|
|
|
|
log_fn(LOG_WARN,"Rend stream is %d seconds late. Giving up.",
|
|
|
|
(int)(now - conn->timestamp_lastread));
|
|
|
|
connection_mark_for_close(conn,END_STREAM_REASON_TIMEOUT);
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
assert(circ->purpose == CIRCUIT_PURPOSE_C_GENERAL);
|
2004-03-08 00:50:15 +01:00
|
|
|
if(conn->num_retries >= MAX_STREAM_RETRIES) {
|
|
|
|
log_fn(LOG_WARN,"Stream is %d seconds late. Giving up.",
|
|
|
|
15*conn->num_retries);
|
|
|
|
circuit_log_path(LOG_WARN, circ);
|
|
|
|
connection_mark_for_close(conn,END_STREAM_REASON_TIMEOUT);
|
|
|
|
} else {
|
2004-02-17 22:07:15 +01:00
|
|
|
log_fn(LOG_WARN,"Stream is %d seconds late. Retrying.",
|
2004-01-20 10:21:46 +01:00
|
|
|
(int)(now - conn->timestamp_lastread));
|
2004-02-29 10:15:29 +01:00
|
|
|
circuit_log_path(LOG_WARN, circ);
|
2004-02-29 00:56:50 +01:00
|
|
|
/* send an end down the circuit */
|
|
|
|
connection_edge_end(conn, END_STREAM_REASON_TIMEOUT, conn->cpath_layer);
|
|
|
|
/* un-mark it as ending, since we're going to reuse it */
|
|
|
|
conn->has_sent_end = 0;
|
2004-03-08 00:50:15 +01:00
|
|
|
/* move it back into 'pending' state. */
|
2004-02-17 22:07:15 +01:00
|
|
|
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2004-02-29 10:15:29 +01:00
|
|
|
circuit_detach_stream(circ, conn);
|
2004-03-06 06:10:07 +01:00
|
|
|
/* kludge to make us not try this circuit again, yet to allow
|
|
|
|
* current streams on it to survive if they can: make it
|
|
|
|
* unattractive to use for new streams */
|
|
|
|
assert(circ->timestamp_dirty);
|
|
|
|
circ->timestamp_dirty -= options.NewCircuitPeriod;
|
|
|
|
/* give our stream another 15 seconds to try */
|
2004-02-18 02:21:20 +01:00
|
|
|
conn->timestamp_lastread += 15;
|
2004-04-01 01:06:16 +02:00
|
|
|
/* attaching to a dirty circuit is fine */
|
2004-04-03 00:23:15 +02:00
|
|
|
if(connection_ap_handshake_attach_circuit(conn)<0) {
|
2004-02-18 02:21:20 +01:00
|
|
|
/* it will never work */
|
2004-02-29 00:56:50 +01:00
|
|
|
/* Don't need to send end -- we're not connected */
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, 0);
|
2004-02-18 02:21:20 +01:00
|
|
|
}
|
2004-03-08 00:50:15 +01:00
|
|
|
} /* end if max_retries */
|
|
|
|
} /* end for */
|
2004-01-20 10:21:46 +01:00
|
|
|
}
|
|
|
|
|
2003-11-11 03:41:31 +01:00
|
|
|
/* Tell any APs that are waiting for a new circuit that one is available */
|
|
|
|
void connection_ap_attach_pending(void)
|
|
|
|
{
|
2003-11-16 06:33:45 +01:00
|
|
|
connection_t **carray;
|
2003-12-03 09:06:55 +01:00
|
|
|
connection_t *conn;
|
2003-11-16 06:33:45 +01:00
|
|
|
int n, i;
|
|
|
|
|
|
|
|
get_connection_array(&carray, &n);
|
|
|
|
|
|
|
|
for (i = 0; i < n; ++i) {
|
2003-12-03 09:06:55 +01:00
|
|
|
conn = carray[i];
|
|
|
|
if (conn->type != CONN_TYPE_AP ||
|
2003-12-03 10:50:02 +01:00
|
|
|
conn->state != AP_CONN_STATE_CIRCUIT_WAIT)
|
2003-11-16 06:33:45 +01:00
|
|
|
continue;
|
2004-04-03 00:23:15 +02:00
|
|
|
if(connection_ap_handshake_attach_circuit(conn) < 0) {
|
2004-02-28 08:01:22 +01:00
|
|
|
/* -1 means it will never work */
|
2004-02-29 00:56:50 +01:00
|
|
|
/* Don't send end; there is no 'other side' yet */
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn,0);
|
2003-11-16 06:33:45 +01:00
|
|
|
}
|
2003-11-11 03:41:31 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-10-22 11:08:10 +02:00
|
|
|
static void connection_edge_consider_sending_sendme(connection_t *conn) {
|
2003-09-13 00:45:31 +02:00
|
|
|
circuit_t *circ;
|
2003-12-16 23:56:50 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
if(connection_outbuf_too_full(conn))
|
2003-10-04 04:38:18 +02:00
|
|
|
return;
|
2003-12-16 23:56:50 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
circ = circuit_get_by_conn(conn);
|
|
|
|
if(!circ) {
|
2003-10-22 11:08:10 +02:00
|
|
|
/* this can legitimately happen if the destroy has already
|
|
|
|
* arrived and torn down the circuit */
|
2003-09-26 12:03:50 +02:00
|
|
|
log_fn(LOG_INFO,"No circuit associated with conn. Skipping.");
|
2003-10-04 04:38:18 +02:00
|
|
|
return;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
2003-12-16 23:56:50 +01:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
while(conn->deliver_window < STREAMWINDOW_START - STREAMWINDOW_INCREMENT) {
|
|
|
|
log_fn(LOG_DEBUG,"Outbuf %d, Queueing stream sendme.", conn->outbuf_flushlen);
|
|
|
|
conn->deliver_window += STREAMWINDOW_INCREMENT;
|
2003-10-22 11:08:10 +02:00
|
|
|
if(connection_edge_send_command(conn, circ, RELAY_COMMAND_SENDME,
|
|
|
|
NULL, 0, conn->cpath_layer) < 0) {
|
|
|
|
log_fn(LOG_WARN,"connection_edge_send_command failed. Returning.");
|
|
|
|
return; /* the circuit's closed, don't continue */
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-01 04:41:41 +02:00
|
|
|
/* return -1 if an unexpected error with conn, else 0. */
|
2003-09-13 00:45:31 +02:00
|
|
|
static int connection_ap_handshake_process_socks(connection_t *conn) {
|
2003-11-11 03:41:31 +01:00
|
|
|
socks_request_t *socks;
|
2003-10-04 03:37:01 +02:00
|
|
|
int sockshere;
|
2003-09-13 00:45:31 +02:00
|
|
|
|
|
|
|
assert(conn);
|
2003-11-11 03:41:31 +01:00
|
|
|
assert(conn->type == CONN_TYPE_AP);
|
|
|
|
assert(conn->state == AP_CONN_STATE_SOCKS_WAIT);
|
|
|
|
assert(conn->socks_request);
|
|
|
|
socks = conn->socks_request;
|
2003-09-13 00:45:31 +02:00
|
|
|
|
|
|
|
log_fn(LOG_DEBUG,"entered.");
|
|
|
|
|
2003-11-11 03:41:31 +01:00
|
|
|
sockshere = fetch_from_buf_socks(conn->inbuf, socks);
|
2003-10-04 03:37:01 +02:00
|
|
|
if(sockshere == -1 || sockshere == 0) {
|
2003-11-11 03:41:31 +01:00
|
|
|
if(socks->replylen) { /* we should send reply back */
|
2003-10-04 03:37:01 +02:00
|
|
|
log_fn(LOG_DEBUG,"reply is already set for us. Using it.");
|
2003-11-11 03:41:31 +01:00
|
|
|
connection_ap_handshake_socks_reply(conn, socks->reply, socks->replylen, 0);
|
2003-10-04 03:37:01 +02:00
|
|
|
} else if(sockshere == -1) { /* send normal reject */
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"Fetching socks handshake failed. Closing.");
|
2003-10-04 03:37:01 +02:00
|
|
|
connection_ap_handshake_socks_reply(conn, NULL, 0, 0);
|
|
|
|
} else {
|
|
|
|
log_fn(LOG_DEBUG,"socks handshake not all here yet.");
|
|
|
|
}
|
2004-03-27 06:45:52 +01:00
|
|
|
if (sockshere == -1)
|
|
|
|
conn->socks_request->has_finished = 1;
|
2003-10-04 03:37:01 +02:00
|
|
|
return sockshere;
|
|
|
|
} /* else socks handshake is done, continue processing */
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2004-04-01 04:41:41 +02:00
|
|
|
/* this call _modifies_ socks->address iff it's a hidden-service request */
|
|
|
|
if (rend_parse_rendezvous_address(socks->address) < 0) {
|
|
|
|
/* normal request */
|
|
|
|
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2004-04-03 00:23:15 +02:00
|
|
|
return connection_ap_handshake_attach_circuit(conn);
|
2004-04-01 04:41:41 +02:00
|
|
|
} else {
|
|
|
|
/* it's a hidden-service request */
|
2004-04-08 00:41:00 +02:00
|
|
|
rend_cache_entry_t *entry;
|
2004-04-01 04:41:41 +02:00
|
|
|
|
2004-04-05 02:47:48 +02:00
|
|
|
strcpy(conn->rend_query, socks->address); /* this strcpy is safe -RD */
|
2004-04-03 03:59:53 +02:00
|
|
|
log_fn(LOG_INFO,"Got a hidden service request for ID '%s'", conn->rend_query);
|
2004-04-01 04:41:41 +02:00
|
|
|
/* see if we already have it cached */
|
2004-04-08 00:41:00 +02:00
|
|
|
if (rend_cache_lookup_entry(conn->rend_query, &entry) == 1 &&
|
|
|
|
#define NUM_SECONDS_BEFORE_REFETCH (60*15)
|
|
|
|
entry->received + NUM_SECONDS_BEFORE_REFETCH < time(NULL)) {
|
2004-04-05 02:47:48 +02:00
|
|
|
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
|
2004-04-03 00:23:15 +02:00
|
|
|
return connection_ap_handshake_attach_circuit(conn);
|
2004-04-01 04:41:41 +02:00
|
|
|
} else {
|
2004-04-05 02:47:48 +02:00
|
|
|
conn->state = AP_CONN_STATE_RENDDESC_WAIT;
|
|
|
|
if(!connection_get_by_type_rendquery(CONN_TYPE_DIR, conn->rend_query)) {
|
|
|
|
/* not one already; initiate a dir rend desc lookup */
|
|
|
|
directory_initiate_command(router_pick_directory_server(),
|
|
|
|
DIR_PURPOSE_FETCH_RENDDESC,
|
|
|
|
conn->rend_query, strlen(conn->rend_query));
|
|
|
|
}
|
2004-04-03 00:23:15 +02:00
|
|
|
return 0;
|
2004-04-01 04:41:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
2004-02-18 02:21:20 +01:00
|
|
|
}
|
|
|
|
|
2004-04-05 02:47:48 +02:00
|
|
|
/* Find an open circ that we're happy with: return 1. if there isn't
|
|
|
|
* one, and there isn't one on the way, launch one and return 0. if it
|
|
|
|
* will never work, return -1.
|
|
|
|
* write the found or in-progress or launched circ into *circp.
|
2004-04-03 05:06:06 +02:00
|
|
|
*/
|
|
|
|
static int
|
2004-04-05 02:47:48 +02:00
|
|
|
circuit_get_open_circ_or_launch(connection_t *conn,
|
|
|
|
uint8_t desired_circuit_purpose,
|
|
|
|
circuit_t **circp) {
|
2004-04-03 05:06:06 +02:00
|
|
|
circuit_t *circ;
|
|
|
|
uint32_t addr;
|
|
|
|
|
|
|
|
assert(conn);
|
|
|
|
assert(circp);
|
2004-04-05 02:47:48 +02:00
|
|
|
assert(conn->state == AP_CONN_STATE_CIRCUIT_WAIT);
|
2004-04-03 05:06:06 +02:00
|
|
|
|
2004-04-05 02:47:48 +02:00
|
|
|
circ = circuit_get_best(conn, 1, desired_circuit_purpose);
|
2004-04-03 05:06:06 +02:00
|
|
|
|
|
|
|
if(circ) {
|
|
|
|
*circp = circ;
|
|
|
|
return 1; /* we're happy */
|
|
|
|
}
|
|
|
|
|
2004-04-06 23:52:01 +02:00
|
|
|
if(!connection_edge_is_rendezvous_stream(conn)) { /* general purpose circ */
|
2004-04-03 05:06:06 +02:00
|
|
|
addr = client_dns_lookup_entry(conn->socks_request->address);
|
|
|
|
if(router_exit_policy_all_routers_reject(addr, conn->socks_request->port)) {
|
|
|
|
log_fn(LOG_WARN,"No Tor server exists that allows exit to %s:%d. Rejecting.",
|
|
|
|
conn->socks_request->address, conn->socks_request->port);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2004-04-05 02:47:48 +02:00
|
|
|
|
|
|
|
/* is one already on the way? */
|
|
|
|
circ = circuit_get_best(conn, 0, desired_circuit_purpose);
|
|
|
|
if(!circ) {
|
|
|
|
char *exitname=NULL;
|
|
|
|
uint8_t new_circ_purpose;
|
|
|
|
|
|
|
|
if(desired_circuit_purpose == CIRCUIT_PURPOSE_C_INTRODUCING) {
|
|
|
|
/* need to pick an intro point */
|
2004-04-05 19:51:00 +02:00
|
|
|
exitname = rend_client_get_random_intro(conn->rend_query);
|
2004-04-05 02:47:48 +02:00
|
|
|
if(!exitname) {
|
|
|
|
log_fn(LOG_WARN,"Couldn't get an intro point for '%s'. Closing conn.",
|
|
|
|
conn->rend_query);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-05 19:51:00 +02:00
|
|
|
if(!router_get_by_nickname(exitname)) {
|
|
|
|
log_fn(LOG_WARN,"Advertised intro point '%s' is not known. Closing.", exitname);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-05 02:47:48 +02:00
|
|
|
log_fn(LOG_INFO,"Chose %s as intro point for %s.", exitname, conn->rend_query);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(desired_circuit_purpose == CIRCUIT_PURPOSE_C_REND_JOINED)
|
|
|
|
new_circ_purpose = CIRCUIT_PURPOSE_C_ESTABLISH_REND;
|
|
|
|
else
|
|
|
|
new_circ_purpose = desired_circuit_purpose;
|
|
|
|
|
|
|
|
circ = circuit_launch_new(new_circ_purpose, exitname);
|
2004-04-05 19:56:34 +02:00
|
|
|
tor_free(exitname);
|
2004-04-05 02:47:48 +02:00
|
|
|
|
2004-04-03 05:06:06 +02:00
|
|
|
if(circ &&
|
2004-04-05 02:47:48 +02:00
|
|
|
(desired_circuit_purpose != CIRCUIT_PURPOSE_C_GENERAL)) {
|
2004-04-03 05:06:06 +02:00
|
|
|
/* then write the service_id into circ */
|
|
|
|
strcpy(circ->rend_query, conn->rend_query);
|
|
|
|
}
|
|
|
|
}
|
2004-04-05 20:22:00 +02:00
|
|
|
if(!circ)
|
|
|
|
log_fn(LOG_INFO,"No safe circuit (purpose %d) ready for edge connection; delaying.",
|
|
|
|
desired_circuit_purpose);
|
2004-04-03 05:06:06 +02:00
|
|
|
*circp = circ;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-05 09:41:31 +02:00
|
|
|
void link_apconn_to_circ(connection_t *apconn, circuit_t *circ) {
|
|
|
|
/* add it into the linked list of streams on this circuit */
|
|
|
|
log_fn(LOG_DEBUG,"attaching new conn to circ. n_circ_id %d.", circ->n_circ_id);
|
|
|
|
apconn->next_stream = circ->p_streams;
|
|
|
|
/* assert_connection_ok(conn, time(NULL)); */
|
|
|
|
circ->p_streams = apconn;
|
|
|
|
|
2004-04-08 04:24:06 +02:00
|
|
|
assert(CIRCUIT_IS_ORIGIN(circ) && circ->cpath && circ->cpath->prev);
|
2004-04-05 09:41:31 +02:00
|
|
|
assert(circ->cpath->prev->state == CPATH_STATE_OPEN);
|
|
|
|
apconn->cpath_layer = circ->cpath->prev;
|
|
|
|
}
|
|
|
|
|
2003-12-03 09:06:55 +01:00
|
|
|
/* Try to find a safe live circuit for CONN_TYPE_AP connection conn. If
|
|
|
|
* we don't find one: if conn cannot be handled by any known nodes,
|
2004-04-03 00:23:15 +02:00
|
|
|
* warn and return -1 (conn needs to die);
|
2004-04-05 17:24:03 +02:00
|
|
|
* else launch new circuit (if necessary) and return 0.
|
2004-04-03 00:23:15 +02:00
|
|
|
* Otherwise, associate conn with a safe live circuit, do the
|
|
|
|
* right next step, and return 1.
|
2003-11-11 03:41:31 +01:00
|
|
|
*/
|
2004-04-03 01:54:48 +02:00
|
|
|
int connection_ap_handshake_attach_circuit(connection_t *conn) {
|
2004-04-03 05:06:06 +02:00
|
|
|
int retval;
|
2003-11-16 22:49:52 +01:00
|
|
|
|
2003-11-11 03:41:31 +01:00
|
|
|
assert(conn);
|
|
|
|
assert(conn->type == CONN_TYPE_AP);
|
|
|
|
assert(conn->state == AP_CONN_STATE_CIRCUIT_WAIT);
|
|
|
|
assert(conn->socks_request);
|
2003-11-16 22:49:52 +01:00
|
|
|
|
2004-04-06 23:52:01 +02:00
|
|
|
if(!connection_edge_is_rendezvous_stream(conn)) { /* we're a general conn */
|
2004-04-05 02:47:48 +02:00
|
|
|
circuit_t *circ=NULL;
|
2004-04-03 00:23:15 +02:00
|
|
|
|
2004-04-05 02:47:48 +02:00
|
|
|
/* find the circuit that we should use, if there is one. */
|
|
|
|
retval = circuit_get_open_circ_or_launch(conn, CIRCUIT_PURPOSE_C_GENERAL, &circ);
|
|
|
|
if(retval < 1)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
/* We have found a suitable circuit for our conn. Hurray. */
|
|
|
|
|
|
|
|
/* here, print the circ's path. so people can figure out which circs are sucking. */
|
|
|
|
circuit_log_path(LOG_INFO,circ);
|
|
|
|
|
|
|
|
if(!circ->timestamp_dirty)
|
|
|
|
circ->timestamp_dirty = time(NULL);
|
|
|
|
|
2004-04-05 09:41:31 +02:00
|
|
|
link_apconn_to_circ(conn, circ);
|
2004-04-05 02:47:48 +02:00
|
|
|
connection_ap_handshake_send_begin(conn, circ);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
} else { /* we're a rendezvous conn */
|
|
|
|
circuit_t *rendcirc=NULL, *introcirc=NULL;
|
|
|
|
|
2004-04-05 17:24:03 +02:00
|
|
|
/* before anything else, see if we've already been attached
|
|
|
|
* to a rendezvous circuit */
|
|
|
|
if(conn->cpath_layer) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* else, start by finding a rendezvous circuit for us */
|
2004-04-05 02:47:48 +02:00
|
|
|
|
|
|
|
retval = circuit_get_open_circ_or_launch(conn, CIRCUIT_PURPOSE_C_REND_JOINED, &rendcirc);
|
|
|
|
if(retval < 0) return -1; /* failed */
|
|
|
|
|
|
|
|
if(retval > 0) {
|
|
|
|
/* one is already established, attach */
|
2004-04-05 09:41:31 +02:00
|
|
|
log_fn(LOG_INFO,"rend joined circ already here. reusing.");
|
|
|
|
link_apconn_to_circ(conn, rendcirc);
|
|
|
|
if(connection_ap_handshake_send_begin(conn, rendcirc) < 0)
|
|
|
|
return 0; /* already marked, let them fade away */
|
|
|
|
return 1;
|
2004-04-05 02:47:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if(rendcirc &&
|
|
|
|
rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY &&
|
|
|
|
rendcirc->build_state->pending_final_cpath) {
|
2004-04-05 09:41:31 +02:00
|
|
|
log_fn(LOG_INFO,"pending-join circ already here. reusing.");
|
|
|
|
link_apconn_to_circ(conn, rendcirc);
|
|
|
|
/* don't send the begin, because we're still waiting for contact from bob */
|
|
|
|
return 1;
|
2004-04-05 02:47:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* it's on its way. find an intro circ. */
|
|
|
|
retval = circuit_get_open_circ_or_launch(conn, CIRCUIT_PURPOSE_C_INTRODUCING, &introcirc);
|
|
|
|
if(retval < 0) return -1; /* failed */
|
|
|
|
|
|
|
|
if(retval > 0) {
|
|
|
|
log_fn(LOG_INFO,"Intro circ is ready for us");
|
|
|
|
if(rendcirc &&
|
|
|
|
rendcirc->purpose == CIRCUIT_PURPOSE_C_REND_READY) {
|
|
|
|
/* then we know !pending_final_cpath, from above */
|
2004-04-05 09:41:31 +02:00
|
|
|
log_fn(LOG_INFO,"intro and rend circs are both ready. introducing.");
|
2004-04-07 21:14:45 +02:00
|
|
|
/* this call marks introcirc for close */
|
2004-04-05 09:41:31 +02:00
|
|
|
if(rend_client_send_introduction(introcirc, rendcirc) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* now attach conn to rendcirc */
|
|
|
|
link_apconn_to_circ(conn, rendcirc);
|
2004-04-07 21:14:45 +02:00
|
|
|
if(!rendcirc->timestamp_dirty)
|
|
|
|
rendcirc->timestamp_dirty = time(NULL);
|
2004-04-05 09:41:31 +02:00
|
|
|
return 1;
|
2004-04-05 02:47:48 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
log_fn(LOG_INFO,"Intro and rend circs are not both ready. Stalling conn.");
|
|
|
|
return 0;
|
|
|
|
}
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2003-12-19 22:25:44 +01:00
|
|
|
/* Iterate over the two bytes of stream_id until we get one that is not
|
|
|
|
* already in use. Return 0 if can't get a unique stream_id.
|
|
|
|
*/
|
|
|
|
static uint16_t get_unique_stream_id_by_circ(circuit_t *circ) {
|
|
|
|
connection_t *tmpconn;
|
|
|
|
uint16_t test_stream_id;
|
|
|
|
uint32_t attempts=0;
|
|
|
|
|
|
|
|
again:
|
|
|
|
test_stream_id = circ->next_stream_id++;
|
|
|
|
if(++attempts > 1<<16) {
|
|
|
|
/* Make sure we don't loop forever if all stream_id's are used. */
|
|
|
|
log_fn(LOG_WARN,"No unused stream IDs. Failing.");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (test_stream_id == 0)
|
|
|
|
goto again;
|
|
|
|
for(tmpconn = circ->p_streams; tmpconn; tmpconn=tmpconn->next_stream)
|
|
|
|
if(tmpconn->stream_id == test_stream_id)
|
|
|
|
goto again;
|
|
|
|
return test_stream_id;
|
|
|
|
}
|
|
|
|
|
2003-09-18 10:11:31 +02:00
|
|
|
/* deliver the destaddr:destport in a relay cell */
|
2004-04-05 09:41:31 +02:00
|
|
|
int connection_ap_handshake_send_begin(connection_t *ap_conn, circuit_t *circ)
|
2003-11-11 03:41:31 +01:00
|
|
|
{
|
2003-10-04 10:19:23 +02:00
|
|
|
char payload[CELL_PAYLOAD_SIZE];
|
|
|
|
int payload_len;
|
2003-11-14 21:45:47 +01:00
|
|
|
struct in_addr in;
|
|
|
|
const char *string_addr;
|
2003-09-18 10:11:31 +02:00
|
|
|
|
2003-11-11 03:41:31 +01:00
|
|
|
assert(ap_conn->type == CONN_TYPE_AP);
|
|
|
|
assert(ap_conn->state == AP_CONN_STATE_CIRCUIT_WAIT);
|
|
|
|
assert(ap_conn->socks_request);
|
|
|
|
|
2003-12-19 22:25:44 +01:00
|
|
|
ap_conn->stream_id = get_unique_stream_id_by_circ(circ);
|
|
|
|
if (ap_conn->stream_id==0) {
|
2004-02-28 04:06:31 +01:00
|
|
|
/* Don't send end: there is no 'other side' yet */
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(ap_conn, 0);
|
2004-04-05 09:41:31 +02:00
|
|
|
circuit_mark_for_close(circ);
|
|
|
|
return -1;
|
2003-12-19 22:25:44 +01:00
|
|
|
}
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2004-04-05 09:41:31 +02:00
|
|
|
if(circ->purpose == CIRCUIT_PURPOSE_C_GENERAL) {
|
|
|
|
in.s_addr = htonl(client_dns_lookup_entry(ap_conn->socks_request->address));
|
|
|
|
string_addr = in.s_addr ? inet_ntoa(in) : NULL;
|
2003-11-14 21:45:47 +01:00
|
|
|
|
2004-04-05 09:41:31 +02:00
|
|
|
snprintf(payload,RELAY_PAYLOAD_SIZE,
|
|
|
|
"%s:%d",
|
|
|
|
string_addr ? string_addr : ap_conn->socks_request->address,
|
|
|
|
ap_conn->socks_request->port);
|
|
|
|
} else {
|
|
|
|
snprintf(payload,RELAY_PAYLOAD_SIZE,
|
|
|
|
":%d", ap_conn->socks_request->port);
|
|
|
|
}
|
2003-12-19 06:09:51 +01:00
|
|
|
payload_len = strlen(payload)+1;
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
log_fn(LOG_DEBUG,"Sending relay cell to begin stream %d.",ap_conn->stream_id);
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2003-10-22 11:08:10 +02:00
|
|
|
if(connection_edge_send_command(ap_conn, circ, RELAY_COMMAND_BEGIN,
|
|
|
|
payload, payload_len, ap_conn->cpath_layer) < 0)
|
2004-04-05 09:41:31 +02:00
|
|
|
return -1; /* circuit is closed, don't continue */
|
2003-10-04 10:19:23 +02:00
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
ap_conn->package_window = STREAMWINDOW_START;
|
|
|
|
ap_conn->deliver_window = STREAMWINDOW_START;
|
2004-03-03 05:54:16 +01:00
|
|
|
ap_conn->state = AP_CONN_STATE_CONNECT_WAIT;
|
2003-11-11 04:01:48 +01:00
|
|
|
log_fn(LOG_INFO,"Address/port sent, ap socket %d, n_circ_id %d",ap_conn->s,circ->n_circ_id);
|
2004-04-05 09:41:31 +02:00
|
|
|
return 0;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2004-04-01 00:02:13 +02:00
|
|
|
/* make an ap connection_t, do a socketpair and attach one side
|
|
|
|
* to the conn, connection_add it, initialize it to circuit_wait,
|
|
|
|
* and call connection_ap_handshake_attach_circuit(conn) on it.
|
|
|
|
* Return the other end of the socketpair, or -1 if error.
|
|
|
|
*/
|
|
|
|
int connection_ap_make_bridge(char *address, uint16_t port) {
|
|
|
|
int fd[2];
|
|
|
|
connection_t *conn;
|
|
|
|
|
|
|
|
log_fn(LOG_INFO,"Making AP bridge to %s:%d ...",address,port);
|
|
|
|
|
|
|
|
if(tor_socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) {
|
|
|
|
log(LOG_ERR, "Couldn't construct socketpair: %s", strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
set_socket_nonblocking(fd[0]);
|
|
|
|
set_socket_nonblocking(fd[1]);
|
|
|
|
|
|
|
|
conn = connection_new(CONN_TYPE_AP);
|
|
|
|
conn->s = fd[0];
|
|
|
|
|
|
|
|
/* populate conn->socks_request */
|
|
|
|
|
|
|
|
/* leave version at zero, so the socks_reply is empty */
|
|
|
|
conn->socks_request->socks_version = 0;
|
|
|
|
conn->socks_request->has_finished = 0; /* waiting for 'connected' */
|
|
|
|
strcpy(conn->socks_request->address, address);
|
|
|
|
conn->socks_request->port = port;
|
|
|
|
|
|
|
|
conn->address = tor_strdup("(local bridge)");
|
|
|
|
conn->addr = ntohs(0);
|
|
|
|
conn->port = 0;
|
|
|
|
|
|
|
|
if(connection_add(conn) < 0) { /* no space, forget it */
|
|
|
|
connection_free(conn); /* this closes fd[0] */
|
|
|
|
close(fd[1]);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
conn->state = AP_CONN_STATE_CIRCUIT_WAIT;
|
|
|
|
connection_start_reading(conn);
|
|
|
|
|
2004-04-01 01:06:16 +02:00
|
|
|
/* attaching to a dirty circuit is fine */
|
2004-04-03 00:23:15 +02:00
|
|
|
if (connection_ap_handshake_attach_circuit(conn) < 0) {
|
2004-04-01 00:02:13 +02:00
|
|
|
connection_mark_for_close(conn, 0);
|
|
|
|
close(fd[1]);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
log_fn(LOG_INFO,"... AP bridge created and connected.");
|
|
|
|
return fd[1];
|
|
|
|
}
|
|
|
|
|
2004-03-27 06:45:52 +01:00
|
|
|
void connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
|
|
|
|
int replylen, char success) {
|
2003-10-04 03:37:01 +02:00
|
|
|
char buf[256];
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2003-10-04 03:37:01 +02:00
|
|
|
if(replylen) { /* we already have a reply in mind */
|
|
|
|
connection_write_to_buf(reply, replylen, conn);
|
2004-03-03 07:26:34 +01:00
|
|
|
return;
|
2003-10-04 03:37:01 +02:00
|
|
|
}
|
2003-11-11 05:13:37 +01:00
|
|
|
assert(conn->socks_request);
|
|
|
|
if(conn->socks_request->socks_version == 4) {
|
2003-10-04 03:37:01 +02:00
|
|
|
memset(buf,0,SOCKS4_NETWORK_LEN);
|
|
|
|
#define SOCKS4_GRANTED 90
|
|
|
|
#define SOCKS4_REJECT 91
|
|
|
|
buf[1] = (success ? SOCKS4_GRANTED : SOCKS4_REJECT);
|
|
|
|
/* leave version, destport, destip zero */
|
|
|
|
connection_write_to_buf(buf, SOCKS4_NETWORK_LEN, conn);
|
|
|
|
}
|
2003-11-11 05:13:37 +01:00
|
|
|
if(conn->socks_request->socks_version == 5) {
|
2003-10-04 03:37:01 +02:00
|
|
|
buf[0] = 5; /* version 5 */
|
|
|
|
#define SOCKS5_SUCCESS 0
|
|
|
|
#define SOCKS5_GENERIC_ERROR 1
|
|
|
|
buf[1] = success ? SOCKS5_SUCCESS : SOCKS5_GENERIC_ERROR;
|
|
|
|
buf[2] = 0;
|
|
|
|
buf[3] = 1; /* ipv4 addr */
|
2003-11-18 09:20:19 +01:00
|
|
|
memset(buf+4,0,6); /* Set external addr/port to 0.
|
|
|
|
The spec doesn't seem to say what to do here. -RD */
|
2003-10-04 03:37:01 +02:00
|
|
|
connection_write_to_buf(buf,10,conn);
|
|
|
|
}
|
2004-04-01 00:02:13 +02:00
|
|
|
/* If socks_version isn't 4 or 5, don't send anything.
|
|
|
|
* This can happen in the case of AP bridges. */
|
2004-03-03 07:26:34 +01:00
|
|
|
return;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2003-10-21 10:37:07 +02:00
|
|
|
static int connection_exit_begin_conn(cell_t *cell, circuit_t *circ) {
|
2003-09-13 00:45:31 +02:00
|
|
|
connection_t *n_stream;
|
2003-12-19 06:09:51 +01:00
|
|
|
relay_header_t rh;
|
2003-09-13 00:45:31 +02:00
|
|
|
char *colon;
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
relay_header_unpack(&rh, cell->payload);
|
|
|
|
|
2003-10-21 10:37:07 +02:00
|
|
|
/* XXX currently we don't send an end cell back if we drop the
|
|
|
|
* begin because it's malformed.
|
|
|
|
*/
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
if(!memchr(cell->payload+RELAY_HEADER_SIZE, 0, rh.length)) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"relay begin cell has no \\0. Dropping.");
|
2003-09-13 00:45:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2003-12-19 06:09:51 +01:00
|
|
|
colon = strchr(cell->payload+RELAY_HEADER_SIZE, ':');
|
2003-09-13 00:45:31 +02:00
|
|
|
if(!colon) {
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"relay begin cell has no colon. Dropping.");
|
2003-09-13 00:45:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*colon = 0;
|
|
|
|
|
|
|
|
if(!atoi(colon+1)) { /* bad port */
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"relay begin cell has invalid port. Dropping.");
|
2003-09-13 00:45:31 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
log_fn(LOG_DEBUG,"Creating new exit connection.");
|
|
|
|
n_stream = connection_new(CONN_TYPE_EXIT);
|
|
|
|
|
2003-12-19 06:09:51 +01:00
|
|
|
n_stream->stream_id = rh.stream_id;
|
2003-09-13 00:45:31 +02:00
|
|
|
n_stream->port = atoi(colon+1);
|
2003-10-15 20:50:16 +02:00
|
|
|
/* leave n_stream->s at -1, because it's not yet valid */
|
2003-09-13 00:45:31 +02:00
|
|
|
n_stream->package_window = STREAMWINDOW_START;
|
|
|
|
n_stream->deliver_window = STREAMWINDOW_START;
|
|
|
|
if(connection_add(n_stream) < 0) { /* no space, forget it */
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"connection_add failed. Dropping.");
|
2003-09-13 00:45:31 +02:00
|
|
|
connection_free(n_stream);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add it into the linked list of streams on this circuit */
|
|
|
|
n_stream->next_stream = circ->n_streams;
|
|
|
|
circ->n_streams = n_stream;
|
|
|
|
|
2004-04-06 22:25:18 +02:00
|
|
|
if(circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) {
|
|
|
|
n_stream->address = tor_strdup("(rendezvous)");
|
2004-04-08 04:10:43 +02:00
|
|
|
strcpy(n_stream->rend_query, circ->rend_query);
|
2004-04-07 00:05:49 +02:00
|
|
|
if(rend_service_set_connection_addr_port(n_stream, circ) < 0) {
|
2004-04-06 22:25:18 +02:00
|
|
|
log_fn(LOG_WARN,"Didn't find rendezvous service (port %d)",n_stream->port);
|
|
|
|
connection_mark_for_close(n_stream,0 /* XXX */);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
n_stream->state = EXIT_CONN_STATE_CONNECTING;
|
|
|
|
n_stream->cpath_layer = circ->cpath->prev; /* link it */
|
|
|
|
connection_exit_connect(n_stream);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
n_stream->address = tor_strdup(cell->payload + RELAY_HEADER_SIZE);
|
|
|
|
n_stream->state = EXIT_CONN_STATE_RESOLVING;
|
|
|
|
|
2003-09-13 00:45:31 +02:00
|
|
|
/* send it off to the gethostbyname farm */
|
|
|
|
switch(dns_resolve(n_stream)) {
|
|
|
|
case 1: /* resolve worked */
|
2003-10-22 09:55:44 +02:00
|
|
|
connection_exit_connect(n_stream);
|
|
|
|
return 0;
|
2003-09-13 00:45:31 +02:00
|
|
|
case -1: /* resolve failed */
|
2003-11-30 10:57:00 +01:00
|
|
|
log_fn(LOG_INFO,"Resolve failed (%s).", n_stream->address);
|
2004-03-02 08:24:11 +01:00
|
|
|
/* Set the state so that we don't try to remove n_stream from a DNS
|
|
|
|
* pending list. */
|
2004-04-07 21:57:40 +02:00
|
|
|
n_stream->state = EXIT_CONN_STATE_RESOLVEFAILED;
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(n_stream, END_STREAM_REASON_RESOLVEFAILED);
|
2004-03-02 08:24:11 +01:00
|
|
|
break;
|
|
|
|
case 0: /* resolve added to pending list */
|
|
|
|
;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-10-22 09:55:44 +02:00
|
|
|
void connection_exit_connect(connection_t *conn) {
|
2003-11-14 21:45:47 +01:00
|
|
|
unsigned char connected_payload[4];
|
2003-09-13 00:45:31 +02:00
|
|
|
|
2004-04-06 23:52:01 +02:00
|
|
|
if (!connection_edge_is_rendezvous_stream(conn) &&
|
2004-04-06 22:25:18 +02:00
|
|
|
router_compare_to_my_exit_policy(conn) == ADDR_POLICY_REJECTED) {
|
2003-09-13 00:45:31 +02:00
|
|
|
log_fn(LOG_INFO,"%s:%d failed exit policy. Closing.", conn->address, conn->port);
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_EXITPOLICY);
|
2003-10-22 09:55:44 +02:00
|
|
|
return;
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2003-09-16 03:58:46 +02:00
|
|
|
switch(connection_connect(conn, conn->address, conn->addr, conn->port)) {
|
|
|
|
case -1:
|
2004-02-27 23:00:26 +01:00
|
|
|
connection_mark_for_close(conn, END_STREAM_REASON_CONNECTFAILED);
|
2003-10-22 09:55:44 +02:00
|
|
|
return;
|
2003-09-16 03:58:46 +02:00
|
|
|
case 0:
|
2003-09-13 00:45:31 +02:00
|
|
|
connection_set_poll_socket(conn);
|
|
|
|
conn->state = EXIT_CONN_STATE_CONNECTING;
|
|
|
|
|
|
|
|
connection_watch_events(conn, POLLOUT | POLLIN | POLLERR);
|
|
|
|
/* writable indicates finish, readable indicates broken link,
|
|
|
|
error indicates broken link in windowsland. */
|
2003-10-22 09:55:44 +02:00
|
|
|
return;
|
2003-09-16 03:58:46 +02:00
|
|
|
/* case 1: fall through */
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
connection_set_poll_socket(conn);
|
|
|
|
conn->state = EXIT_CONN_STATE_OPEN;
|
|
|
|
if(connection_wants_to_flush(conn)) { /* in case there are any queued data cells */
|
2003-10-10 03:48:32 +02:00
|
|
|
log_fn(LOG_WARN,"tell roger: newly connected conn had data waiting!");
|
2003-09-13 00:45:31 +02:00
|
|
|
// connection_start_writing(conn);
|
|
|
|
}
|
|
|
|
// connection_process_inbuf(conn);
|
|
|
|
connection_watch_events(conn, POLLIN);
|
|
|
|
|
|
|
|
/* also, deliver a 'connected' cell back through the circuit. */
|
2004-04-06 23:52:01 +02:00
|
|
|
if(connection_edge_is_rendezvous_stream(conn)) { /* rendezvous stream */
|
2004-04-06 22:25:18 +02:00
|
|
|
/* don't send an address back! */
|
|
|
|
connection_edge_send_command(conn, circuit_get_by_conn(conn), RELAY_COMMAND_CONNECTED,
|
|
|
|
NULL, 0, conn->cpath_layer);
|
|
|
|
} else { /* normal stream */
|
|
|
|
*(uint32_t*)connected_payload = htonl(conn->addr);
|
|
|
|
connection_edge_send_command(conn, circuit_get_by_conn(conn), RELAY_COMMAND_CONNECTED,
|
|
|
|
connected_payload, 4, conn->cpath_layer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-06 23:52:01 +02:00
|
|
|
int connection_edge_is_rendezvous_stream(connection_t *conn) {
|
|
|
|
assert(conn);
|
|
|
|
if(*conn->rend_query) /* XXX */
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-11-16 06:33:45 +01:00
|
|
|
int connection_ap_can_use_exit(connection_t *conn, routerinfo_t *exit)
|
|
|
|
{
|
|
|
|
uint32_t addr;
|
2003-11-16 18:00:02 +01:00
|
|
|
|
2003-11-17 02:20:35 +01:00
|
|
|
assert(conn);
|
|
|
|
assert(conn->type == CONN_TYPE_AP);
|
|
|
|
assert(conn->socks_request);
|
|
|
|
|
2003-12-03 10:50:02 +01:00
|
|
|
log_fn(LOG_DEBUG,"considering nickname %s, for address %s / port %d:",
|
|
|
|
exit->nickname, conn->socks_request->address,
|
|
|
|
conn->socks_request->port);
|
2003-11-16 18:00:02 +01:00
|
|
|
addr = client_dns_lookup_entry(conn->socks_request->address);
|
2004-01-11 00:40:38 +01:00
|
|
|
return router_compare_addr_to_exit_policy(addr,
|
|
|
|
conn->socks_request->port, exit->exit_policy);
|
2003-11-16 06:33:45 +01:00
|
|
|
}
|
|
|
|
|
2003-11-14 21:45:47 +01:00
|
|
|
/* ***** Client DNS code ***** */
|
|
|
|
|
|
|
|
/* XXX Perhaps this should get merged with the dns.c code somehow. */
|
2003-12-14 08:50:45 +01:00
|
|
|
/* XXX But we can't just merge them, because then nodes that act as
|
|
|
|
* both OR and OP could be attacked: people could rig the dns cache
|
|
|
|
* by answering funny things to stream begin requests, and later
|
|
|
|
* other clients would reuse those funny addr's. Hm.
|
|
|
|
*/
|
2003-11-14 21:45:47 +01:00
|
|
|
struct client_dns_entry {
|
|
|
|
uint32_t addr;
|
|
|
|
time_t expires;
|
2003-12-14 07:50:44 +01:00
|
|
|
};
|
2003-11-14 21:45:47 +01:00
|
|
|
static int client_dns_size = 0;
|
2004-03-20 02:21:19 +01:00
|
|
|
static strmap_t *client_dns_map = NULL;
|
2003-11-14 21:45:47 +01:00
|
|
|
|
|
|
|
void client_dns_init(void) {
|
2004-03-20 02:21:19 +01:00
|
|
|
client_dns_map = strmap_new();
|
2003-11-14 21:45:47 +01:00
|
|
|
client_dns_size = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint32_t client_dns_lookup_entry(const char *address)
|
|
|
|
{
|
|
|
|
struct client_dns_entry *ent;
|
|
|
|
struct in_addr in;
|
|
|
|
time_t now;
|
|
|
|
|
|
|
|
assert(address);
|
|
|
|
|
2004-03-09 23:01:17 +01:00
|
|
|
if (tor_inet_aton(address, &in)) {
|
2003-12-16 06:33:11 +01:00
|
|
|
log_fn(LOG_DEBUG, "Using static address %s (%08lX)", address,
|
|
|
|
(unsigned long)ntohl(in.s_addr));
|
2003-11-17 08:37:45 +01:00
|
|
|
return ntohl(in.s_addr);
|
2003-11-14 21:45:47 +01:00
|
|
|
}
|
2004-03-20 02:21:19 +01:00
|
|
|
ent = strmap_get_lc(client_dns_map,address);
|
2003-11-14 21:45:47 +01:00
|
|
|
if (!ent) {
|
|
|
|
log_fn(LOG_DEBUG, "No entry found for address %s", address);
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
now = time(NULL);
|
|
|
|
if (ent->expires < now) {
|
|
|
|
log_fn(LOG_DEBUG, "Expired entry found for address %s", address);
|
2004-03-20 02:21:19 +01:00
|
|
|
strmap_remove_lc(client_dns_map,address);
|
|
|
|
tor_free(ent);
|
2003-11-14 21:45:47 +01:00
|
|
|
--client_dns_size;
|
|
|
|
return 0;
|
|
|
|
}
|
2003-11-17 08:37:45 +01:00
|
|
|
in.s_addr = htonl(ent->addr);
|
2003-11-14 21:45:47 +01:00
|
|
|
log_fn(LOG_DEBUG, "Found cached entry for address %s: %s", address,
|
|
|
|
inet_ntoa(in));
|
|
|
|
return ent->addr;
|
|
|
|
}
|
|
|
|
}
|
2004-02-28 08:01:22 +01:00
|
|
|
|
2003-11-14 21:45:47 +01:00
|
|
|
static void client_dns_set_entry(const char *address, uint32_t val)
|
|
|
|
{
|
|
|
|
struct client_dns_entry *ent;
|
|
|
|
struct in_addr in;
|
|
|
|
time_t now;
|
|
|
|
|
|
|
|
assert(address);
|
|
|
|
assert(val);
|
|
|
|
|
2004-03-09 23:01:17 +01:00
|
|
|
if (tor_inet_aton(address, &in))
|
2003-11-14 21:45:47 +01:00
|
|
|
return;
|
|
|
|
now = time(NULL);
|
2004-03-20 02:21:19 +01:00
|
|
|
ent = strmap_get_lc(client_dns_map, address);
|
2003-11-14 21:45:47 +01:00
|
|
|
if (ent) {
|
2003-11-23 19:16:06 +01:00
|
|
|
in.s_addr = htonl(val);
|
|
|
|
log_fn(LOG_DEBUG, "Updating entry for address %s: %s", address,
|
|
|
|
inet_ntoa(in));
|
2003-11-14 21:45:47 +01:00
|
|
|
ent->addr = val;
|
|
|
|
ent->expires = now+MAX_DNS_ENTRY_AGE;
|
|
|
|
} else {
|
2003-11-17 08:37:45 +01:00
|
|
|
in.s_addr = htonl(val);
|
2003-11-14 21:45:47 +01:00
|
|
|
log_fn(LOG_DEBUG, "Caching result for address %s: %s", address,
|
|
|
|
inet_ntoa(in));
|
|
|
|
ent = tor_malloc(sizeof(struct client_dns_entry));
|
|
|
|
ent->addr = val;
|
|
|
|
ent->expires = now+MAX_DNS_ENTRY_AGE;
|
2004-03-20 02:21:19 +01:00
|
|
|
strmap_set_lc(client_dns_map, address, ent);
|
2003-11-14 21:45:47 +01:00
|
|
|
++client_dns_size;
|
|
|
|
}
|
|
|
|
}
|
2003-11-16 06:33:45 +01:00
|
|
|
|
2004-03-20 02:21:19 +01:00
|
|
|
static void* _remove_if_expired(const char *addr,
|
|
|
|
struct client_dns_entry *ent,
|
|
|
|
time_t *nowp)
|
|
|
|
{
|
|
|
|
if (ent->expires < *nowp) {
|
|
|
|
--client_dns_size;
|
|
|
|
tor_free(ent);
|
|
|
|
return NULL;
|
|
|
|
} else {
|
|
|
|
return ent;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-16 22:49:52 +01:00
|
|
|
void client_dns_clean(void)
|
2003-11-14 21:45:47 +01:00
|
|
|
{
|
|
|
|
time_t now;
|
|
|
|
|
2003-11-18 01:02:24 +01:00
|
|
|
if(!client_dns_size)
|
|
|
|
return;
|
2003-11-14 21:45:47 +01:00
|
|
|
now = time(NULL);
|
2004-03-20 02:21:19 +01:00
|
|
|
strmap_foreach(client_dns_map, (strmap_foreach_fn)_remove_if_expired, &now);
|
2003-09-13 00:45:31 +02:00
|
|
|
}
|
|
|
|
|
2003-04-12 00:11:11 +02:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|