aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-04-05 00:47:48 +0000
committerRoger Dingledine <arma@torproject.org>2004-04-05 00:47:48 +0000
commit7793078dffae64d8d4574a37c6ffa40fb54637c9 (patch)
treeb988080813729ccd28d572bce44e032398bec00a /src/or/routerlist.c
parenta9813f0210bbf723e19b24c73fb93ecc436efcfb (diff)
downloadtor-7793078dffae64d8d4574a37c6ffa40fb54637c9.tar
tor-7793078dffae64d8d4574a37c6ffa40fb54637c9.tar.gz
alice can now look up bob's service descriptor,
choose an intro point, connect to it, choose a rend point, connect to it and establish a cookie, get an ack from the rendezvous point, and know when both circs are ready for her. APConns don't use conn->purpose anymore don't initiate a renddesc lookup if one is already in progress also fix a buffer overflow in nickname parsing (only exploitable by the operator though) svn:r1471
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2f41fa1a1..ddd592a02 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -193,7 +193,7 @@ static routerinfo_t *router_pick_directory_server_impl(void) {
void add_nickname_list_to_smartlist(smartlist_t *sl, char *list) {
char *start,*end;
- char nick[MAX_NICKNAME_LEN];
+ char nick[MAX_NICKNAME_LEN+1];
routerinfo_t *router;
assert(sl);
@@ -918,7 +918,7 @@ routerinfo_t *router_get_entry_from_string(const char *s,
}
router->address = tor_strdup(tok->args[1]);
router->addr = 0;
-
+
if (tok->n_args == 6) {
router->or_port = atoi(tok->args[2]);
router->socks_port = atoi(tok->args[3]);