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
|
|
|
/**
|
|
|
|
* routers.c
|
|
|
|
* Routines for loading the list of routers and their public RSA keys.
|
|
|
|
*
|
|
|
|
* Matej Pfajfar <mp292@cam.ac.uk>
|
|
|
|
*/
|
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
#define OR_PUBLICKEY_END_TAG "-----END RSA PUBLIC KEY-----\n"
|
2002-06-27 00:45:49 +02:00
|
|
|
|
|
|
|
#include "or.h"
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
/****************************************************************************/
|
|
|
|
|
|
|
|
/* router array */
|
|
|
|
static routerinfo_t **router_array = NULL;
|
|
|
|
static int rarray_len = 0;
|
|
|
|
|
|
|
|
extern or_options_t options; /* command-line and config-file options */
|
2002-09-26 15:17:14 +02:00
|
|
|
extern routerinfo_t *my_routerinfo; /* from main.c */
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
/****************************************************************************/
|
2002-09-04 08:29:28 +02:00
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
/* static function prototypes */
|
|
|
|
static void routerlist_free(routerinfo_t *list);
|
|
|
|
static routerinfo_t **make_rarray(routerinfo_t* list, int *len);
|
|
|
|
static char *eat_whitespace(char *s);
|
|
|
|
static char *find_whitespace(char *s);
|
|
|
|
static routerinfo_t *router_get_entry_from_string(char **s);
|
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
/****************************************************************************/
|
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
int learn_my_address(struct sockaddr_in *me) {
|
|
|
|
/* local host information */
|
|
|
|
char localhostname[512];
|
|
|
|
struct hostent *localhost;
|
|
|
|
|
|
|
|
/* obtain local host information */
|
|
|
|
if(gethostname(localhostname,512) < 0) {
|
|
|
|
log(LOG_ERR,"Error obtaining local hostname.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"learn_my_address(): localhostname is '%s'.",localhostname);
|
|
|
|
localhost = gethostbyname(localhostname);
|
|
|
|
if (!localhost) {
|
|
|
|
log(LOG_ERR,"Error obtaining local host info.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
memset((void *)me,0,sizeof(struct sockaddr_in));
|
|
|
|
me->sin_family = AF_INET;
|
|
|
|
memcpy((void *)&me->sin_addr,(void *)localhost->h_addr,sizeof(struct in_addr));
|
|
|
|
me->sin_port = htons(options.ORPort);
|
|
|
|
log(LOG_DEBUG,"learn_my_address(): chose address as '%s'.",inet_ntoa(me->sin_addr));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void router_retry_connections(void) {
|
2002-09-26 14:09:10 +02:00
|
|
|
int i;
|
|
|
|
routerinfo_t *router;
|
|
|
|
|
|
|
|
for (i=0;i<rarray_len;i++) {
|
|
|
|
router = router_array[i];
|
|
|
|
if(!connection_exact_get_by_addr_port(router->addr,router->or_port)) { /* not in the list */
|
|
|
|
log(LOG_DEBUG,"retry_all_connections(): connecting to OR %s:%u.",router->address,router->or_port);
|
2002-10-03 00:54:20 +02:00
|
|
|
connection_or_connect_as_or(router);
|
2002-09-26 14:09:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
routerinfo_t *router_pick_directory_server(void) {
|
|
|
|
/* currently, pick the first router with a positive dir_port */
|
|
|
|
int i;
|
|
|
|
routerinfo_t *router;
|
|
|
|
|
|
|
|
if(!router_array)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for(i=0;i<rarray_len;i++) {
|
|
|
|
router = router_array[i];
|
|
|
|
if(router->dir_port > 0)
|
|
|
|
return router;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
routerinfo_t *router_get_by_addr_port(uint32_t addr, uint16_t port) {
|
|
|
|
int i;
|
|
|
|
routerinfo_t *router;
|
|
|
|
|
|
|
|
assert(router_array);
|
|
|
|
|
|
|
|
for(i=0;i<rarray_len;i++) {
|
|
|
|
router = router_array[i];
|
|
|
|
if ((router->addr == addr) && (router->or_port == port))
|
|
|
|
return router;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
routerinfo_t *router_get_first_in_route(unsigned int *route, int routelen) {
|
|
|
|
return router_array[route[routelen-1]];
|
|
|
|
}
|
|
|
|
|
|
|
|
/* a wrapper around new_route. put all these in routers.c perhaps? */
|
|
|
|
unsigned int *router_new_route(int *routelen) {
|
|
|
|
return new_route(options.CoinWeight, router_array, rarray_len, routelen);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* a wrapper around create_onion */
|
|
|
|
unsigned char *router_create_onion(unsigned int *route, int routelen, int *len, crypt_path_t **cpath) {
|
|
|
|
return create_onion(router_array,rarray_len,route,routelen,len,cpath);
|
|
|
|
}
|
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
/* return 1 if addr and port corresponds to my addr and my or_listenport. else 0,
|
|
|
|
* or -1 for failure.
|
|
|
|
*/
|
|
|
|
int router_is_me(uint32_t addr, uint16_t port)
|
2002-07-10 14:35:59 +02:00
|
|
|
{
|
2002-10-03 00:54:20 +02:00
|
|
|
struct sockaddr_in me; /* my router identity */
|
|
|
|
|
2003-03-18 02:49:55 +01:00
|
|
|
if(!options.ORPort) {
|
2002-10-03 00:54:20 +02:00
|
|
|
/* we're not an OR. This obviously isn't us. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(learn_my_address(&me) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if(ntohl(me.sin_addr.s_addr) == addr && ntohs(me.sin_port) == port)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
#if 0
|
2002-07-10 14:35:59 +02:00
|
|
|
/* local host information */
|
|
|
|
char localhostname[512];
|
|
|
|
struct hostent *localhost;
|
2002-08-27 21:28:35 +02:00
|
|
|
struct in_addr *a;
|
|
|
|
char *tmp1;
|
2002-07-10 14:35:59 +02:00
|
|
|
|
|
|
|
char *addr = NULL;
|
|
|
|
int i = 0;
|
2002-09-04 08:29:28 +02:00
|
|
|
|
2002-07-10 14:35:59 +02:00
|
|
|
/* obtain local host information */
|
|
|
|
if (gethostname(localhostname,512) < 0) {
|
2002-09-24 12:43:57 +02:00
|
|
|
log(LOG_ERR,"router_is_me(): Error obtaining local hostname.");
|
2002-07-10 14:35:59 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
localhost = gethostbyname(localhostname);
|
|
|
|
if (!localhost) {
|
2002-09-24 12:43:57 +02:00
|
|
|
log(LOG_ERR,"router_is_me(): Error obtaining local host info.");
|
2002-07-10 14:35:59 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check host addresses for a match with or_address above */
|
|
|
|
addr = localhost->h_addr_list[i++]; /* set to the first local address */
|
|
|
|
while(addr)
|
|
|
|
{
|
2002-08-27 21:28:35 +02:00
|
|
|
a = (struct in_addr *)addr;
|
|
|
|
|
|
|
|
tmp1 = strdup(inet_ntoa(*a)); /* can't call inet_ntoa twice in the same
|
2002-09-26 14:09:10 +02:00
|
|
|
printf, since it overwrites its static
|
|
|
|
memory each time */
|
2002-08-27 21:28:35 +02:00
|
|
|
log(LOG_DEBUG,"router_is_me(): Comparing '%s' to '%s'.",tmp1,
|
|
|
|
inet_ntoa( *((struct in_addr *)&or_address) ) );
|
|
|
|
free(tmp1);
|
2002-07-10 14:35:59 +02:00
|
|
|
if (!memcmp((void *)&or_address, (void *)addr, sizeof(uint32_t))) { /* addresses match */
|
2002-08-27 21:28:35 +02:00
|
|
|
log(LOG_DEBUG,"router_is_me(): Addresses match. Comparing ports.");
|
|
|
|
if (or_listenport == my_or_listenport) { /* ports also match */
|
|
|
|
log(LOG_DEBUG,"router_is_me(): Ports match too.");
|
2002-08-24 09:55:49 +02:00
|
|
|
return 1;
|
2002-08-27 21:28:35 +02:00
|
|
|
}
|
2002-07-10 14:35:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
addr = localhost->h_addr_list[i++];
|
|
|
|
}
|
2002-10-03 00:54:20 +02:00
|
|
|
|
2002-07-10 14:35:59 +02:00
|
|
|
return 0;
|
2002-10-03 00:54:20 +02:00
|
|
|
#endif
|
2002-07-10 14:35:59 +02:00
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/* delete a list of routers from memory */
|
2002-09-24 12:43:57 +02:00
|
|
|
static void routerlist_free(routerinfo_t *list)
|
2002-06-27 00:45:49 +02:00
|
|
|
{
|
|
|
|
routerinfo_t *tmp = NULL;
|
|
|
|
|
|
|
|
if (!list)
|
|
|
|
return;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
tmp=list->next;
|
|
|
|
free((void *)list->address);
|
2002-08-22 09:30:03 +02:00
|
|
|
crypto_free_pk_env(list->pkey);
|
2002-06-27 00:45:49 +02:00
|
|
|
free((void *)list);
|
|
|
|
list = tmp;
|
|
|
|
}
|
|
|
|
while (list != NULL);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
void rarray_free(routerinfo_t **list) {
|
|
|
|
if(!list)
|
|
|
|
return;
|
|
|
|
routerlist_free(*list);
|
|
|
|
free(list);
|
|
|
|
}
|
|
|
|
|
2002-09-26 15:17:14 +02:00
|
|
|
void router_forget_router(uint32_t addr, uint16_t port) {
|
|
|
|
int i;
|
|
|
|
routerinfo_t *router;
|
|
|
|
|
|
|
|
router = router_get_by_addr_port(addr,port);
|
|
|
|
if(!router) /* we don't seem to know about him in the first place */
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* now walk down router_array until we get to router */
|
|
|
|
for(i=0;i<rarray_len;i++)
|
|
|
|
if(router_array[i] == router)
|
|
|
|
break;
|
|
|
|
|
|
|
|
assert(i != rarray_len); /* if so then router_get_by_addr_port should have returned null */
|
|
|
|
|
2002-09-26 15:19:13 +02:00
|
|
|
// free(router); /* don't actually free; we'll free it when we free the whole thing */
|
|
|
|
|
2002-09-26 15:17:14 +02:00
|
|
|
// log(LOG_DEBUG,"router_forget_router(): Forgot about router %d:%d",addr,port);
|
|
|
|
for(; i<rarray_len-1;i++)
|
|
|
|
router_array[i] = router_array[i+1];
|
|
|
|
}
|
|
|
|
|
2002-07-22 06:08:37 +02:00
|
|
|
/* create a NULL-terminated array of pointers pointing to elements of a router list */
|
2002-06-27 00:45:49 +02:00
|
|
|
/* this is done in two passes through the list - inefficient but irrelevant as this is
|
|
|
|
* only done once when op/or start up */
|
2002-09-24 12:43:57 +02:00
|
|
|
static routerinfo_t **make_rarray(routerinfo_t* list, int *len)
|
2002-06-27 00:45:49 +02:00
|
|
|
{
|
|
|
|
routerinfo_t *tmp=NULL;
|
|
|
|
int listlen = 0;
|
|
|
|
routerinfo_t **array=NULL;
|
|
|
|
routerinfo_t **p=NULL;
|
|
|
|
|
|
|
|
if ((!list) || (!len))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* get the length of the list */
|
|
|
|
tmp = list;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
listlen++;
|
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
|
|
|
while (tmp != NULL);
|
|
|
|
|
|
|
|
array = malloc((listlen+1)*sizeof(routerinfo_t *));
|
|
|
|
if (!array)
|
|
|
|
{
|
|
|
|
log(LOG_ERR,"Error allocating memory.");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp=list;
|
|
|
|
p = array;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
*p = tmp;
|
|
|
|
p++;
|
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
|
|
|
while(tmp != NULL);
|
|
|
|
*p=NULL;
|
|
|
|
|
|
|
|
*len = listlen;
|
|
|
|
return array;
|
|
|
|
}
|
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/* load the router list */
|
2002-10-03 00:54:20 +02:00
|
|
|
int router_get_list_from_file(char *routerfile)
|
2002-06-27 00:45:49 +02:00
|
|
|
{
|
2002-09-24 12:43:57 +02:00
|
|
|
int fd; /* router file */
|
|
|
|
struct stat statbuf;
|
|
|
|
char *string;
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-09-26 14:09:10 +02:00
|
|
|
assert(routerfile);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-07-22 06:08:37 +02:00
|
|
|
if (strcspn(routerfile,CONFIG_LEGAL_FILENAME_CHARACTERS) != 0) {
|
2002-09-24 12:43:57 +02:00
|
|
|
log(LOG_ERR,"router_get_list_from_file(): Filename %s contains illegal characters.",routerfile);
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
if(stat(routerfile, &statbuf) < 0) {
|
|
|
|
log(LOG_ERR,"router_get_list_from_file(): Could not stat %s.",routerfile);
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
2002-09-24 12:43:57 +02:00
|
|
|
}
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
/* open the router list */
|
2002-09-24 12:43:57 +02:00
|
|
|
fd = open(routerfile,O_RDONLY,0);
|
|
|
|
if (fd<0) {
|
|
|
|
log(LOG_ERR,"router_get_list_from_file(): Could not open %s.",routerfile);
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
2002-09-24 12:43:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
string = malloc(statbuf.st_size+1);
|
|
|
|
if(!string) {
|
|
|
|
log(LOG_ERR,"router_get_list_from_file(): Out of memory.");
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
2002-09-24 12:43:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if(read(fd,string,statbuf.st_size) != statbuf.st_size) {
|
|
|
|
log(LOG_ERR,"router_get_list_from_file(): Couldn't read all %d bytes of file '%s'.",statbuf.st_size,routerfile);
|
2002-09-26 14:09:10 +02:00
|
|
|
free(string);
|
|
|
|
close(fd);
|
|
|
|
return -1;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2002-09-24 12:43:57 +02:00
|
|
|
close(fd);
|
2002-06-27 00:45:49 +02:00
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
string[statbuf.st_size] = 0; /* null terminate it */
|
2002-09-26 14:09:10 +02:00
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
if(router_get_list_from_string(string) < 0) {
|
2002-09-26 14:09:10 +02:00
|
|
|
log(LOG_ERR,"router_get_list_from_file(): The routerfile itself was corrupt.");
|
|
|
|
free(string);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(string);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-10-03 00:54:20 +02:00
|
|
|
int router_get_list_from_string(char *s) {
|
2002-09-26 14:09:10 +02:00
|
|
|
routerinfo_t *routerlist=NULL;
|
|
|
|
routerinfo_t *router;
|
|
|
|
routerinfo_t **new_router_array;
|
|
|
|
int new_rarray_len;
|
|
|
|
|
|
|
|
assert(s);
|
|
|
|
|
|
|
|
while(*s) { /* while not at the end of the string */
|
|
|
|
router = router_get_entry_from_string(&s);
|
2002-09-24 12:43:57 +02:00
|
|
|
if(router == NULL) {
|
|
|
|
routerlist_free(routerlist);
|
2002-09-26 14:09:10 +02:00
|
|
|
return -1;
|
2002-09-24 12:43:57 +02:00
|
|
|
}
|
2002-10-03 00:54:20 +02:00
|
|
|
switch(router_is_me(router->addr, router->or_port)) {
|
|
|
|
case 0: /* it's not me */
|
|
|
|
router->next = routerlist;
|
|
|
|
routerlist = router;
|
|
|
|
break;
|
|
|
|
case 1: /* it is me */
|
|
|
|
if(!my_routerinfo) /* save it, so we can use it for directories */
|
|
|
|
my_routerinfo = router;
|
2002-12-03 06:12:30 +01:00
|
|
|
else
|
|
|
|
routerlist_free(router);
|
2002-10-03 00:54:20 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
log(LOG_ERR,"router_get_list_from_string(): router_is_me returned error.");
|
|
|
|
routerlist_free(routerlist);
|
|
|
|
return -1;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
s = eat_whitespace(s);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2002-09-26 14:09:10 +02:00
|
|
|
|
|
|
|
new_router_array = make_rarray(routerlist, &new_rarray_len);
|
|
|
|
if(new_router_array) { /* success! replace the old one */
|
|
|
|
rarray_free(router_array); /* free the old one first */
|
|
|
|
router_array = new_router_array;
|
|
|
|
rarray_len = new_rarray_len;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
2002-09-24 12:43:57 +02:00
|
|
|
|
|
|
|
/* return the first char of s that is not whitespace and not a comment */
|
|
|
|
static char *eat_whitespace(char *s) {
|
|
|
|
assert(s);
|
|
|
|
|
|
|
|
while(isspace(*s) || *s == '#') {
|
|
|
|
while(isspace(*s))
|
|
|
|
s++;
|
|
|
|
if(*s == '#') { /* read to a \n or \0 */
|
|
|
|
while(*s && *s != '\n')
|
|
|
|
s++;
|
|
|
|
if(!*s)
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* return the first char of s that is whitespace or '#' or '\0 */
|
|
|
|
static char *find_whitespace(char *s) {
|
|
|
|
assert(s);
|
|
|
|
|
|
|
|
while(*s && !isspace(*s) && *s != '#')
|
|
|
|
s++;
|
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* reads a single router entry from s.
|
|
|
|
* updates s so it points to after the router it just read.
|
|
|
|
* mallocs a new router, returns it if all goes well, else returns NULL.
|
|
|
|
*/
|
|
|
|
static routerinfo_t *router_get_entry_from_string(char **s) {
|
|
|
|
routerinfo_t *router;
|
|
|
|
char *next;
|
|
|
|
struct hostent *rent;
|
|
|
|
|
|
|
|
router = malloc(sizeof(routerinfo_t));
|
|
|
|
if (!router) {
|
|
|
|
log(LOG_ERR,"router_get_entry_from_string(): Could not allocate memory.");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
memset(router,0,sizeof(routerinfo_t)); /* zero it out first */
|
|
|
|
|
|
|
|
#define NEXT_TOKEN(s, next) \
|
|
|
|
*s = eat_whitespace(*s); \
|
|
|
|
next = find_whitespace(*s); \
|
|
|
|
if(!*next) { \
|
|
|
|
goto router_read_failed; \
|
|
|
|
} \
|
|
|
|
*next = 0;
|
|
|
|
|
|
|
|
/* read router->address */
|
|
|
|
NEXT_TOKEN(s, next);
|
|
|
|
router->address = strdup(*s);
|
|
|
|
*s = next+1;
|
|
|
|
|
|
|
|
rent = (struct hostent *)gethostbyname(router->address);
|
|
|
|
if (!rent) {
|
|
|
|
log(LOG_ERR,"router_get_entry_from_string(): Could not get address for router %s.",router->address);
|
|
|
|
goto router_read_failed;
|
|
|
|
}
|
|
|
|
assert(rent->h_length == 4);
|
|
|
|
memcpy(&router->addr, rent->h_addr,rent->h_length);
|
2002-10-03 00:54:20 +02:00
|
|
|
router->addr = ntohl(router->addr); /* get it back into host order */
|
2002-09-24 12:43:57 +02:00
|
|
|
|
|
|
|
/* read router->or_port */
|
|
|
|
NEXT_TOKEN(s, next);
|
|
|
|
router->or_port = atoi(*s);
|
|
|
|
if(!router->or_port) {
|
|
|
|
log(LOG_ERR,"router_get_entry_from_string(): or_port '%s' unreadable or 0. Failing.",*s);
|
|
|
|
goto router_read_failed;
|
|
|
|
}
|
|
|
|
*s = next+1;
|
|
|
|
|
|
|
|
/* read router->op_port */
|
|
|
|
NEXT_TOKEN(s, next);
|
|
|
|
router->op_port = atoi(*s);
|
|
|
|
*s = next+1;
|
|
|
|
|
|
|
|
/* read router->ap_port */
|
|
|
|
NEXT_TOKEN(s, next);
|
|
|
|
router->ap_port = atoi(*s);
|
|
|
|
*s = next+1;
|
|
|
|
|
|
|
|
/* read router->dir_port */
|
|
|
|
NEXT_TOKEN(s, next);
|
|
|
|
router->dir_port = atoi(*s);
|
|
|
|
*s = next+1;
|
|
|
|
|
|
|
|
/* read router->bandwidth */
|
|
|
|
NEXT_TOKEN(s, next);
|
|
|
|
router->bandwidth = atoi(*s);
|
|
|
|
if(!router->bandwidth) {
|
|
|
|
log(LOG_ERR,"router_get_entry_from_string(): bandwidth '%s' unreadable or 0. Failing.",*s);
|
|
|
|
goto router_read_failed;
|
|
|
|
}
|
|
|
|
*s = next+1;
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"or_port %d, op_port %d, ap_port %d, dir_port %d, bandwidth %d.",
|
|
|
|
router->or_port, router->op_port, router->ap_port, router->dir_port, router->bandwidth);
|
|
|
|
|
|
|
|
*s = eat_whitespace(*s);
|
|
|
|
next = strstr(*s,OR_PUBLICKEY_END_TAG);
|
|
|
|
router->pkey = crypto_new_pk_env(CRYPTO_PK_RSA);
|
|
|
|
if(!next || !router->pkey) {
|
|
|
|
log(LOG_ERR,"router_get_entry_from_string(): Couldn't find pk in string");
|
|
|
|
goto router_read_failed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now advance *s so it's at the end of this router entry */
|
|
|
|
next = strchr(next, '\n');
|
|
|
|
assert(next); /* can't fail, we just checked it was here */
|
|
|
|
*next = 0;
|
2002-09-26 14:09:10 +02:00
|
|
|
// log(LOG_DEBUG,"Key about to be read is: '%s'",*s);
|
2002-09-24 12:43:57 +02:00
|
|
|
if((crypto_pk_read_public_key_from_string(router->pkey, *s, strlen(*s))<0)) {
|
|
|
|
log(LOG_ERR,"router_get_entry_from_string(): Couldn't read pk from string");
|
|
|
|
goto router_read_failed;
|
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"router_get_entry_from_string(): Public key size = %u.", crypto_pk_keysize(router->pkey));
|
|
|
|
|
|
|
|
if (crypto_pk_keysize(router->pkey) != 128) { /* keys MUST be 1024 bits in size */
|
|
|
|
log(LOG_ERR,"Key for router %s:%u is not 1024 bits. All keys must be exactly 1024 bits long.",
|
|
|
|
router->address,router->or_port);
|
|
|
|
goto router_read_failed;
|
|
|
|
}
|
|
|
|
|
|
|
|
// test_write_pkey(router->pkey);
|
|
|
|
|
|
|
|
*s = next+1;
|
|
|
|
|
|
|
|
/* success */
|
|
|
|
return(router);
|
|
|
|
|
|
|
|
router_read_failed:
|
|
|
|
if(router->address)
|
|
|
|
free(router->address);
|
|
|
|
if(router->pkey)
|
|
|
|
crypto_free_pk_env(router->pkey);
|
|
|
|
free(router);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
void test_write_pkey(crypto_pk_env_t *pkey) {
|
|
|
|
char *string;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
log(LOG_DEBUG,"Trying test write.");
|
|
|
|
if(crypto_pk_write_public_key_to_string(pkey,&string,&len)<0) {
|
|
|
|
log(LOG_DEBUG,"router_get_entry_from_string(): write pkey to string failed\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
log(LOG_DEBUG,"I did it: len %d, string '%s'.",len,string);
|
|
|
|
free(string);
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
2002-09-24 12:43:57 +02:00
|
|
|
#endif
|
2002-07-22 06:08:37 +02:00
|
|
|
|
2003-04-07 04:12:02 +02:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|