Differences From Artifact [411a1eb381]:
- File
src/OFDNSResolver.m
— part of check-in
[0f3ae90eef]
at
2018-12-18 21:17:28
on branch trunk
— Use OFData instead of a buffer for async UDP sends
This avoids the entire problem of keeping the buffer alive until the
send finished. (user: js, size: 60148) [annotate] [blame] [check-ins using]
To Artifact [2001e1cd19]:
- File
src/OFDNSResolver.m
— part of check-in
[0afb04d93c]
at
2018-12-22 00:29:42
on branch trunk
— OFDNSResolver: Use a delegate for async operations
Because there is usually only one resolver per thread, having the
delegate as a property on the resolver would not work. It is therefore
passed as an argument.This only changes the public API so far. Internally, the old target /
selector / context pattern is still being used. This will be changed
later. (user: js, size: 61695) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
168 169 170 171 172 173 174 | selector: (SEL)selector context: (id)context; @end @interface OFDNSResolver_AsyncResolveSocketAddressesContext: OFObject { OFString *_host; | | < < | < < | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | selector: (SEL)selector context: (id)context; @end @interface OFDNSResolver_AsyncResolveSocketAddressesContext: OFObject { OFString *_host; id _delegate; OFMutableArray OF_GENERIC(OF_KINDOF(OFDNSResourceRecord *)) *_records; OFDNSResolver *_resolver; OFString *_domainName; @public unsigned int _expectedResponses; } - (instancetype)initWithHost: (OFString *)host delegate: (id)delegate; - (bool)parseRecords: (OFArray *)records answerRecords: (OFDictionary *)answerRecords additionalRecords: (OFDictionary *)additionalRecords recordType: (of_dns_resource_record_type_t)recordType recursion: (unsigned int)recursion result: (OFMutableArray *)result; - (void)resolveCNAME: (OFCNAMEDNSResourceRecord *)CNAME |
︙ | ︙ | |||
211 212 213 214 215 216 217 | answerRecords: (OFDictionary *)answerRecords authorityRecords: (OFDictionary *)authorityRecords additionalRecords: (OFDictionary *)additionalRecords context: (id)context exception: (id)exception; @end | | > < < < < < < | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 | answerRecords: (OFDictionary *)answerRecords authorityRecords: (OFDictionary *)authorityRecords additionalRecords: (OFDictionary *)additionalRecords context: (id)context exception: (id)exception; @end @interface OFDNSResolver_ResolveSocketAddressesDelegate: OFObject <OFDNSResolverDelegate> { @public bool _done; OFData *_socketAddresses; id _exception; } @end @interface OFDNSResolver () <OFUDPSocketDelegate> - (void)of_setDefaults; - (void)of_obtainSystemConfig; #if defined(OF_HAVE_FILES) && !defined(OF_NINTENDO_3DS) - (void)of_parseHosts: (OFString *)path; |
︙ | ︙ | |||
256 257 258 259 260 261 262 263 264 265 266 267 268 269 | settings: (OFDNSResolverSettings *)settings nameServersIndex: (size_t)nameServersIndex searchDomainsIndex: (size_t)searchDomainsIndex runLoopMode: (of_run_loop_mode_t)runLoopMode target: (id)target selector: (SEL)selector context: (id)context; - (void)of_sendQuery: (OFDNSResolverQuery *)query runLoopMode: (of_run_loop_mode_t)runLoopMode; - (void)of_queryWithIDTimedOut: (OFDNSResolverQuery *)query; @end #ifndef OF_WII static OFString * | > > > > > > > | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 | settings: (OFDNSResolverSettings *)settings nameServersIndex: (size_t)nameServersIndex searchDomainsIndex: (size_t)searchDomainsIndex runLoopMode: (of_run_loop_mode_t)runLoopMode target: (id)target selector: (SEL)selector context: (id)context; - (void)of_asyncResolveHost: (OFString *)host recordClass: (of_dns_resource_record_class_t)recordClass recordType: (of_dns_resource_record_type_t)recordType runLoopMode: (of_run_loop_mode_t)runLoopMode target: (id)target selector: (SEL)selector context: (id)context; - (void)of_sendQuery: (OFDNSResolverQuery *)query runLoopMode: (of_run_loop_mode_t)runLoopMode; - (void)of_queryWithIDTimedOut: (OFDNSResolverQuery *)query; @end #ifndef OF_WII static OFString * |
︙ | ︙ | |||
833 834 835 836 837 838 839 | [super dealloc]; } @end @implementation OFDNSResolver_AsyncResolveSocketAddressesContext - (instancetype)initWithHost: (OFString *)host | | < < | < < | < | 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 | [super dealloc]; } @end @implementation OFDNSResolver_AsyncResolveSocketAddressesContext - (instancetype)initWithHost: (OFString *)host delegate: (id)delegate { self = [super init]; @try { _host = [host copy]; _delegate = [delegate retain]; _records = [[OFMutableArray alloc] init]; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_host release]; [_delegate release]; [_records release]; [_resolver release]; [_domainName release]; [super dealloc]; } |
︙ | ︙ | |||
938 939 940 941 942 943 944 | _expectedResponses++; [result addObject: [OFPair pairWithFirstObject: CNAME secondObject: recordTypeNumber]]; | | | | | | | | | > | | | | 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 | _expectedResponses++; [result addObject: [OFPair pairWithFirstObject: CNAME secondObject: recordTypeNumber]]; [_resolver of_asyncResolveHost: alias recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN recordType: recordType runLoopMode: runLoopMode target: self selector: @selector(resolver: didResolveCNAME: answerRecords: authorityRecords: additionalRecords:context: exception:) context: recordTypeNumber]; } } - (void)resolver: (OFDNSResolver *)resolver didResolveCNAME: (OFString *)CNAME answerRecords: (OFDictionary *)answerRecords authorityRecords: (OFDictionary *)authorityRecords |
︙ | ︙ | |||
1031 1032 1033 1034 1035 1036 1037 | if (_expectedResponses == 0) [self done]; } - (void)done { | < < < > | < < < < < | > > > | > | < | 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 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 1067 1068 1069 1070 1071 | if (_expectedResponses == 0) [self done]; } - (void)done { OFMutableData *addresses = [OFMutableData dataWithItemSize: sizeof(of_socket_address_t)]; id exception = nil; for (id record in _records) { if (![record isKindOfClass: [OFDNSResourceRecord class]]) continue; switch ([record recordType]) { case OF_DNS_RESOURCE_RECORD_TYPE_A: case OF_DNS_RESOURCE_RECORD_TYPE_AAAA: [addresses addItem: [record address]]; break; default: break; } } [addresses makeImmutable]; if ([addresses count] == 0) exception = [OFResolveHostFailedException exceptionWithHost: _host recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN recordType: 0 error: OF_DNS_RESOLVER_ERROR_UNKNOWN]; if ([_delegate respondsToSelector: @selector( resolver:didResolveDomainName:socketAddresses:exception:)]) [_delegate resolver: _resolver didResolveDomainName: _domainName socketAddresses: (exception == nil ? addresses : nil) exception: exception]; } - (void)resolver: (OFDNSResolver *)resolver didResolveDomainName: (OFString *)domainName answerRecords: (OFDictionary *)answerRecords authorityRecords: (OFDictionary *)authorityRecords additionalRecords: (OFDictionary *)additionalRecords |
︙ | ︙ | |||
1118 1119 1120 1121 1122 1123 1124 | result: _records]; if (_expectedResponses == 0) [self done]; } @end | | < | 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 | result: _records]; if (_expectedResponses == 0) [self done]; } @end @implementation OFDNSResolver_ResolveSocketAddressesDelegate - (void)dealloc { [_socketAddresses release]; [_exception release]; [super dealloc]; } - (void)resolver: (OFDNSResolver *)resolver didResolveDomainName: (OFString *)domainName socketAddresses: (OFData *)socketAddresses exception: (id)exception { _socketAddresses = [socketAddresses retain]; _exception = [exception retain]; _done = true; } @end |
︙ | ︙ | |||
1683 1684 1685 1686 1687 1688 1689 1690 | forKey: ID]; [self of_sendQuery: query runLoopMode: runLoopMode]; objc_autoreleasePoolPop(pool); } | > | < | > > | > > > > > > > > > > > > > > > | | | | | | > > | | < < | | | | | | > > | > > > > > > > > > > > > > > > > > | | | | 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 | forKey: ID]; [self of_sendQuery: query runLoopMode: runLoopMode]; objc_autoreleasePoolPop(pool); } - (void)of_resolver: (OFDNSResolver *)resolver didResolveDomainName: (OFString *)domainName answerRecords: (of_dns_resolver_records_t)answerRecords authorityRecords: (of_dns_resolver_records_t)authorityRecords additionalRecords: (of_dns_resolver_records_t)additionalRecords context: (id)delegate exception: (id)exception { if ([delegate respondsToSelector: @selector(resolver: didResolveDomainName:answerRecords:authorityRecords: additionalRecords:exception:)]) [delegate resolver: resolver didResolveDomainName: domainName answerRecords: answerRecords authorityRecords: authorityRecords additionalRecords: additionalRecords exception: exception]; } - (void)asyncResolveHost: (OFString *)host delegate: (id <OFDNSResolverDelegate>)delegate { [self of_asyncResolveHost: host recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN recordType: OF_DNS_RESOURCE_RECORD_TYPE_ALL runLoopMode: of_run_loop_mode_default target: self selector: @selector(of_resolver:didResolveDomainName: answerRecords:authorityRecords: additionalRecords:context:exception:) context: delegate]; } - (void)asyncResolveHost: (OFString *)host recordClass: (of_dns_resource_record_class_t)recordClass recordType: (of_dns_resource_record_type_t)recordType delegate: (id <OFDNSResolverDelegate>)delegate { [self of_asyncResolveHost: host recordClass: recordClass recordType: recordType runLoopMode: of_run_loop_mode_default target: self selector: @selector(of_resolver:didResolveDomainName: answerRecords:authorityRecords: additionalRecords:context:exception:) context: delegate]; } - (void)asyncResolveHost: (OFString *)host recordClass: (of_dns_resource_record_class_t)recordClass recordType: (of_dns_resource_record_type_t)recordType runLoopMode: (of_run_loop_mode_t)runLoopMode delegate: (id <OFDNSResolverDelegate>)delegate { [self of_asyncResolveHost: host recordClass: recordClass recordType: recordType runLoopMode: runLoopMode target: self selector: @selector(of_resolver:didResolveDomainName: answerRecords:authorityRecords: additionalRecords:context:exception:) context: delegate]; } - (void)of_asyncResolveHost: (OFString *)host recordClass: (of_dns_resource_record_class_t)recordClass recordType: (of_dns_resource_record_type_t)recordType runLoopMode: (of_run_loop_mode_t)runLoopMode target: (id)target selector: (SEL)selector context: (id)context { void *pool = objc_autoreleasePoolPush(); OFDNSResolverSettings *settings = [[[OFDNSResolverSettings alloc] initWithNameServers: _nameServers searchDomains: _searchDomains timeout: _timeout maxAttempts: _maxAttempts |
︙ | ︙ | |||
2012 2013 2014 2015 2016 2017 2018 | answerRecords, authorityRecords, additionalRecords, query->_context, nil); return true; } - (void)asyncResolveSocketAddressesForHost: (OFString *)host | | < < < | < | < < < | < | < < < < < | > > | > > > > > > | | | > > > > > > | < < < | 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 | answerRecords, authorityRecords, additionalRecords, query->_context, nil); return true; } - (void)asyncResolveSocketAddressesForHost: (OFString *)host delegate: (id <OFDNSResolverDelegate>)delegate { [self asyncResolveSocketAddressesForHost: host addressFamily: OF_SOCKET_ADDRESS_FAMILY_ANY runLoopMode: of_run_loop_mode_default delegate: delegate]; } - (void)asyncResolveSocketAddressesForHost: (OFString *)host addressFamily: (of_socket_address_family_t) addressFamily delegate: (id <OFDNSResolverDelegate>)delegate { [self asyncResolveSocketAddressesForHost: host addressFamily: addressFamily runLoopMode: of_run_loop_mode_default delegate: delegate]; } - (void)asyncResolveSocketAddressesForHost: (OFString *)host addressFamily: (of_socket_address_family_t) addressFamily runLoopMode: (of_run_loop_mode_t)runLoopMode delegate: (id <OFDNSResolverDelegate>)delegate { OFArray OF_GENERIC(OFString *) *aliases; void *pool; OFDNSResolver_AsyncResolveSocketAddressesContext *context; @try { of_socket_address_t address = of_socket_address_parse_ip(host, 0); OFData *addresses; if (addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY && address.family != addressFamily) { if ([delegate respondsToSelector: @selector(resolver: didResolveDomainName:socketAddresses:exception:)]) { OFInvalidArgumentException *exception = [OFInvalidArgumentException exception]; [delegate resolver: self didResolveDomainName: host socketAddresses: nil exception: exception]; } return; } addresses = [OFData dataWithItems: &address itemSize: sizeof(address) count: 1]; if ([delegate respondsToSelector: @selector(resolver: didResolveDomainName:socketAddresses:exception:)]) [delegate resolver: self didResolveDomainName: host socketAddresses: addresses exception: nil]; return; } @catch (OFInvalidFormatException *e) { } if ((aliases = [_staticHosts objectForKey: host]) != nil) { OFMutableData *addresses = [OFMutableData dataWithItemSize: sizeof(of_socket_address_t)]; for (OFString *alias in aliases) { of_socket_address_t address; @try { |
︙ | ︙ | |||
2101 2102 2103 2104 2105 2106 2107 | [addresses addItem: &address]; } [addresses makeImmutable]; if ([addresses count] == 0) { | | | | | | < | | | > > > > > > | | | | | > | > > > > > | < > > > > | > | < < | | 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 | [addresses addItem: &address]; } [addresses makeImmutable]; if ([addresses count] == 0) { id exception = nil; of_dns_resource_record_type_t recordType; switch (addressFamily) { case OF_SOCKET_ADDRESS_FAMILY_ANY: recordType = OF_DNS_RESOURCE_RECORD_TYPE_ALL; break; case OF_SOCKET_ADDRESS_FAMILY_IPV4: recordType = OF_DNS_RESOURCE_RECORD_TYPE_A; break; case OF_SOCKET_ADDRESS_FAMILY_IPV6: recordType = OF_DNS_RESOURCE_RECORD_TYPE_AAAA; break; default: exception = [OFInvalidArgumentException exception]; break; } if (exception == nil) { of_dns_resource_record_class_t recordClass = OF_DNS_RESOURCE_RECORD_CLASS_IN; of_dns_resolver_error_t error = OF_DNS_RESOLVER_ERROR_NO_RESULT; exception = [OFResolveHostFailedException exceptionWithHost: host recordClass: recordClass recordType: recordType error: error]; } if ([delegate respondsToSelector: @selector(resolver: didResolveDomainName:socketAddresses:exception:)]) [delegate resolver: self didResolveDomainName: host socketAddresses: nil exception: exception]; } if ([delegate respondsToSelector: @selector(resolver: didResolveDomainName:socketAddresses:exception:)]) [delegate resolver: self didResolveDomainName: host socketAddresses: addresses exception: nil]; return; } pool = objc_autoreleasePoolPush(); context = [[[OFDNSResolver_AsyncResolveSocketAddressesContext alloc] initWithHost: host delegate: delegate] autorelease]; switch (addressFamily) { case OF_SOCKET_ADDRESS_FAMILY_IPV4: #ifdef OF_HAVE_IPV6 case OF_SOCKET_ADDRESS_FAMILY_IPV6: #endif context->_expectedResponses = 1; |
︙ | ︙ | |||
2164 2165 2166 2167 2168 2169 2170 | break; default: @throw [OFInvalidArgumentException exception]; } #ifdef OF_HAVE_IPV6 if (addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV6 || | | > > > | | | | | | > | | | | < > | | | | | | > | | | | | | | | < < < < < | | | | | 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 | break; default: @throw [OFInvalidArgumentException exception]; } #ifdef OF_HAVE_IPV6 if (addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV6 || addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) { OFNumber *recordTypeNumber = [OFNumber numberWithInt: OF_DNS_RESOURCE_RECORD_TYPE_AAAA]; [self of_asyncResolveHost: host recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN recordType: OF_DNS_RESOURCE_RECORD_TYPE_AAAA runLoopMode: runLoopMode target: context selector: @selector(resolver: didResolveDomainName: answerRecords:authorityRecords: additionalRecords:context: exception:) context: recordTypeNumber]; } #endif if (addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV4 || addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) [self of_asyncResolveHost: host recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN recordType: OF_DNS_RESOURCE_RECORD_TYPE_A runLoopMode: runLoopMode target: context selector: @selector(resolver: didResolveDomainName: answerRecords:authorityRecords: additionalRecords:context: exception:) context: [OFNumber numberWithInt: OF_DNS_RESOURCE_RECORD_TYPE_A]]; objc_autoreleasePoolPop(pool); } - (OFData *)resolveSocketAddressesForHost: (OFString *)host addressFamily: (of_socket_address_family_t) addressFamily { void *pool = objc_autoreleasePoolPush(); OFRunLoop *runLoop = [OFRunLoop currentRunLoop]; OFDNSResolver_ResolveSocketAddressesDelegate *delegate; OFData *ret; delegate = [[[OFDNSResolver_ResolveSocketAddressesDelegate alloc] init] autorelease]; [self asyncResolveSocketAddressesForHost: host addressFamily: addressFamily runLoopMode: resolveRunLoopMode delegate: delegate]; while (!delegate->_done) [runLoop runMode: resolveRunLoopMode beforeDate: nil]; /* Cleanup */ [runLoop runMode: resolveRunLoopMode beforeDate: [OFDate date]]; if (delegate->_exception != nil) @throw delegate->_exception; ret = [delegate->_socketAddresses retain]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } - (void)close |
︙ | ︙ |