Merge pull request #80 from YangSen-qn/master

use 114.114.114.114 instead 8.8.8.8

Author: bachue

CHANGELOG.md

@@ -1,3 +1,7 @@
+#Changelog
+## 1.0.3 (2023-06-16)
+* 调整 内部使用 114.114.114.114 替换 8.8.8.8
+
 #Changelog
 ## 1.0.2 (2022-06-02)
 * 优化 udp dns reslover 的线程队列使用

HappyDNS.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'HappyDNS'
-  s.version      = '1.0.2'
+  s.version      = '1.0.3'
   s.summary      = 'DNS library for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/happy-dns-objc'
   s.social_media_url = 'http://weibo.com/qiniutek'

HappyDNS/Dns/QNDnsUdpResolver.h

@@ -13,11 +13,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 /// 构造函数
-/// @param serverIP 指定 dns local server1. eg:8.8.8.8
+/// @param serverIP 指定 dns local server1. eg:114.114.114.114
 + (instancetype)resolverWithServerIP:(NSString *)serverIP;
 
 /// 构造函数
-/// @param serverIP 指定 dns local server1. eg:8.8.8.8
+/// @param serverIP 指定 dns local server1. eg:114.114.114.114
 /// @param recordType 记录类型 eg：kQNTypeA
 /// @param timeout 超时时间
 + (instancetype)resolverWithServerIP:(NSString *)serverIP

HappyDNS/Util/QNIP.m

@@ -22,6 +22,14 @@
 #import <UIKit/UIKit.h>
 #endif
 
+#ifndef kQNDnsDefaultIPv4IP
+#define kQNDnsDefaultIPv4IP "114.114.114.114"
+#endif
+
+#ifndef kQNDnsDefaultIPv6IP
+#define kQNDnsDefaultIPv6IP "2400:3200::1"
+#endif
+
 void qn_nat64(char *buf, int buf_size, uint32_t ipv4addr) {
     bzero(buf, buf_size);
     //nat 4 to ipv6
@@ -99,11 +107,11 @@ int qn_local_ip_internal(char *buf, int buf_size, const char *t_ip) {
 }
 
 int qn_localIp(char *buf, int buf_size) {
-    int ret = qn_local_ip_internal(buf, buf_size, "8.8.8.8");
+    int ret = qn_local_ip_internal(buf, buf_size, kQNDnsDefaultIPv4IP);
     if (ret != 0) {
 #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED
         if (![QNIP isIpV6FullySupported]) {
-            ret = qn_local_ip_internal(buf, buf_size, "64:ff9b::808:808");
+            ret = qn_local_ip_internal(buf, buf_size, kQNDnsDefaultIPv6IP);
         }
 #endif
     }
@@ -116,7 +124,8 @@ + (BOOL)isV6 {
     struct addrinfo hints = {0}, *ai;
     hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
-    int ret = getaddrinfo("8.8.8.8", "http", &hints, &ai);
+    hints.ai_flags = AI_NUMERICHOST;
+    int ret = getaddrinfo(kQNDnsDefaultIPv4IP, "http", &hints, &ai);
     if (ret != 0) {
         return NO;
     }
@@ -126,7 +135,7 @@ + (BOOL)isV6 {
 #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED
     if (![QNIP isIpV6FullySupported] && !ret) {
         char buf[64] = {0};
-        ret = qn_local_ip_internal(buf, sizeof(buf), "64:ff9b::808:808");
+        ret = qn_local_ip_internal(buf, sizeof(buf), kQNDnsDefaultIPv6IP);
         if (strchr(buf, ':') != NULL) {
             result = YES;
         }
@@ -156,7 +165,7 @@ + (NSString *)adaptiveIp:(NSString *)ipv4 {
 #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED
     if (![QNIP isIpV6FullySupported] && family == AF_INET) {
         char buf2[64] = {0};
-        ret = qn_local_ip_internal(buf2, sizeof(buf2), "64:ff9b::808:808");
+        ret = qn_local_ip_internal(buf2, sizeof(buf2), kQNDnsDefaultIPv6IP);
         if (strchr(buf2, ':') != NULL) {
             bzero(buf, sizeof(buf));
             qn_nat64(buf, sizeof(buf), *((uint32_t *)addr));

README.md

@@ -96,7 +96,7 @@ if([QNDnsManager needHttpDns]){
 }else{
     NSMutableArray *array = [[NSMutableArray alloc] init];
     [array addObject:[QNResolver systemResolver]];
-    [array addObject:[[QNResolver alloc] initWithAddress:@"8.8.8.8"]];
+    [array addObject:[[QNResolver alloc] initWithAddress:@"114.114.114.114"]];
     dns = [[QNDnsManager alloc] init:array networkInfo:[QNNetworkInfo normal]];
 }
 ```