Overview
| Comment: | OFDNSResolver: Try all available name servers |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
56f80f9e5a119ce8757fbefcabd1012f |
| User & Date: | js on 2018-08-11 20:10:23 |
| Other Links: | manifest | tags |
Context
|
2018-08-11
| ||
| 20:25 | Add +[OFThread DNSResolver] check-in: 2fb0769744 user: js tags: trunk | |
| 20:10 | OFDNSResolver: Try all available name servers check-in: 56f80f9e5a user: js tags: trunk | |
| 14:34 | Fix compilation with --disable-sockets check-in: 4cb7e95aa5 user: js tags: trunk | |
Changes
Modified src/OFDNSResolver.m from [9632f6597d] to [f4753b6d8f].
| ︙ | ︙ | |||
58 59 60 61 62 63 64 | #define TIMEOUT 2 /* * TODO: * * - Resolve with each search domain | < | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 |
#define TIMEOUT 2
/*
* TODO:
*
* - Resolve with each search domain
* - Fallback to TCP
*/
@interface OFDNSResolverQuery: OFObject
{
OFString *_host;
of_dns_resource_record_class_t _recordClass;
|
| ︙ | ︙ | |||
1039 1040 1041 1042 1043 1044 1045 | } callback(target, selector, answers, [query context], nil); return false; } | | < > > > > > > | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 |
}
callback(target, selector, answers, [query context], nil);
return false;
}
- (void)of_queryWithIDTimedOut: (OFDNSResolverQuery *)query
{
id target;
SEL selector;
void (*callback)(id, SEL, OFArray *, id, id);
OFResolveHostFailedException *exception;
if (query == nil)
return;
if ([query nameServersIndex] + 1 < [[query nameServers] count]) {
[query setNameServersIndex: [query nameServersIndex] + 1];
[self of_sendQuery: query];
return;
}
target = [[[query target] retain] autorelease];
selector = [query selector];
callback = (void (*)(id, SEL, OFArray *, id, id))
[target methodForSelector: selector];
exception = [OFResolveHostFailedException
|
| ︙ | ︙ | |||
1097 1098 1099 1100 1101 1102 1103 | selector: @selector(of_socket:didReceiveIntoBuffer: length:sender:context:exception:) context: nil]; return 0; } | < < < < < < < < < < < < | < < < < < < < < < < | < < < < < | < < < < < < < < < < < < < < < < < < | | | 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 |
selector: @selector(of_socket:didReceiveIntoBuffer:
length:sender:context:exception:)
context: nil];
return 0;
}
- (void)of_sendQuery: (OFDNSResolverQuery *)query
{
of_socket_address_t address;
OFUDPSocket *sock;
[[query cancelTimer] invalidate];
[query setCancelTimer: [OFTimer
scheduledTimerWithTimeInterval: TIMEOUT
target: self
selector: @selector(of_queryWithIDTimedOut:)
object: query
repeats: false]];
address = of_socket_address_parse_ip(
[[query nameServers] objectAtIndex: [query nameServersIndex]], 53);
switch (address.family) {
#ifdef OF_HAVE_IPV6
case OF_SOCKET_ADDRESS_FAMILY_IPV6:
if (_IPv6Socket == nil) {
_IPv6Socket = [[OFUDPSocket alloc] init];
[_IPv6Socket bindToHost: @"::"
|
| ︙ | ︙ | |||
1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 |
[sock asyncSendBuffer: [[query queryData] items]
length: [[query queryData] count]
receiver: address
target: self
selector: @selector(of_socket:didSendBuffer:bytesSent:
receiver:context:exception:)
context: query];
objc_autoreleasePoolPop(pool);
}
- (void)close
{
void *pool = objc_autoreleasePoolPush();
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 |
[sock asyncSendBuffer: [[query queryData] items]
length: [[query queryData] count]
receiver: address
target: self
selector: @selector(of_socket:didSendBuffer:bytesSent:
receiver:context:exception:)
context: query];
}
- (void)asyncResolveHost: (OFString *)host
target: (id)target
selector: (SEL)selector
context: (id)context
{
[self asyncResolveHost: host
recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN
recordType: OF_DNS_RESOURCE_RECORD_TYPE_ALL
target: target
selector: selector
context: context];
}
- (void)asyncResolveHost: (OFString *)host
recordClass: (of_dns_resource_record_class_t)recordClass
recordType: (of_dns_resource_record_type_t)recordType
target: (id)target
selector: (SEL)selector
context: (id)context
{
void *pool = objc_autoreleasePoolPush();
OFNumber *ID;
OFDNSResolverQuery *query;
/* TODO: Properly try all search domains */
if (![host hasSuffix: @"."])
host = [host stringByAppendingString: @"."];
if ([host UTF8StringLength] > 253)
@throw [OFOutOfRangeException exception];
/* Random, unused ID */
do {
ID = [OFNumber numberWithUInt16: (uint16_t)of_random()];
} while ([_queries objectForKey: ID] != nil);
query = [[[OFDNSResolverQuery alloc]
initWithHost: host
recordClass: recordClass
recordType: recordType
ID: ID
nameServers: _nameServers
searchDomains: _searchDomains
target: target
selector: selector
context: context] autorelease];
[_queries setObject: query
forKey: ID];
[self of_sendQuery: query];
objc_autoreleasePoolPop(pool);
}
- (void)close
{
void *pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ |