Differences From Artifact [1f222a13ca]:
- File
src/OFDNSResolver.m
— part of check-in
[ce2b268163]
at
2023-04-17 11:56:02
on branch trunk
— Always make DNS names lowercase
This avoids problems when comparing them. (user: js, size: 32863) [annotate] [blame] [check-ins using] [more...]
To Artifact [8da319df43]:
- File src/OFDNSResolver.m — part of check-in [252f11c431] at 2023-12-29 15:53:23 on branch trunk — OFDNSResolver: Cache responses (user: js, size: 34101) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
462 463 464 465 466 467 468 469 470 471 472 473 474 475 |
while ((array = [objectEnumerator nextObject]) != nil)
[array makeImmutable];
[ret makeImmutable];
return ret;
}
@implementation OFDNSResolverContext
- (instancetype)initWithQuery: (OFDNSQuery *)query
ID: (OFNumber *)ID
settings: (OFDNSResolverSettings *)settings
delegate: (id <OFDNSResolverQueryDelegate>)delegate
{
| > > > > > > > > > > > > > > | 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 |
while ((array = [objectEnumerator nextObject]) != nil)
[array makeImmutable];
[ret makeImmutable];
return ret;
}
static bool
containsExpiredRecord(OFDNSResponseRecords responseRecords, uint32_t age)
{
OFEnumerator *enumerator = [responseRecords objectEnumerator];
OFArray OF_GENERIC(OFDNSResourceRecord *) *records;
while ((records = [enumerator nextObject]) != nil)
for (OFDNSResourceRecord *record in records)
if (record.TTL < age)
return true;
return false;
}
@implementation OFDNSResolverContext
- (instancetype)initWithQuery: (OFDNSQuery *)query
ID: (OFNumber *)ID
settings: (OFDNSResolverSettings *)settings
delegate: (id <OFDNSResolverQueryDelegate>)delegate
{
|
| ︙ | ︙ | |||
574 575 576 577 578 579 580 581 582 583 584 585 586 587 |
{
self = [super init];
@try {
_settings = [[OFDNSResolverSettings alloc] init];
_queries = [[OFMutableDictionary alloc] init];
_TCPQueries = [[OFMutableDictionary alloc] init];
[_settings reload];
} @catch (id e) {
[self release];
@throw e;
}
| > | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 |
{
self = [super init];
@try {
_settings = [[OFDNSResolverSettings alloc] init];
_queries = [[OFMutableDictionary alloc] init];
_TCPQueries = [[OFMutableDictionary alloc] init];
_cache = [[OFMutableDictionary alloc] init];
[_settings reload];
} @catch (id e) {
[self release];
@throw e;
}
|
| ︙ | ︙ | |||
597 598 599 600 601 602 603 604 605 606 607 608 609 610 |
[_IPv4Socket release];
#ifdef OF_HAVE_IPV6
[_IPv6Socket cancelAsyncRequests];
[_IPv6Socket release];
#endif
[_queries release];
[_TCPQueries release];
[super dealloc];
}
- (OFDictionary *)staticHosts
{
return _settings->_staticHosts;
| > | 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 |
[_IPv4Socket release];
#ifdef OF_HAVE_IPV6
[_IPv6Socket cancelAsyncRequests];
[_IPv6Socket release];
#endif
[_queries release];
[_TCPQueries release];
[_cache release];
[super dealloc];
}
- (OFDictionary *)staticHosts
{
return _settings->_staticHosts;
|
| ︙ | ︙ | |||
800 801 802 803 804 805 806 807 808 809 810 811 812 813 |
- (void)asyncPerformQuery: (OFDNSQuery *)query
runLoopMode: (OFRunLoopMode)runLoopMode
delegate: (id <OFDNSResolverQueryDelegate>)delegate
{
void *pool = objc_autoreleasePoolPush();
OFNumber *ID;
OFDNSResolverContext *context;
/* Random, unused ID */
do {
ID = [OFNumber numberWithUnsignedShort: OFRandom16()];
} while ([_queries objectForKey: ID] != nil);
if (query.domainName.UTF8StringLength > 253)
| > > > > > > > > > > > > > > > > > > > | 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 |
- (void)asyncPerformQuery: (OFDNSQuery *)query
runLoopMode: (OFRunLoopMode)runLoopMode
delegate: (id <OFDNSResolverQueryDelegate>)delegate
{
void *pool = objc_autoreleasePoolPush();
OFNumber *ID;
OFDNSResolverContext *context;
OFPair OF_GENERIC(OFDate *, OFDNSResponse *) *cacheEntry;
if ((cacheEntry = [_cache objectForKey: query]) != nil) {
uint32_t age =
(uint32_t)-[cacheEntry.firstObject timeIntervalSinceNow];
OFDNSResponse *response = cacheEntry.secondObject;
if (!containsExpiredRecord(response.answerRecords, age) &&
!containsExpiredRecord(response.authorityRecords, age) &&
!containsExpiredRecord(response.additionalRecords, age)) {
[delegate resolver: self
didPerformQuery: query
response: response
exception: nil];
objc_autoreleasePoolPop(pool);
return;
}
}
/* Random, unused ID */
do {
ID = [OFNumber numberWithUnsignedShort: OFRandom16()];
} while ([_queries objectForKey: ID] != nil);
if (query.domainName.UTF8StringLength > 253)
|
| ︙ | ︙ | |||
1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 |
} @catch (id e) {
exception = e;
}
if (exception != nil)
response = nil;
[context->_delegate resolver: self
didPerformQuery: context->_query
response: response
exception: exception];
return false;
}
| > > > > > > > | 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 |
} @catch (id e) {
exception = e;
}
if (exception != nil)
response = nil;
if (response != nil)
[_cache setObject: [OFPair pairWithFirstObject: [OFDate date]
secondObject: response]
forKey: context->_query];
else
[_cache removeObjectForKey: context->_query];
[context->_delegate resolver: self
didPerformQuery: context->_query
response: response
exception: exception];
return false;
}
|
| ︙ | ︙ |