Set routerinfo->addr properly for own routerinfo; do casei routerinfo compare

svn:r1514

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index ac47c8f815adef62fe2e5fe356b814ea5eef4b2a..a543e22e709a0c32227407244b12f58dd53ed983 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -11,7 +11,6 @@ extern char *conn_state_to_string[][_CONN_TYPE_MAX+1];
 static int connection_ap_handshake_process_socks(connection_t *conn);
 
 static int connection_exit_begin_conn(cell_t *cell, circuit_t *circ);
-static int connection_exit_set_rendezvous_addr_port(connection_t *conn);
 static void connection_edge_consider_sending_sendme(connection_t *conn);
 
 static uint32_t client_dns_lookup_entry(const char *address);

diff --git a/src/or/router.c b/src/or/router.c
index 0fcf1b2bdf5cfc9e0ca59765a2527640a2aa7f58..9ca940022922e8e12f98d4f7c59cc9ad1557a656 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -343,11 +343,16 @@ const char *router_get_my_descriptor(void) {
 
 int router_rebuild_descriptor(void) {
   routerinfo_t *ri;
+  struct in_addr addr;
+  if (!tor_inet_aton(options.Address, &addr)) {
+    log_fn(LOG_ERR, "options.Address didn't hold an IP.");
+    return -1;
+  }
 
   ri = tor_malloc_zero(sizeof(routerinfo_t));
   ri->address = tor_strdup(options.Address);
   ri->nickname = tor_strdup(options.Nickname);
-  /* No need to set addr. */
+  ri->addr = (uint32_t) addr.s_addr;
   ri->or_port = options.ORPort;
   ri->socks_port = options.SocksPort;
   ri->dir_port = options.DirPort;

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 0f29b34e70c80650951d9460414beafaf287efe9..526559c9f35f5bf961eb929092f218e08bb37039 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -311,11 +311,11 @@ routerinfo_t *router_get_by_nickname(char *nickname)
 
   for(i=0;i<routerlist->n_routers;i++) {
     router = routerlist->routers[i];
-    if (0 == strcmp(router->nickname, nickname))
+    if (0 == strcasecmp(router->nickname, nickname))
       return router;
   }
   router = router_get_my_routerinfo();
-  if (router && 0 == strcmp(router->nickname, nickname))
+  if (router && 0 == strcasecmp(router->nickname, nickname))
     return router;
 
   return NULL;