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

13
14
#define MAX_ADDRESSLEN 256

15
16
#define MAX_DNSWORKERS 50
#define MIN_DNSWORKERS 3
17
#define MAX_IDLE_DNSWORKERS 10
18

19
20
21
22
#define DNS_RESOLVE_FAILED_TRANSIENT 1
#define DNS_RESOLVE_FAILED_PERMANENT 2
#define DNS_RESOLVE_SUCCEEDED 3

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

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

struct cached_resolve {
  SPLAY_ENTRY(cached_resolve) node;
33
34
  char address[MAX_ADDRESSLEN]; /* the hostname to be resolved */
  uint32_t addr; /* in host order. I know I'm horrible for assuming ipv4 */
35
36
37
38
39
40
41
42
43
  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;
};

44
45
46
47
48
49
50
51
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);

52
static SPLAY_HEAD(cache_tree, cached_resolve) cache_root;
53

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

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

63
static void init_cache_tree(void) {
64
65
66
  SPLAY_INIT(&cache_root);
}

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

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

75
76
77
78
79
80
81
82
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;
83
    log(LOG_DEBUG,"Forgetting old cached resolve (expires %lu)", (unsigned long)resolve->expire);
84
85
86
87
88
89
    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.
       */
    }
90
91
92
93
    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);
94
    tor_free(resolve);
95
96
97
  }
}

98
/* See if we have a cache entry for 'exitconn->address'. if so,
99
100
 * if resolve valid, put it into exitconn->addr and return 1.
 * If resolve failed, return -1.
101
102
103
104
105
106
107
108
109
 *
 * 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
110
  struct cached_resolve search;
111
  struct pending_connection_t *pending_connection;
112
  struct in_addr in;
113
  uint32_t now = time(NULL);
114
  assert_connection_ok(exitconn, 0);
115

116
117
118
119
120
121
122
123
  /* 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;
    }
124
125
126
127
  }

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

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

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

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

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

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

186
  dnsconn = connection_get_by_type_state(CONN_TYPE_DNSWORKER, DNSWORKER_STATE_IDLE);
187
188

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

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

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

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

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

210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
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;
232
    tor_free(pend);
233
    log_fn(LOG_DEBUG, "First connection (fd %d) no longer waiting for resolve of '%s'",
234
235
236
237
238
239
240
           conn->s, conn->address);
    return;
  } else {
    for( ; pend->next; pend = pend->next) {
      if(pend->next->conn == conn) {
        victim = pend->next;
        pend->next = victim->next;
241
        tor_free(victim);
242
243
244
245
246
247
248
249
250
        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 */
  }
}

251
252
253
254
255
256
257
258
259
260
261
262
263
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
264
265
/* Cancel all pending connections. Then cancel the resolve itself,
 * and remove the 'struct cached_resolve' from the cache.
266
 */
267
268
void dns_cancel_pending_resolve(char *address) {
  struct pending_connection_t *pend;
269
  struct cached_resolve search;
270
  struct cached_resolve *resolve;
271
  connection_t *pendconn;
272

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

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

282
  assert(resolve->pending_connections);
283

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

298
299
300
301
302
303
  dns_purge_resolve(resolve);
}

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

304
305
306
307
308
  /* 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;
309
  } else {
310
311
312
313
314
315
316
    /* 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;
317
  }
318
319
320
321

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

322
  tor_free(resolve);
323
324
}

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

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

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

342
  if (resolve->state != CACHE_STATE_PENDING) {
343
344
    log_fn(LOG_WARN, "Resolved '%s' which was already resolved; ignoring",
           address);
345
346
347
348
349
350
351
    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); */
352

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

  while(resolve->pending_connections) {
    pend = resolve->pending_connections;
361
    assert_connection_ok(pend->conn,time(NULL));
362
    pend->conn->addr = resolve->addr;
363
    if(resolve->state == CACHE_STATE_FAILED) {
364
365
      /* prevent double-remove */
      pend->conn->state = EXIT_CONN_STATE_RESOLVEFAILED; 
366
367
368
      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
369
    } else {
370
      connection_exit_connect(pend->conn);
Roger Dingledine's avatar
Roger Dingledine committed
371
    }
372
373
    resolve->pending_connections = pend->next;
    tor_free(pend);
374
  }
375
376
377
378

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

381
382
383
384
385
386
387
388
389
/******************************************************************/

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) {
390
  char success;
391
  uint32_t addr;
392
393
394
395

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

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

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

411
412
  connection_fetch_from_buf(&success,1,conn);
  connection_fetch_from_buf((char *)&addr,sizeof(uint32_t),conn);
413

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

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

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

  return 0;
}

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

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

  for(;;) {

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

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

457
    rent = gethostbyname(address);
458
    if (!rent) {
459
460
461
462
463
464
      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;
465
      }
466
      memset(answer+1,0,4);
467
468
    } else {
      assert(rent->h_length == 4); /* break to remind us if we move away from ipv4 */
469
470
      answer[0] = DNS_RESOLVE_SUCCEEDED;
      memcpy(answer+1, rent->h_addr, 4);
471
      log_fn(LOG_INFO,"Resolved address '%s'.",address);
472
    }
473
474
475
476
    if(write_all(fd, answer, 5, 1) != 5) {
      log_fn(LOG_ERR,"writing answer failed. Child exiting.");
      spawn_exit();
    }
477
  }
478
  return 0; /* windows wants this function to return an int */
479
480
}

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

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

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

  conn = connection_new(CONN_TYPE_DNSWORKER);

496
  set_socket_nonblocking(fd[0]);
497
498
499

  /* 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
500
  conn->address = tor_strdup("<unused>");
501
502

  if(connection_add(conn) < 0) { /* no space, forget it */
Roger Dingledine's avatar
Roger Dingledine committed
503
    log_fn(LOG_WARN,"connection_add failed. Giving up.");
504
505
506
507
508
509
510
511
512
513
    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
514
515
static void spawn_enough_dnsworkers(void) {
  int num_dnsworkers_needed; /* aim to have 1 more than needed,
516
                           * but no less than min and no more than max */
517
518
  connection_t *dnsconn;

519
  /* XXX This may not be the best strategy. Maybe we should queue pending
520
521
522
523
524
525
   *     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
526
   */
Roger Dingledine's avatar
Roger Dingledine committed
527
  if(num_dnsworkers_busy == MAX_DNSWORKERS) {
528
529
530
    /* We always want at least one worker idle.
     * So find the oldest busy worker and kill it.
     */
531
532
    dnsconn = connection_get_by_type_state_lastwritten(CONN_TYPE_DNSWORKER,
                                                       DNSWORKER_STATE_BUSY);
533
534
    assert(dnsconn);

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

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

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

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

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

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