2002-09-26 15:17:14 +02:00
|
|
|
/* Copyright 2001,2002 Roger Dingledine, Matej Pfajfar. */
|
2002-09-26 14:09:10 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
|
|
|
|
|
|
|
#include "or.h"
|
|
|
|
|
|
|
|
#define MAX_DIR_SIZE 50000 /* XXX, big enough? */
|
|
|
|
|
|
|
|
/********* START VARIABLES **********/
|
|
|
|
|
|
|
|
extern or_options_t options; /* command-line and config-file options */
|
|
|
|
|
|
|
|
static char the_directory[MAX_DIR_SIZE+1];
|
|
|
|
static int directorylen=0;
|
2002-09-28 07:53:00 +02:00
|
|
|
static int reading_headers=0;
|
2003-03-11 02:51:41 +01:00
|
|
|
static int directory_dirty=1;
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2002-09-28 07:53:00 +02:00
|
|
|
static char getstring[] = "GET / HTTP/1.0\r\n\r\n";
|
|
|
|
static char answerstring[] = "HTTP/1.0 200 OK\r\n\r\n";
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
/********* END VARIABLES ************/
|
|
|
|
|
|
|
|
void directory_initiate_fetch(routerinfo_t *router) {
|
|
|
|
connection_t *conn;
|
|
|
|
struct sockaddr_in router_addr;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
if(!router) /* i guess they didn't have one in mind for me to use */
|
|
|
|
return;
|
|
|
|
|
2002-09-28 07:53:00 +02:00
|
|
|
if(connection_get_by_type(CONN_TYPE_DIR)) /* there's already a fetch running */
|
|
|
|
return;
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"directory_initiate_fetch(): initiating directory fetch");
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
conn = connection_new(CONN_TYPE_DIR);
|
|
|
|
if(!conn)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* set up conn so it's got all the data we need to remember */
|
2002-10-14 08:44:48 +02:00
|
|
|
conn->addr = router->addr;
|
|
|
|
conn->port = router->dir_port;
|
2002-09-26 14:09:10 +02:00
|
|
|
conn->address = strdup(router->address);
|
|
|
|
conn->receiver_bucket = -1; /* edge connections don't do receiver buckets */
|
|
|
|
conn->bandwidth = -1;
|
Get directories working.
Or at least, directories get generated, signed, download, and checked, with
nobody seeming to crash.
In config/*, added 'signing-key' blocks to dirservers and routers.or, so
that everyone will know about the directories' signing keys.
In or/directory.c, refrained from using a dirserver's signing key when
no such key is known; added more debugging output.
In or/main.c, added debugging output and fixed a few logic errors.
In or/routers.c, added debugging output and prevented a segfault on
routers_resolve_directory. The interleaving of arrays and lists on
routerinfo_t is still messy, but at least it seems to work again.
svn:r278
2003-05-08 23:35:11 +02:00
|
|
|
if (router->signing_pkey)
|
|
|
|
conn->pkey = crypto_pk_dup_key(router->signing_pkey);
|
|
|
|
else {
|
2003-05-09 04:20:16 +02:00
|
|
|
log(LOG_ERR, "No signing key known for directory %s; signature won't be checked", conn->address);
|
Get directories working.
Or at least, directories get generated, signed, download, and checked, with
nobody seeming to crash.
In config/*, added 'signing-key' blocks to dirservers and routers.or, so
that everyone will know about the directories' signing keys.
In or/directory.c, refrained from using a dirserver's signing key when
no such key is known; added more debugging output.
In or/main.c, added debugging output and fixed a few logic errors.
In or/routers.c, added debugging output and prevented a segfault on
routers_resolve_directory. The interleaving of arrays and lists on
routerinfo_t is still messy, but at least it seems to work again.
svn:r278
2003-05-08 23:35:11 +02:00
|
|
|
conn->pkey = NULL;
|
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
s=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
|
2003-03-11 02:51:41 +01:00
|
|
|
if(s < 0) {
|
2002-09-26 14:09:10 +02:00
|
|
|
log(LOG_ERR,"directory_initiate_fetch(): Error creating network socket.");
|
|
|
|
connection_free(conn);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
fcntl(s, F_SETFL, O_NONBLOCK); /* set s to non-blocking */
|
|
|
|
|
|
|
|
memset((void *)&router_addr,0,sizeof(router_addr));
|
|
|
|
router_addr.sin_family = AF_INET;
|
|
|
|
router_addr.sin_port = htons(router->dir_port);
|
2002-10-03 00:54:20 +02:00
|
|
|
router_addr.sin_addr.s_addr = htonl(router->addr);
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
log(LOG_DEBUG,"directory_initiate_fetch(): Trying to connect to %s:%u.",router->address,router->dir_port);
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
if(connect(s,(struct sockaddr *)&router_addr,sizeof(router_addr)) < 0){
|
|
|
|
if(errno != EINPROGRESS){
|
|
|
|
/* yuck. kill it. */
|
2002-09-26 15:17:14 +02:00
|
|
|
router_forget_router(conn->addr, conn->port); /* don't try him again */
|
2002-09-26 14:09:10 +02:00
|
|
|
connection_free(conn);
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
/* it's in progress. set state appropriately and return. */
|
|
|
|
conn->s = s;
|
|
|
|
|
|
|
|
if(connection_add(conn) < 0) { /* no space, forget it */
|
|
|
|
connection_free(conn);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"directory_initiate_fetch(): connect in progress.");
|
|
|
|
connection_watch_events(conn, POLLIN | POLLOUT); /* writable indicates finish, readable indicates broken link */
|
|
|
|
conn->state = DIR_CONN_STATE_CONNECTING;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* it succeeded. we're connected. */
|
|
|
|
conn->s = s;
|
|
|
|
|
|
|
|
if(connection_add(conn) < 0) { /* no space, forget it */
|
|
|
|
connection_free(conn);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"directory_initiate_fetch(): Connection to router %s:%u established.",router->address,router->dir_port);
|
|
|
|
|
|
|
|
if(directory_send_command(conn) < 0) {
|
|
|
|
connection_remove(conn);
|
|
|
|
connection_free(conn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int directory_send_command(connection_t *conn) {
|
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
|
|
|
if(connection_write_to_buf(getstring, strlen(getstring), conn) < 0) {
|
|
|
|
log(LOG_DEBUG,"directory_send_command(): Couldn't write command to buffer.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
conn->state = DIR_CONN_STATE_SENDING_COMMAND;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-03-11 02:51:41 +01:00
|
|
|
void directory_set_dirty(void) {
|
|
|
|
directory_dirty = 1;
|
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-03-11 02:51:41 +01:00
|
|
|
void directory_rebuild(void) {
|
|
|
|
if(directory_dirty) {
|
2003-05-08 05:36:53 +02:00
|
|
|
if (dump_signed_directory_to_string(the_directory, MAX_DIR_SIZE,
|
|
|
|
get_signing_privatekey())) {
|
|
|
|
log(LOG_ERR, "Error writing directory");
|
|
|
|
return;
|
|
|
|
}
|
2003-03-11 02:51:41 +01:00
|
|
|
log(LOG_INFO,"New directory:\n%s",the_directory);
|
|
|
|
directorylen = strlen(the_directory);
|
|
|
|
directory_dirty = 0;
|
|
|
|
} else {
|
|
|
|
log(LOG_INFO,"Directory still clean, reusing.");
|
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int connection_dir_process_inbuf(connection_t *conn) {
|
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
|
|
|
if(conn->inbuf_reached_eof) {
|
|
|
|
if(conn->state != DIR_CONN_STATE_READING) {
|
|
|
|
log(LOG_DEBUG,"connection_dir_process_inbuf(): conn reached eof, not reading. Closing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* eof reached, kill it, but first process the_directory and learn about new routers. */
|
2002-09-28 02:52:59 +02:00
|
|
|
// log(LOG_DEBUG,"connection_dir_process_inbuf(): conn reached eof. Processing directory.");
|
|
|
|
log(LOG_DEBUG,"connection_dir_process_inbuf(): Received directory (size %d)\n%s", directorylen, the_directory);
|
2002-09-26 14:09:10 +02:00
|
|
|
if(directorylen == 0) {
|
|
|
|
log(LOG_DEBUG,"connection_dir_process_inbuf(): Empty directory. Ignoring.");
|
|
|
|
return -1;
|
|
|
|
}
|
2003-05-08 05:36:53 +02:00
|
|
|
if(router_get_dir_from_string(the_directory, conn->pkey) < 0) {
|
2002-09-26 14:09:10 +02:00
|
|
|
log(LOG_DEBUG,"connection_dir_process_inbuf(): ...but parsing failed. Ignoring.");
|
Get directories working.
Or at least, directories get generated, signed, download, and checked, with
nobody seeming to crash.
In config/*, added 'signing-key' blocks to dirservers and routers.or, so
that everyone will know about the directories' signing keys.
In or/directory.c, refrained from using a dirserver's signing key when
no such key is known; added more debugging output.
In or/main.c, added debugging output and fixed a few logic errors.
In or/routers.c, added debugging output and prevented a segfault on
routers_resolve_directory. The interleaving of arrays and lists on
routerinfo_t is still messy, but at least it seems to work again.
svn:r278
2003-05-08 23:35:11 +02:00
|
|
|
} else {
|
|
|
|
log(LOG_DEBUG,"connection_dir_process_inbuf(): and got a %s directory; updated routers.",
|
|
|
|
conn->pkey ? "authenticated" : "unauthenticated");
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
2003-05-09 04:25:37 +02:00
|
|
|
|
2003-05-28 04:03:25 +02:00
|
|
|
if(options.OnionRouter) { /* connect to them all */
|
2002-10-03 00:54:20 +02:00
|
|
|
router_retry_connections();
|
2002-09-28 02:52:59 +02:00
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(conn->state) {
|
|
|
|
case DIR_CONN_STATE_COMMAND_WAIT:
|
|
|
|
return directory_handle_command(conn);
|
|
|
|
case DIR_CONN_STATE_READING:
|
|
|
|
return directory_handle_reading(conn);
|
|
|
|
default:
|
|
|
|
log(LOG_DEBUG,"connection_dir_process_inbuf(): Got data while writing; Ignoring.");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int directory_handle_command(connection_t *conn) {
|
2002-09-28 07:53:00 +02:00
|
|
|
char buf[15];
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
|
|
|
if(conn->inbuf_datalen < strlen(getstring)) { /* entire response available? */
|
|
|
|
log(LOG_DEBUG,"directory_handle_command(): Entire command not here yet. Waiting.");
|
|
|
|
return 0; /* not yet */
|
|
|
|
}
|
|
|
|
|
2002-09-28 07:53:00 +02:00
|
|
|
if(connection_fetch_from_buf(buf,strlen(getstring),conn) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(strncasecmp(buf,getstring,strlen("GET / HTTP/"))) {
|
|
|
|
log(LOG_DEBUG,"directory_handle_command(): Command doesn't seem to be a get. Closing,");
|
|
|
|
return -1;
|
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2003-03-11 02:51:41 +01:00
|
|
|
directory_rebuild(); /* rebuild it now, iff it's dirty */
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
if(directorylen == 0) {
|
|
|
|
log(LOG_DEBUG,"directory_handle_command(): My directory is empty. Closing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"directory_handle_command(): Dumping directory to client.");
|
2002-09-28 07:53:00 +02:00
|
|
|
if((connection_write_to_buf(answerstring, strlen(answerstring), conn) < 0) ||
|
|
|
|
(connection_write_to_buf(the_directory, directorylen, conn) < 0)) {
|
2002-09-26 14:09:10 +02:00
|
|
|
log(LOG_DEBUG,"directory_handle_command(): my outbuf is full. Oops.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
conn->state = DIR_CONN_STATE_WRITING;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int directory_handle_reading(connection_t *conn) {
|
|
|
|
int amt;
|
2002-09-28 07:53:00 +02:00
|
|
|
char *headers;
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
2002-09-28 07:53:00 +02:00
|
|
|
if(reading_headers) {
|
|
|
|
amt = connection_find_on_inbuf("\r\n\r\n", 4, conn);
|
|
|
|
if(amt < 0) /* not there yet */
|
|
|
|
return 0;
|
2003-05-20 08:41:23 +02:00
|
|
|
headers = tor_malloc(amt+1);
|
2002-09-28 07:53:00 +02:00
|
|
|
if(connection_fetch_from_buf(headers,amt,conn) < 0) {
|
|
|
|
log(LOG_DEBUG,"directory_handle_reading(): fetch_from_buf failed (reading headers).");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
headers[amt] = 0; /* null terminate it, */
|
|
|
|
free(headers); /* and then throw it away */
|
|
|
|
reading_headers = 0;
|
|
|
|
}
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
amt = conn->inbuf_datalen;
|
|
|
|
|
|
|
|
if(amt + directorylen >= MAX_DIR_SIZE) {
|
|
|
|
log(LOG_DEBUG,"directory_handle_reading(): Directory too large. Failing messily.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"directory_handle_reading(): Pulling %d bytes in at offset %d.",
|
|
|
|
amt, directorylen);
|
|
|
|
|
|
|
|
if(connection_fetch_from_buf(the_directory+directorylen,amt,conn) < 0) {
|
2002-09-28 07:53:00 +02:00
|
|
|
log(LOG_DEBUG,"directory_handle_reading(): fetch_from_buf failed (reading dir).");
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
directorylen += amt;
|
|
|
|
|
|
|
|
the_directory[directorylen] = 0;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int connection_dir_finished_flushing(connection_t *conn) {
|
|
|
|
int e, len=sizeof(e);
|
|
|
|
|
|
|
|
assert(conn && conn->type == CONN_TYPE_DIR);
|
|
|
|
|
|
|
|
switch(conn->state) {
|
|
|
|
case DIR_CONN_STATE_CONNECTING:
|
|
|
|
if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, &e, &len) < 0) { /* not yet */
|
|
|
|
if(errno != EINPROGRESS){
|
|
|
|
/* yuck. kill it. */
|
|
|
|
log(LOG_DEBUG,"connection_dir_finished_flushing(): in-progress connect failed. Removing.");
|
2002-09-26 15:17:14 +02:00
|
|
|
router_forget_router(conn->addr, conn->port); /* don't try him again */
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
return 0; /* no change, see if next time is better */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* the connect has finished. */
|
|
|
|
|
2002-09-26 15:17:14 +02:00
|
|
|
log(LOG_DEBUG,"connection_dir_finished_flushing(): Dir connection to router %s:%u established.",
|
2002-09-26 14:09:10 +02:00
|
|
|
conn->address,conn->port);
|
|
|
|
|
|
|
|
return directory_send_command(conn);
|
|
|
|
case DIR_CONN_STATE_SENDING_COMMAND:
|
|
|
|
log(LOG_DEBUG,"connection_dir_finished_flushing(): client finished sending command.");
|
|
|
|
directorylen = 0;
|
2002-09-28 07:53:00 +02:00
|
|
|
reading_headers = 1;
|
2002-09-26 14:09:10 +02:00
|
|
|
conn->state = DIR_CONN_STATE_READING;
|
|
|
|
connection_watch_events(conn, POLLIN);
|
|
|
|
return 0;
|
|
|
|
case DIR_CONN_STATE_WRITING:
|
|
|
|
log(LOG_DEBUG,"connection_dir_finished_flushing(): Finished writing directory. Closing.");
|
|
|
|
return -1; /* kill it */
|
|
|
|
default:
|
|
|
|
log(LOG_DEBUG,"Bug: connection_dir_finished_flushing() called in unexpected state.");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
int connection_dir_create_listener(struct sockaddr_in *bindaddr) {
|
2002-09-26 14:09:10 +02:00
|
|
|
log(LOG_DEBUG,"connection_create_dir_listener starting");
|
2002-10-03 00:54:20 +02:00
|
|
|
return connection_create_listener(bindaddr, CONN_TYPE_DIR_LISTENER);
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int connection_dir_handle_listener_read(connection_t *conn) {
|
2002-10-14 08:44:48 +02:00
|
|
|
log(LOG_INFO,"Dir: Received a connection request. Waiting for command.");
|
2002-09-26 14:09:10 +02:00
|
|
|
return connection_handle_listener_read(conn, CONN_TYPE_DIR, DIR_CONN_STATE_COMMAND_WAIT);
|
|
|
|
}
|
|
|
|
|
2003-04-07 04:12:02 +02:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|