summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-07-01 01:59:37 +0000
committerRoger Dingledine <arma@torproject.org>2005-07-01 01:59:37 +0000
commit055477f121ae94614db22597946e68886ee5cad0 (patch)
treefbc21f95e8028a0f7221574dde014dd65ba3d42e
parentb5b138562c4bff3ae09ba8d4bbbf1f8f56f00246 (diff)
downloadtor-055477f121ae94614db22597946e68886ee5cad0.tar.gz
tor-055477f121ae94614db22597946e68886ee5cad0.zip
fix compile error (and likely a a crash bug in resolves)
svn:r4514
-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 f6237413f4..9a241ed8da 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1052,7 +1052,7 @@ router_resolve(routerinfo_t *router)
router->address, router->nickname);
return -1;
}
- memcpy((void *)router->addr, &iaddr.s_addr, 4);
+ memcpy((void *)&router->addr, &iaddr.s_addr, 4);
} else {
if (tor_lookup_hostname(router->address, &router->addr) != 0
|| !router->addr) {
@@ -1111,7 +1111,7 @@ router_resolve_routerlist(routerlist_t *rl)
*
* For now, the algorithm is pretty simple: we look for definite and
* uncertain matches. The first definite match is what we guess; if
- * it was proceded by no uncertain matches of the opposite policy,
+ * it was preceded by no uncertain matches of the opposite policy,
* then the guess is definite; otherwise it is probable. (If we
* have a known addr and port, all matches are definite; if we have an
* unknown addr/port, any address/port ranges other than "all" are