[or-cvs] Add a const; fix a (probably harmless) bug when storing a r...

Nick Mathewson nickm at seul.org
Mon Jul 10 18:38:59 UTC 2006


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv20116/src/or

Modified Files:
	dns.c 
Log Message:
Add a const; fix a (probably harmless) bug when storing a resolve we forgot we asked for.

Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -d -r1.195 -r1.196
--- dns.c	7 Jul 2006 17:33:30 -0000	1.195
+++ dns.c	10 Jul 2006 18:38:57 -0000	1.196
@@ -78,7 +78,7 @@ typedef struct cached_resolve_t {
 
 static void purge_expired_resolves(uint32_t now);
 static void dns_purge_resolve(cached_resolve_t *resolve);
-static void dns_found_answer(char *address, uint32_t addr, char outcome,
+static void dns_found_answer(const char *address, uint32_t addr, char outcome,
                              uint32_t ttl);
 static void send_resolved_cell(connection_t *conn, uint8_t answer_type);
 static int assign_to_dnsworker(connection_t *exitconn);
@@ -593,7 +593,7 @@ dns_purge_resolve(cached_resolve_t *reso
  * DNS_RESOLVE_{FAILED_TRANSIENT|FAILED_PERMANENT|SUCCEEDED}.
  */
 static void
-dns_found_answer(char *address, uint32_t addr, char outcome, uint32_t ttl)
+dns_found_answer(const char *address, uint32_t addr, char outcome, uint32_t ttl)
 {
   pending_connection_t *pend;
   cached_resolve_t search;
@@ -610,6 +610,7 @@ dns_found_answer(char *address, uint32_t
     resolve = tor_malloc_zero(sizeof(cached_resolve_t));
     resolve->state = (outcome == DNS_RESOLVE_SUCCEEDED) ?
       CACHE_STATE_VALID : CACHE_STATE_FAILED;
+    strlcpy(resolve->address, address, sizeof(resolve->address));
     resolve->addr = addr;
     resolve->expire = time(NULL) + dns_get_expiry_ttl(ttl);
     resolve->ttl = ttl;



More information about the tor-commits mailing list