1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
|
/* Copyright 2003 Roger Dingledine. */
/* See LICENSE for licensing information */
/* $Id$ */
#include "or.h"
#define MAX_ADDRESSLEN 256
#define MAX_DNSSLAVES 50
#define MIN_DNSSLAVES 3 /* 1 for the tor process, 3 slaves */
struct slave_data_t {
int fd; /* socket to talk on */
int num_processed; /* number of times we've used this slave */
char busy; /* whether this slave currently has a task */
char question[MAX_ADDRESSLEN]; /* the hostname that we're resolving */
unsigned char question_len; /* how many bytes in question */
char answer[MAX_ADDRESSLEN]; /* the answer to the question */
unsigned char answer_len; /* how many bytes in answer */
};
struct slave_data_t slave_data[MAX_DNSSLAVES+1];
struct pollfd poll_data[MAX_DNSSLAVES+1];
static int dns_spawn_slave(void);
static int dns_read_block(int fd, char *string, unsigned char *len);
static int dns_write_block(int fd, char *string, unsigned char len);
static int dns_read_tor_question(int index);
static int dns_read_slave_response(int index);
static int dns_find_idle_slave(int max);
static int dns_assign_to_slave(int from, int to);
static int dns_master_to_tor(int from, int to);
static void dns_master_main(int fd);
static int dns_tor_to_master(connection_t *exitconn);
static int dns_found_answer(char *question, uint32_t answer, uint32_t valid);
int connection_dns_finished_flushing(connection_t *conn) {
assert(conn && conn->type == CONN_TYPE_DNSMASTER);
connection_stop_writing(conn);
return 0;
}
int connection_dns_process_inbuf(connection_t *conn) {
unsigned char length;
char buf[MAX_ADDRESSLEN];
char *question;
uint32_t answer;
assert(conn && conn->type == CONN_TYPE_DNSMASTER);
assert(conn->state == DNSMASTER_STATE_OPEN);
if(conn->inbuf_reached_eof) {
log(LOG_ERR,"connection_dns_process_inbuf(): Read eof. No more dnsmaster!");
return -1;
}
assert(conn->inbuf);
if(conn->inbuf_datalen <= 0)
return 0;
/* peek into the inbuf, so we can check if it's all here */
length = *conn->inbuf; /* warning: abstraction violation :( */
assert(length < 240);
if(conn->inbuf_datalen < 1+length) { /* entire answer available? */
log(LOG_INFO,"connection_dns_process_inbuf(): %d available, waiting for %d.", conn->inbuf_datalen, length+1);
return 0; /* not yet */
}
if(connection_fetch_from_buf(buf,1+length,conn) < 0) {
log(LOG_ERR,"connection_dns_process_inbuf(): Broken inbuf. No more dnsmaster!");
return -1;
}
question = buf+1;
log(LOG_DEBUG,"connection_dns_process_inbuf(): length %d, question '%s', strlen question %d", length, question, strlen(question));
assert(length == 4 + strlen(question) + 1);
answer = *(uint32_t *)(buf+1+length-4);
dns_found_answer(question, answer, (answer != 0));
return connection_process_inbuf(conn); /* process the remainder of the buffer */
}
/* return -1 if error, else the fd that can talk to the dns master */
int dns_master_start(void) {
connection_t *conn;
pid_t pid;
int fd[2];
if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) {
log(LOG_ERR,"dns_master_start(): socketpair failed.");
return -1;
}
pid = fork();
if(pid < 0) {
log(LOG_ERR,"dns_master_start(): fork failed.");
return -1;
}
if(pid == 0) { /* i'm the child */
log(LOG_DEBUG,"dns_master_start(): child says fd0 %d, fd1 %d.", fd[0], fd[1]);
close(fd[0]);
dns_master_main(fd[1]);
assert(0); /* never gets here */
}
/* i'm the parent */
close(fd[1]);
fcntl(fd[0], F_SETFL, O_NONBLOCK); /* set s to non-blocking */
conn = connection_new(CONN_TYPE_DNSMASTER);
if(!conn) {
log(LOG_INFO,"dns_master_start(): connection_new failed. Giving up.");
/* XXX tell the dnsmaster to die */
return -1;
}
conn->s = fd[0];
conn->address = strdup("localhost");
conn->receiver_bucket = -1; /* edge connections don't do receiver buckets */
conn->bandwidth = -1;
if(connection_add(conn) < 0) { /* no space, forget it */
log(LOG_INFO,"dns_master_start(): connection_add failed. Giving up.");
connection_free(conn);
/* XXX tell the dnsmaster to die */
return -1;
}
conn->state = DNSMASTER_STATE_OPEN;
connection_start_reading(conn);
log(LOG_INFO,"dns_master_start(): dns handler is spawned.");
return fd[0];
}
static void dns_slave_main(int fd) {
char question[MAX_ADDRESSLEN];
unsigned char question_len;
struct hostent *rent;
for(;;) {
if(dns_read_block(fd, question, &question_len) < 0) { /* the master wants us to die */
log(LOG_INFO,"dns_slave_main(): eof on read from master. Exiting.");
exit(0);
}
rent = gethostbyname(question);
if (!rent) {
log(LOG_INFO,"dns_slave_main(): Could not resolve dest addr %s. Returning nulls.",question);
if(dns_write_block(fd, "\0\0\0\0", 4) < 0) {
log(LOG_INFO,"dns_slave_main(): writing to master failed. Exiting.");
exit(0);
}
} else {
if(dns_write_block(fd, rent->h_addr, rent->h_length) < 0) {
log(LOG_INFO,"dns_slave_main(): writing to master failed. Exiting.");
exit(0);
}
log(LOG_INFO,"dns_slave_main(): Answered question '%s'.",question);
}
}
}
static int dns_spawn_slave(void) {
pid_t pid;
int fd[2];
if(socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) {
perror("socketpair");
exit(1);
}
pid = fork();
if(pid < 0) {
perror("fork");
exit(1);
}
if(pid == 0) { /* i'm the child */
close(fd[0]);
dns_slave_main(fd[1]);
assert(0); /* never gets here */
}
/* i'm the parent */
log(LOG_INFO,"dns_spawn_slave(): just spawned a slave."); // XXX change to debug
close(fd[1]);
return fd[0];
}
/* read a first byte from fd, put it into *len. Then read *len
* bytes from fd and put it into string.
* Return -1 if eof or read error or bad len, else return 0.
*/
int dns_read_block(int fd, char *string, unsigned char *len) {
int read_result;
log(LOG_DEBUG,"dns_read_block(): Calling read to learn length (fd %d).", fd);
read_result = read(fd, len, 1);
log(LOG_DEBUG,"dns_read_block(): read finished, returned %d", read_result);
if (read_result < 0) {
log(LOG_INFO,"dns_read_block(): read len returned error");
return -1;
} else if (read_result == 0) {
log(LOG_INFO,"dns_read_block(): Encountered eof reading len");
return -1;
} else if (*len <= 0) {
log(LOG_INFO,"dns_read_block(): len not >0");
return -1;
}
log(LOG_DEBUG,"dns_read_block(): Calling read to get string, length %u.", *len);
read_result = read(fd, string, *len);
if (read_result < 0) {
log(LOG_INFO,"dns_read_block(): read string returned error");
return -1;
} else if (read_result == 0) {
log(LOG_INFO,"dns_read_block(): Encountered eof reading string");
return -1;
}
string[*len] = 0; /* null terminate it, just in case */
// log(LOG_INFO,"dns_read_block(): Read '%s', len %u.",string,*len);
return 0;
}
/* write ("%c%s", string, len) onto fd */
static int dns_write_block(int fd, char *string, unsigned char len) {
int write_result;
int written=0;
char tmp[257];
assert(len <= 250);
tmp[0] = len;
memcpy(tmp+1, string, len);
log(LOG_DEBUG,"dns_write_block(): writing length %u, fd %d.", len, fd);
while(written < len+1) {
write_result = write(fd, tmp, len+1-written);
if (write_result < 0) {
return -1;
}
written += write_result;
}
return 0;
}
/* pull in question. block until we've read everything.
* return -1 if eof. */
static int dns_read_tor_question(int index) {
log(LOG_DEBUG,"dns_read_tor_question(): Pulling question from tor");
if(dns_read_block(slave_data[index].fd,
slave_data[index].question,
&slave_data[index].question_len) < 0)
return -1;
// log(LOG_INFO,"dns_read_tor_question(): Read question '%s'",slave_data[index].question);
return 0;
}
/* pull in answer. block until we've read it. return -1 if eof. */
static int dns_read_slave_response(int index) {
if(dns_read_block(slave_data[index].fd,
slave_data[index].answer,
&slave_data[index].answer_len) < 0)
return -1;
return 0;
}
static int dns_find_idle_slave(int max) {
int i;
for(i=1;i<max;i++)
if(slave_data[i].busy == 0) {
log(LOG_DEBUG,"dns_find_idle_slave(): slave %d is chosen.",i);
return i;
}
assert(0); /* should never get here */
return 0;
}
static int dns_assign_to_slave(int from, int to) {
slave_data[to].question_len = slave_data[from].question_len;
memcpy(slave_data[to].question, slave_data[from].question, slave_data[from].question_len);
// slave_data[from].question_len = 0;
log(LOG_DEBUG,"dns_assign_to_slave(): from index %d to %d (writing fd %d)",from,to,slave_data[to].fd);
if(dns_write_block(slave_data[to].fd,
slave_data[to].question,
slave_data[to].question_len) < 0) {
log(LOG_INFO,"dns_assign_to_slave(): writing to slave failed.");
return -1;
}
return 0;
}
static int dns_master_to_tor(int from, int to) {
char tmp[MAX_ADDRESSLEN*2];
unsigned char len;
len = slave_data[from].question_len+1+slave_data[from].answer_len;
memcpy(tmp, slave_data[from].question, slave_data[from].question_len);
tmp[slave_data[from].question_len] = 0; /* null terminate it */
memcpy(tmp+1+slave_data[from].question_len, slave_data[from].answer, slave_data[from].answer_len);
log(LOG_DEBUG,"dns_master_to_tor(): question is '%s', length %d",slave_data[from].question,slave_data[from].question_len);
log(LOG_DEBUG,"dns_master_to_tor(): answer is %d %d %d %d",
slave_data[from].answer[0],
slave_data[from].answer[1],
slave_data[from].answer[2],
slave_data[from].answer[3]);
assert(slave_data[from].answer_len == 4);
if(dns_write_block(slave_data[to].fd, tmp, len) < 0) {
log(LOG_INFO,"dns_master_to_tor(): writing to tor failed.");
return -1;
}
return 0;
}
static void dns_master_main(int fd) {
int nfds=1; /* the 0th index is the tor process, the rest are slaves */
int num_slaves_busy=0;
int num_slaves_needed = MIN_DNSSLAVES;
int poll_result, idle, i;
poll_data[0].fd = slave_data[0].fd = fd;
poll_data[0].events = POLLIN;
for(;;) { /* loop forever */
assert(num_slaves_needed < MAX_DNSSLAVES);
while(nfds-1 < num_slaves_needed) {
/* add another slave. */
i = nfds;
memset(&slave_data[i], 0, sizeof(struct slave_data_t));
memset(&poll_data[i], 0, sizeof(struct pollfd));
slave_data[i].fd = poll_data[i].fd = dns_spawn_slave();
poll_data[i].events = POLLIN; /* listen always, to prevent accidental deadlock */
nfds++;
}
/* XXX later, decide on a timeout value, to catch wedged slaves */
poll_result = poll(poll_data, nfds, -1);
log(LOG_DEBUG,"dns_master_main(): Poll returned -- activity!");
for(i=0;i<nfds;i++) {
if(poll_data[i].revents & POLLIN) {
if(i==0) { /* note that we read only one question per poll loop */
if(dns_read_tor_question(i) >= 0) {
while(1) {
idle = dns_find_idle_slave(nfds);
if(dns_assign_to_slave(i, idle) >= 0)
break; /* successfully assigned to one */
/* XXX slave must die, recalc num slaves and num busy */
}
num_slaves_busy++;
} else { /* error */
log(LOG_INFO,"dns_master_main(): dns_read_tor_question failed. Master dying.");
exit(1);
}
} else {
if(dns_read_slave_response(i) >= 0) {
if(dns_master_to_tor(i, 0) < 0) {
log(LOG_INFO,"dns_master_main(): dns_master_to_tor failed. Master dying.");
exit(1);
}
slave_data[i].busy = 0;
num_slaves_busy--;
poll_data[0].events = POLLIN; /* resume reading from tor if we'd stopped */
} else { /* error */
log(LOG_INFO,"dns_master_main(): dns_read_slave_response failed. Leaving slave stranded (FIXME)");
}
}
}
}
log(LOG_DEBUG,"dns_master_main(): Finished looping over fd's.");
if(num_slaves_busy >= num_slaves_needed) {
if(num_slaves_needed == MAX_DNSSLAVES-1)
poll_data[0].events = 0; /* stop reading from tor */
else
num_slaves_needed++;
}
}
assert(0); /* should never get here */
}
#include "tree.h"
struct pending_connection_t {
struct connection_t *conn;
struct pending_connection_t *next;
};
struct cached_resolve {
SPLAY_ENTRY(cached_resolve) node;
char question[MAX_ADDRESSLEN]; /* the hostname to be resolved */
uint32_t answer; /* in host order. I know I'm horrible for assuming ipv4 */
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;
};
SPLAY_HEAD(cache_tree, cached_resolve) cache_root;
static int compare_cached_resolves(struct cached_resolve *a, struct cached_resolve *b) {
/* make this smarter one day? */
return strncasecmp(a->question, b->question, MAX_ADDRESSLEN);
}
SPLAY_PROTOTYPE(cache_tree, cached_resolve, node, compare_cached_resolves);
SPLAY_GENERATE(cache_tree, cached_resolve, node, compare_cached_resolves);
void init_cache_tree(void) {
SPLAY_INIT(&cache_root);
}
/* see if the question 'exitconn->address' has been answered. if so,
* if resolve valid, put it into exitconn->addr and call
* connection_exit_connect directly. If resolve failed, return -1.
*
* 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;
struct cached_resolve search;
struct pending_connection_t *pending_connection;
strncpy(search.question, exitconn->address, MAX_ADDRESSLEN);
/* check the tree to see if 'question' is already there. */
resolve = SPLAY_FIND(cache_tree, &cache_root, &search);
if(resolve) { /* already there */
switch(resolve->state) {
case CACHE_STATE_PENDING:
/* 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;
return 0;
case CACHE_STATE_VALID:
exitconn->addr = resolve->answer;
return connection_exit_connect(exitconn);
case CACHE_STATE_FAILED:
return -1;
}
} else { /* need to add it */
resolve = tor_malloc(sizeof(struct cached_resolve));
memset(resolve, 0, sizeof(struct cached_resolve));
resolve->state = CACHE_STATE_PENDING;
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;
SPLAY_INSERT(cache_tree, &cache_root, resolve);
return dns_tor_to_master(exitconn);
}
assert(0);
return 0; /* not reached; keep gcc happy */
}
static int dns_tor_to_master(connection_t *exitconn) {
connection_t *dnsconn;
unsigned char len;
int do_dns_directly=0;
dnsconn = connection_get_by_type(CONN_TYPE_DNSMASTER);
if(!dnsconn) {
log(LOG_ERR,"dns_tor_to_master(): dns master nowhere to be found!");
}
if(!dnsconn || do_dns_directly) {
/* new version which does it all right here */
struct hostent *rent;
rent = gethostbyname(exitconn->address);
if (!rent) {
return dns_found_answer(exitconn->address, 0, 0);
}
return dns_found_answer(exitconn->address, *(uint32_t *)rent->h_addr, 1);
}
len = strlen(exitconn->address);
if(connection_write_to_buf(&len, 1, dnsconn) < 0) {
log(LOG_DEBUG,"dns_tor_to_master(): Couldn't write length.");
return -1;
}
if(connection_write_to_buf(exitconn->address, len, dnsconn) < 0) {
log(LOG_DEBUG,"dns_tor_to_master(): Couldn't write address.");
return -1;
}
// log(LOG_DEBUG,"dns_tor_to_master(): submitted '%s'", address);
return 0;
}
static int dns_found_answer(char *question, uint32_t answer, uint32_t valid) {
struct pending_connection_t *pend;
struct cached_resolve search;
struct cached_resolve *resolve;
strncpy(search.question, question, MAX_ADDRESSLEN);
resolve = SPLAY_FIND(cache_tree, &cache_root, &search);
if(!resolve) {
log(LOG_ERR,"dns_found_answer(): Answer to unasked question '%s'? Dropping.", question);
return 0;
}
// assert(resolve->state == CACHE_STATE_PENDING);
/* XXX this is a bug which hasn't been found yet. Probably something
* about slaves answering questions when they're not supposed to, and
* reusing the old question.
*/
if(resolve->state != CACHE_STATE_PENDING) {
log(LOG_ERR,"dns_found_answer(): BUG: resolve '%s' in state %d (not pending). Dropping.",question, resolve->state);
return 0;
}
resolve->answer = ntohl(answer);
if(valid)
resolve->state = CACHE_STATE_VALID;
else
resolve->state = CACHE_STATE_FAILED;
while(resolve->pending_connections) {
pend = resolve->pending_connections;
pend->conn->addr = resolve->answer;
if(resolve->state == CACHE_STATE_FAILED || connection_exit_connect(pend->conn) < 0) {
pend->conn->marked_for_close = 1;
}
resolve->pending_connections = pend->next;
free(pend);
}
return 0;
}
/*
Local Variables:
mode:c
indent-tabs-mode:nil
c-basic-offset:2
End:
*/
|