dns.c 18.3 KB
Newer Older
1
2
3
4
/* Copyright 2003 Roger Dingledine. */
/* See LICENSE for licensing information */
/* $Id$ */

5
6
7
8
9
/* See http://elvin.dstc.com/ListArchive/elvin-dev/archive/2001/09/msg00027.html
 * for some approaches to asynchronous dns. We will want to switch once one of
 * them becomes more commonly available.
 */

10
#include "or.h"
11
#include "tree.h"
12

Roger Dingledine's avatar
Roger Dingledine committed
13
14
extern or_options_t options; /* command-line and config-file options */

15
16
#define MAX_ADDRESSLEN 256

17
18
#define MAX_DNSWORKERS 50
#define MIN_DNSWORKERS 3
19
#define MAX_IDLE_DNSWORKERS 10
20

21
22
23
24
#define DNS_RESOLVE_FAILED_TRANSIENT 1
#define DNS_RESOLVE_FAILED_PERMANENT 2
#define DNS_RESOLVE_SUCCEEDED 3

Roger Dingledine's avatar
Roger Dingledine committed
25
26
int num_dnsworkers=0;
int num_dnsworkers_busy=0;
27
28
29
30
31
32
33
34

struct pending_connection_t {
  struct connection_t *conn;
  struct pending_connection_t *next;
};

struct cached_resolve {
  SPLAY_ENTRY(cached_resolve) node;
35
36
  char address[MAX_ADDRESSLEN]; /* the hostname to be resolved */
  uint32_t addr; /* in host order. I know I'm horrible for assuming ipv4 */
37
38
39
40
41
42
43
44
45
  char state; /* 0 is pending; 1 means answer is valid; 2 means resolve failed */
#define CACHE_STATE_PENDING 0
#define CACHE_STATE_VALID 1
#define CACHE_STATE_FAILED 2
  uint32_t expire; /* remove untouched items from cache after some time? */
  struct pending_connection_t *pending_connections;
  struct cached_resolve *next;
};

46
47
48
49
50
51
52
53
static void purge_expired_resolves(uint32_t now);
static int assign_to_dnsworker(connection_t *exitconn);
static void dns_purge_resolve(struct cached_resolve *resolve);
static void dns_found_answer(char *address, uint32_t addr, char outcome);
int dnsworker_main(void *data);
static int spawn_dnsworker(void);
static void spawn_enough_dnsworkers(void);

54
static SPLAY_HEAD(cache_tree, cached_resolve) cache_root;
55

56
57
static int compare_cached_resolves(struct cached_resolve *a,
                                   struct cached_resolve *b) {
58
  /* make this smarter one day? */
59
  return strncasecmp(a->address, b->address, MAX_ADDRESSLEN);
60
61
62
63
64
}

SPLAY_PROTOTYPE(cache_tree, cached_resolve, node, compare_cached_resolves);
SPLAY_GENERATE(cache_tree, cached_resolve, node, compare_cached_resolves);

65
static void init_cache_tree(void) {
66
67
68
  SPLAY_INIT(&cache_root);
}

69
70
void dns_init(void) {
  init_cache_tree();
Roger Dingledine's avatar
Roger Dingledine committed
71
  spawn_enough_dnsworkers();
72
}
73

74
75
76
static struct cached_resolve *oldest_cached_resolve = NULL; /* linked list, */
static struct cached_resolve *newest_cached_resolve = NULL; /* oldest to newest */

77
78
79
80
81
82
83
84
static void purge_expired_resolves(uint32_t now) {
  struct cached_resolve *resolve;

  /* this is fast because the linked list
   * oldest_cached_resolve is ordered by when they came in.
   */
  while(oldest_cached_resolve && (oldest_cached_resolve->expire < now)) {
    resolve = oldest_cached_resolve;
85
    log(LOG_DEBUG,"Forgetting old cached resolve (expires %lu)", (unsigned long)resolve->expire);
86
87
88
89
90
91
    if(resolve->state == CACHE_STATE_PENDING) {
      log_fn(LOG_WARN,"Expiring a dns resolve that's still pending. Forgot to cull it?");
      /* XXX if resolve->pending_connections is used, then we're probably
       * introducing bugs by closing resolve without notifying those streams.
       */
    }
92
93
94
95
    oldest_cached_resolve = resolve->next;
    if(!oldest_cached_resolve) /* if there are no more, */
      newest_cached_resolve = NULL; /* then make sure the list's tail knows that too */
    SPLAY_REMOVE(cache_tree, &cache_root, resolve);
96
    tor_free(resolve);
97
98
99
  }
}

100
/* See if we have a cache entry for 'exitconn->address'. if so,
101
102
 * if resolve valid, put it into exitconn->addr and return 1.
 * If resolve failed, return -1.
103
104
105
106
107
108
109
110
111
 *
 * Else, if seen before and pending, add conn to the pending list,
 * and return 0.
 *
 * Else, if not seen before, add conn to pending list, hand to
 * dns farm, and return 0.
 */
int dns_resolve(connection_t *exitconn) {
  struct cached_resolve *resolve;
Roger Dingledine's avatar
   
Roger Dingledine committed
112
  struct cached_resolve search;
113
  struct pending_connection_t *pending_connection;
114
  struct in_addr in;
115
  uint32_t now = time(NULL);
116
  assert_connection_ok(exitconn, 0);
117

118
119
120
121
122
123
124
125
  /* XXX leave disabled for dirservers so we can find the conn-munging bug */
  if(!options.DirPort) {
    /* first check if exitconn->address is an IP. If so, we already
     * know the answer. */
    if (tor_inet_aton(exitconn->address, &in) != 0) {
      exitconn->addr = ntohl(in.s_addr);
      return 1;
    }
126
127
128
129
  }

  /* then take this opportunity to see if there are any expired
   * resolves in the tree. */
130
  purge_expired_resolves(now);
131

132
133
  /* now check the tree to see if 'address' is already there. */
  strncpy(search.address, exitconn->address, MAX_ADDRESSLEN);
134
  search.address[MAX_ADDRESSLEN-1] = 0;
Roger Dingledine's avatar
   
Roger Dingledine committed
135
  resolve = SPLAY_FIND(cache_tree, &cache_root, &search);
136
  if(resolve) { /* already there */
137
138
139
    switch(resolve->state) {
      case CACHE_STATE_PENDING:
        /* add us to the pending list */
140
        pending_connection = tor_malloc(sizeof(struct pending_connection_t));
141
        pending_connection->conn = exitconn;
Roger Dingledine's avatar
   
Roger Dingledine committed
142
143
        pending_connection->next = resolve->pending_connections;
        resolve->pending_connections = pending_connection;
144
145
        log_fn(LOG_DEBUG,"Connection (fd %d) waiting for pending DNS resolve of '%s'",
               exitconn->s, exitconn->address);
Roger Dingledine's avatar
   
Roger Dingledine committed
146
        return 0;
147
      case CACHE_STATE_VALID:
148
        exitconn->addr = resolve->addr;
149
150
        log_fn(LOG_DEBUG,"Connection (fd %d) found cached answer for '%s'",
               exitconn->s, exitconn->address);
151
        return 1;
152
153
154
      case CACHE_STATE_FAILED:
        return -1;
    }
Roger Dingledine's avatar
Roger Dingledine committed
155
156
157
158
159
    assert(0);
  }
  /* not there, need to add it */
  resolve = tor_malloc_zero(sizeof(struct cached_resolve));
  resolve->state = CACHE_STATE_PENDING;
160
161
  resolve->expire = now + MAX_DNS_ENTRY_AGE;
  strncpy(resolve->address, exitconn->address, MAX_ADDRESSLEN);
162
  resolve->address[MAX_ADDRESSLEN-1] = 0;
Roger Dingledine's avatar
Roger Dingledine committed
163
164
165
166

  /* add us to the pending list */
  pending_connection = tor_malloc(sizeof(struct pending_connection_t));
  pending_connection->conn = exitconn;
167
  pending_connection->next = NULL;
Roger Dingledine's avatar
Roger Dingledine committed
168
169
170
171
172
173
174
  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;
175
  }
Roger Dingledine's avatar
Roger Dingledine committed
176
  newest_cached_resolve = resolve;
177

Roger Dingledine's avatar
Roger Dingledine committed
178
179
  SPLAY_INSERT(cache_tree, &cache_root, resolve);
  return assign_to_dnsworker(exitconn);
180
181
}

Roger Dingledine's avatar
Roger Dingledine committed
182
static int assign_to_dnsworker(connection_t *exitconn) {
183
184
  connection_t *dnsconn;
  unsigned char len;
185

Roger Dingledine's avatar
Roger Dingledine committed
186
  spawn_enough_dnsworkers(); /* respawn here, to be sure there are enough */
187

188
  dnsconn = connection_get_by_type_state(CONN_TYPE_DNSWORKER, DNSWORKER_STATE_IDLE);
189
190

  if(!dnsconn) {
Roger Dingledine's avatar
Roger Dingledine committed
191
    log_fn(LOG_WARN,"no idle dns workers. Failing.");
192
    dns_cancel_pending_resolve(exitconn->address);
193
    return -1;
194
195
  }

196
197
198
  log_fn(LOG_DEBUG, "Connection (fd %d) needs to resolve '%s'; assigning to DNSWorker (fd %d)",
         exitconn->s, exitconn->address, dnsconn->s);

199
  tor_free(dnsconn->address);
200
  dnsconn->address = tor_strdup(exitconn->address);
201
  dnsconn->state = DNSWORKER_STATE_BUSY;
Roger Dingledine's avatar
Roger Dingledine committed
202
  num_dnsworkers_busy++;
203

204
  len = strlen(dnsconn->address);
205
206
  connection_write_to_buf(&len, 1, dnsconn);
  connection_write_to_buf(dnsconn->address, len, dnsconn);
207

Roger Dingledine's avatar
Roger Dingledine committed
208
//  log_fn(LOG_DEBUG,"submitted '%s'", exitconn->address);
209
210
211
  return 0;
}

212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
void connection_dns_remove(connection_t *conn)
{
  struct pending_connection_t *pend, *victim;
  struct cached_resolve search;
  struct cached_resolve *resolve;

  strncpy(search.address, conn->address, MAX_ADDRESSLEN);
  search.address[MAX_ADDRESSLEN-1] = 0;

  resolve = SPLAY_FIND(cache_tree, &cache_root, &search);
  if(!resolve) {
    log_fn(LOG_WARN,"Address '%s' is not pending. Dropping.", conn->address);
    return;
  }

  assert(resolve->pending_connections);
  assert_connection_ok(conn,0);

  pend = resolve->pending_connections;

  if(pend->conn == conn) {
    resolve->pending_connections = pend->next;
234
    tor_free(pend);
235
    log_fn(LOG_DEBUG, "First connection (fd %d) no longer waiting for resolve of '%s'",
236
237
238
239
240
241
242
           conn->s, conn->address);
    return;
  } else {
    for( ; pend->next; pend = pend->next) {
      if(pend->next->conn == conn) {
        victim = pend->next;
        pend->next = victim->next;
243
        tor_free(victim);
244
245
246
247
248
249
250
251
252
        log_fn(LOG_DEBUG, "Connection (fd %d) no longer waiting for resolve of '%s'",
               conn->s, conn->address);
        return; /* more are pending */
      }
    }
    assert(0); /* not reachable unless onlyconn not in pending list */
  }
}

253
254
255
256
257
258
259
260
261
262
263
264
265
void assert_connection_edge_not_dns_pending(connection_t *conn) {
  struct pending_connection_t *pend;
  struct cached_resolve *resolve;

  SPLAY_FOREACH(resolve, cache_tree, &cache_root) {
    for(pend = resolve->pending_connections;
        pend;
        pend = pend->next) {
      assert(pend->conn != conn);
    }
  }
}

Roger Dingledine's avatar
Roger Dingledine committed
266
267
/* Cancel all pending connections. Then cancel the resolve itself,
 * and remove the 'struct cached_resolve' from the cache.
268
 */
269
270
void dns_cancel_pending_resolve(char *address) {
  struct pending_connection_t *pend;
271
  struct cached_resolve search;
272
  struct cached_resolve *resolve;
273
  connection_t *pendconn;
274

275
  strncpy(search.address, address, MAX_ADDRESSLEN);
276
  search.address[MAX_ADDRESSLEN-1] = 0;
277
278
279

  resolve = SPLAY_FIND(cache_tree, &cache_root, &search);
  if(!resolve) {
280
    log_fn(LOG_WARN,"Address '%s' is not pending. Dropping.", address);
281
282
283
    return;
  }

284
  assert(resolve->pending_connections);
285

286
287
288
289
  /* mark all pending connections to fail */
  log_fn(LOG_DEBUG, "Failing all connections waiting on DNS resolve of '%s'",
         address);
  while(resolve->pending_connections) {
290
    pend = resolve->pending_connections;
291
292
    /* So that mark_for_close doesn't double-remove the connection. */
    pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED;
293
294
295
    pendconn = pend->conn; /* don't pass complex things to the
                              connection_mark_for_close macro */
    connection_mark_for_close(pendconn, END_STREAM_REASON_MISC);
296
297
    resolve->pending_connections = pend->next;
    tor_free(pend);
298
299
  }

300
301
302
303
304
305
  dns_purge_resolve(resolve);
}

static void dns_purge_resolve(struct cached_resolve *resolve) {
  struct cached_resolve *tmp;

306
307
308
309
310
  /* remove resolve from the linked list */
  if(resolve == oldest_cached_resolve) {
    oldest_cached_resolve = resolve->next;
    if(oldest_cached_resolve == NULL)
      newest_cached_resolve = NULL;
311
  } else {
312
313
314
315
316
317
318
    /* FFFF make it a doubly linked list if this becomes too slow */
    for(tmp=oldest_cached_resolve; tmp && tmp->next != resolve; tmp=tmp->next) ;
    assert(tmp); /* it's got to be in the list, or we screwed up somewhere else */
    tmp->next = resolve->next; /* unlink it */

    if(newest_cached_resolve == resolve)
      newest_cached_resolve = tmp;
319
  }
320
321
322
323

  /* remove resolve from the tree */
  SPLAY_REMOVE(cache_tree, &cache_root, resolve);

324
  tor_free(resolve);
325
326
}

327
static void dns_found_answer(char *address, uint32_t addr, char outcome) {
328
329
330
  struct pending_connection_t *pend;
  struct cached_resolve search;
  struct cached_resolve *resolve;
331
  connection_t *pendconn;
332

333
  strncpy(search.address, address, MAX_ADDRESSLEN);
334
  search.address[MAX_ADDRESSLEN-1] = 0;
335
336
337

  resolve = SPLAY_FIND(cache_tree, &cache_root, &search);
  if(!resolve) {
338
    log_fn(LOG_INFO,"Resolved unasked address '%s'? Dropping.", address);
339
340
    /* XXX Why drop?  Just because we don't care now doesn't mean we shouldn't
     * XXX cache the result for later. */
341
    return;
342
343
  }

344
  if (resolve->state != CACHE_STATE_PENDING) {
345
346
    log_fn(LOG_WARN, "Resolved '%s' which was already resolved; ignoring",
           address);
347
348
349
350
351
352
353
    return;
  }
  /* Removed this assertion: in fact, we'll sometimes get a double answer
   * to the same question.  This can happen when we ask one worker to resolve
   * X.Y.Z., then we cancel the request, and then we ask another worker to
   * resolve X.Y.Z. */
  /* assert(resolve->state == CACHE_STATE_PENDING); */
354

355
  resolve->addr = ntohl(addr);
356
  if(outcome == DNS_RESOLVE_SUCCEEDED)
357
358
359
360
361
362
    resolve->state = CACHE_STATE_VALID;
  else
    resolve->state = CACHE_STATE_FAILED;

  while(resolve->pending_connections) {
    pend = resolve->pending_connections;
363
    assert_connection_ok(pend->conn,time(NULL));
364
    pend->conn->addr = resolve->addr;
365
    if(resolve->state == CACHE_STATE_FAILED) {
366
      /* prevent double-remove */
367
      pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED;
368
369
370
      pendconn = pend->conn; /* don't pass complex things to the
                                connection_mark_for_close macro */
      connection_mark_for_close(pendconn, END_STREAM_REASON_RESOLVEFAILED);
Roger Dingledine's avatar
Roger Dingledine committed
371
    } else {
372
      connection_exit_connect(pend->conn);
Roger Dingledine's avatar
Roger Dingledine committed
373
    }
374
375
    resolve->pending_connections = pend->next;
    tor_free(pend);
376
  }
377
378
379
380

  if(outcome == DNS_RESOLVE_FAILED_TRANSIENT) { /* remove from cache */
    dns_purge_resolve(resolve);
  }
381
382
}

383
384
385
386
387
388
389
390
391
/******************************************************************/

int connection_dns_finished_flushing(connection_t *conn) {
  assert(conn && conn->type == CONN_TYPE_DNSWORKER);
  connection_stop_writing(conn);
  return 0;
}

int connection_dns_process_inbuf(connection_t *conn) {
392
  char success;
393
  uint32_t addr;
394
395
396
397

  assert(conn && conn->type == CONN_TYPE_DNSWORKER);

  if(conn->inbuf_reached_eof) {
398
    log_fn(LOG_WARN,"Read eof. Worker died unexpectedly.");
399
    if(conn->state == DNSWORKER_STATE_BUSY) {
400
      dns_cancel_pending_resolve(conn->address);
Roger Dingledine's avatar
Roger Dingledine committed
401
      num_dnsworkers_busy--;
402
    }
Roger Dingledine's avatar
Roger Dingledine committed
403
    num_dnsworkers--;
404
405
    connection_mark_for_close(conn,0);
    return 0;
406
407
408
  }

  assert(conn->state == DNSWORKER_STATE_BUSY);
409
  if(buf_datalen(conn->inbuf) < 5) /* entire answer available? */
410
    return 0; /* not yet */
411
  assert(buf_datalen(conn->inbuf) == 5);
412

413
414
  connection_fetch_from_buf(&success,1,conn);
  connection_fetch_from_buf((char *)&addr,sizeof(uint32_t),conn);
415

416
417
418
  log_fn(LOG_DEBUG, "DNSWorker (fd %d) returned answer for '%s'",
         conn->s, conn->address);

419
420
421
  assert(success >= DNS_RESOLVE_FAILED_TRANSIENT);
  assert(success <= DNS_RESOLVE_SUCCEEDED);
  dns_found_answer(conn->address, addr, success);
422

423
  tor_free(conn->address);
424
  conn->address = tor_strdup("<idle>");
425
  conn->state = DNSWORKER_STATE_IDLE;
Roger Dingledine's avatar
Roger Dingledine committed
426
  num_dnsworkers_busy--;
427
428
429
430

  return 0;
}

431
int dnsworker_main(void *data) {
432
433
  char address[MAX_ADDRESSLEN];
  unsigned char address_len;
434
  char answer[5];
435
  struct hostent *rent;
436
  int *fdarray = data;
Roger Dingledine's avatar
Roger Dingledine committed
437
  int fd;
438
439
440

  close(fdarray[0]); /* this is the side of the socketpair the parent uses */
  fd = fdarray[1]; /* this side is ours */
441
#ifndef MS_WINDOWS
442
  connection_free_all(); /* so the child doesn't hold the parent's fd's open */
443
#endif
444
445
446

  for(;;) {

447
    if(recv(fd, &address_len, 1, 0) != 1) {
448
      log_fn(LOG_INFO,"dnsworker exiting because tor process died.");
449
      spawn_exit();
450
    }
451
    assert(address_len > 0);
452

453
    if(read_all(fd, address, address_len, 1) != address_len) {
454
      log_fn(LOG_ERR,"read hostname failed. Child exiting.");
455
      spawn_exit();
456
    }
457
    address[address_len] = 0; /* null terminate it */
458

459
    rent = gethostbyname(address);
460
    if (!rent) {
461
462
463
464
465
466
      if(h_errno == TRY_AGAIN) { /* transient error -- don't cache it */
        log_fn(LOG_INFO,"Could not resolve dest addr %s (transient).",address);
        answer[0] = DNS_RESOLVE_FAILED_TRANSIENT;
      } else { /* permanent error, can be cached */
        log_fn(LOG_INFO,"Could not resolve dest addr %s (permanent).",address);
        answer[0] = DNS_RESOLVE_FAILED_PERMANENT;
467
      }
468
      memset(answer+1,0,4);
469
470
    } else {
      assert(rent->h_length == 4); /* break to remind us if we move away from ipv4 */
471
472
      answer[0] = DNS_RESOLVE_SUCCEEDED;
      memcpy(answer+1, rent->h_addr, 4);
473
      log_fn(LOG_INFO,"Resolved address '%s'.",address);
474
    }
475
476
477
478
    if(write_all(fd, answer, 5, 1) != 5) {
      log_fn(LOG_ERR,"writing answer failed. Child exiting.");
      spawn_exit();
    }
479
  }
480
  return 0; /* windows wants this function to return an int */
481
482
}

Roger Dingledine's avatar
Roger Dingledine committed
483
static int spawn_dnsworker(void) {
484
485
486
  int fd[2];
  connection_t *conn;

487
  if(tor_socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) {
488
    log(LOG_ERR, "Couldn't construct socketpair: %s", strerror(errno));
489
490
491
    exit(1);
  }

492
  spawn_func(dnsworker_main, (void*)fd);
Roger Dingledine's avatar
Roger Dingledine committed
493
  log_fn(LOG_DEBUG,"just spawned a worker.");
494
  close(fd[1]); /* we don't need the worker's side of the pipe */
495
496
497

  conn = connection_new(CONN_TYPE_DNSWORKER);

498
  set_socket_nonblocking(fd[0]);
499
500
501

  /* set up conn so it's got all the data we need to remember */
  conn->s = fd[0];
Roger Dingledine's avatar
Roger Dingledine committed
502
  conn->address = tor_strdup("<unused>");
503
504

  if(connection_add(conn) < 0) { /* no space, forget it */
Roger Dingledine's avatar
Roger Dingledine committed
505
    log_fn(LOG_WARN,"connection_add failed. Giving up.");
506
507
508
509
510
511
512
513
514
515
    connection_free(conn); /* this closes fd[0] */
    return -1;
  }

  conn->state = DNSWORKER_STATE_IDLE;
  connection_start_reading(conn);

  return 0; /* success */
}

Roger Dingledine's avatar
Roger Dingledine committed
516
517
static void spawn_enough_dnsworkers(void) {
  int num_dnsworkers_needed; /* aim to have 1 more than needed,
518
                           * but no less than min and no more than max */
519
520
  connection_t *dnsconn;

521
  /* XXX This may not be the best strategy. Maybe we should queue pending
522
523
524
525
526
527
   *     requests until the old ones finish or time out: otherwise, if
   *     the connection requests come fast enough, we never get any DNS done. -NM
   * XXX But if we queue them, then the adversary can pile even more
   *     queries onto us, blocking legitimate requests for even longer.
   *     Maybe we should compromise and only kill if it's been at it for
   *     more than, e.g., 2 seconds. -RD
528
   */
Roger Dingledine's avatar
Roger Dingledine committed
529
  if(num_dnsworkers_busy == MAX_DNSWORKERS) {
530
531
532
    /* We always want at least one worker idle.
     * So find the oldest busy worker and kill it.
     */
533
534
    dnsconn = connection_get_by_type_state_lastwritten(CONN_TYPE_DNSWORKER,
                                                       DNSWORKER_STATE_BUSY);
535
536
    assert(dnsconn);

537
538
    log_fn(LOG_WARN, "%d DNS workers are spawned; all are busy. Killing one.",
           MAX_DNSWORKERS);
539

540
    connection_mark_for_close(dnsconn,0);
Roger Dingledine's avatar
Roger Dingledine committed
541
    num_dnsworkers_busy--;
542
    num_dnsworkers--;
543
  }
544

Roger Dingledine's avatar
Roger Dingledine committed
545
546
  if(num_dnsworkers_busy >= MIN_DNSWORKERS)
    num_dnsworkers_needed = num_dnsworkers_busy+1;
547
  else
Roger Dingledine's avatar
Roger Dingledine committed
548
    num_dnsworkers_needed = MIN_DNSWORKERS;
549

Roger Dingledine's avatar
Roger Dingledine committed
550
551
  while(num_dnsworkers < num_dnsworkers_needed) {
    if(spawn_dnsworker() < 0) {
Roger Dingledine's avatar
Roger Dingledine committed
552
      log(LOG_WARN,"spawn_enough_dnsworkers(): spawn failed!");
553
554
      return;
    }
Roger Dingledine's avatar
Roger Dingledine committed
555
    num_dnsworkers++;
556
557
  }

558
  while(num_dnsworkers > num_dnsworkers_busy+MAX_IDLE_DNSWORKERS) { /* too many idle? */
559
    /* cull excess workers */
560
561
    log_fn(LOG_WARN,"%d of %d dnsworkers are idle. Killing one.",
           num_dnsworkers-num_dnsworkers_needed, num_dnsworkers);
562
563
    dnsconn = connection_get_by_type_state(CONN_TYPE_DNSWORKER, DNSWORKER_STATE_IDLE);
    assert(dnsconn);
564
    connection_mark_for_close(dnsconn,0);
Roger Dingledine's avatar
Roger Dingledine committed
565
    num_dnsworkers--;
566
  }
567
568
}

569
570
571
572
573
574
575
/*
  Local Variables:
  mode:c
  indent-tabs-mode:nil
  c-basic-offset:2
  End:
*/