Merge pull request #16 from DNSPod/feature/1.3.5

feat：优化多线程逻辑
DNSPod · Mar 14, 2022 · 1aa96a4 · 1aa96a4
2 parents 701743d + 6e5d349
commit 1aa96a4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/MSDKDns/CacheManager/MSDKDnsManager.m b/MSDKDns/CacheManager/MSDKDnsManager.m
@@ -668,8 +668,9 @@ - (BOOL) domianCache:(NSDictionary *)cache hit:(NSString *)domain {
 
 # pragma mark - servers
 - (NSString *)currentDnsServer {
-    if (self.serverIndex < [[[MSDKDnsParamsManager shareInstance] msdkDnsGetServerIps] count]) {
-        return  [[[MSDKDnsParamsManager shareInstance] msdkDnsGetServerIps] objectAtIndex:self.serverIndex];
+    int index = self.serverIndex;
+    if (index < [[[MSDKDnsParamsManager shareInstance] msdkDnsGetServerIps] count]) {
+        return  [[[MSDKDnsParamsManager shareInstance] msdkDnsGetServerIps] objectAtIndex:index];
     }
     return  [[MSDKDnsParamsManager shareInstance] msdkDnsGetMDnsIp];
 }
@@ -680,7 +681,7 @@ - (void)switchDnsServer {
     }
     self.waitToSwitch = YES;
     dispatch_async([MSDKDnsInfoTool msdkdns_queue], ^{
-        if (self.serverIndex < [[[MSDKDnsParamsManager shareInstance] msdkDnsGetServerIps] count]) {
+        if (self.serverIndex < [[[MSDKDnsParamsManager shareInstance] msdkDnsGetServerIps] count] - 1) {
             self.serverIndex += 1;
             if (!self.firstFailTime) {
                 self.firstFailTime = [NSDate date];