Use combined dns discovery

This commit is contained in:
Peter Iakovlev
2019-02-15 17:29:31 +04:00
parent 67e60e8e8b
commit dd02b83037
3 changed files with 7 additions and 2 deletions

View File

@@ -6,5 +6,6 @@
+ (MTSignal *)resolveHostname:(NSString *)hostname;
+ (MTSignal *)resolveHostnameNative:(NSString *)hostname port:(int32_t)port;
+ (MTSignal *)resolveHostnameUniversal:(NSString *)hostname port:(int32_t)port;
@end

View File

@@ -365,4 +365,8 @@
}];
}
+ (MTSignal *)resolveHostnameUniversal:(NSString *)hostname port:(int32_t)port {
return [[self resolveHostname:hostname] timeout:10.0 onQueue:[MTQueue concurrentDefaultQueue] orSignal:[self resolveHostnameNative:hostname port:port]];
}
@end

View File

@@ -306,7 +306,7 @@ struct ctr_state {
if (isHostname) {
int32_t port = _socksPort;
resolveSignal = [[MTDNS resolveHostnameNative:_socksIp port:port] map:^id(NSString *resolvedIp) {
resolveSignal = [[MTDNS resolveHostnameUniversal:_socksIp port:port] map:^id(NSString *resolvedIp) {
return [[MTTcpConnectionData alloc] initWithIp:resolvedIp port:port isSocks:true];
}];
} else {
@@ -324,7 +324,7 @@ struct ctr_state {
if (isHostname) {
int32_t port = _mtpPort;
resolveSignal = [[MTDNS resolveHostnameNative:_mtpIp port:port] map:^id(NSString *resolvedIp) {
resolveSignal = [[MTDNS resolveHostnameUniversal:_mtpIp port:port] map:^id(NSString *resolvedIp) {
return [[MTTcpConnectionData alloc] initWithIp:resolvedIp port:port isSocks:false];
}];
} else {