Commit 29adf046 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

more general cleanup


svn:r915
parent 444798df
......@@ -116,7 +116,6 @@ int dns_resolve(connection_t *exitconn) {
resolve->pending_connections = pending_connection;
log_fn(LOG_DEBUG,"Connection (fd %d) waiting for pending DNS resolve of '%s'",
exitconn->s, exitconn->address);
return 0;
case CACHE_STATE_VALID:
exitconn->addr = resolve->answer;
......@@ -126,32 +125,30 @@ int dns_resolve(connection_t *exitconn) {
case CACHE_STATE_FAILED:
return -1;
}
} else { /* need to add it */
resolve = tor_malloc_zero(sizeof(struct cached_resolve));
resolve->state = CACHE_STATE_PENDING;
resolve->expire = now + 15*60; /* 15 minutes */
strncpy(resolve->question, exitconn->address, MAX_ADDRESSLEN);
/* add us to the pending list */
pending_connection = tor_malloc(sizeof(struct pending_connection_t));
pending_connection->conn = exitconn;
pending_connection->next = resolve->pending_connections;
resolve->pending_connections = pending_connection;
/* add us to the linked list of resolves */
if (!oldest_cached_resolve) {
oldest_cached_resolve = resolve;
} else {
newest_cached_resolve->next = resolve;
}
newest_cached_resolve = resolve;
SPLAY_INSERT(cache_tree, &cache_root, resolve);
return assign_to_dnsworker(exitconn);
assert(0);
}
/* not there, need to add it */
resolve = tor_malloc_zero(sizeof(struct cached_resolve));
resolve->state = CACHE_STATE_PENDING;
resolve->expire = now + 15*60; /* 15 minutes */
strncpy(resolve->question, exitconn->address, MAX_ADDRESSLEN);
/* add us to the pending list */
pending_connection = tor_malloc(sizeof(struct pending_connection_t));
pending_connection->conn = exitconn;
pending_connection->next = resolve->pending_connections;
resolve->pending_connections = pending_connection;
/* add us to the linked list of resolves */
if (!oldest_cached_resolve) {
oldest_cached_resolve = resolve;
} else {
newest_cached_resolve->next = resolve;
}
newest_cached_resolve = resolve;
assert(0);
return 0; /* not reached; keep gcc happy */
SPLAY_INSERT(cache_tree, &cache_root, resolve);
return assign_to_dnsworker(exitconn);
}
static int assign_to_dnsworker(connection_t *exitconn) {
......
......@@ -152,38 +152,6 @@ int onionskin_answer(circuit_t *circ, unsigned char *payload, unsigned char *key
return 0;
}
#if 0
static char **parse_nickname_list(char *list, int *num) {
char **out;
char *start,*end;
int i;
while(isspace(*list)) list++;
i=0, start = list;
while(*start) {
while(*start && !isspace(*start)) start++;
i++;
while(isspace(*start)) start++;
}
out = tor_malloc(i * sizeof(char *));
i=0, start=list;
while(*start) {
end=start; while(*end && !isspace(*end)) end++;
out[i] = tor_malloc(MAX_NICKNAME_LEN);
strncpy(out[i],start,end-start);
out[i][end-start] = 0; /* null terminate it */
i++;
while(isspace(*end)) end++;
start = end;
}
*num = i;
return out;
}
#endif
static void add_nickname_list_to_smartlist(smartlist_t *sl, char *list) {
char *start,*end;
char nick[MAX_NICKNAME_LEN];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment