Skip to content

Commit 324e3a7

Browse files
HuYueeHuYuee
authored
Merge pull request #31 from HuYuee/feature/codeCC
 Feature/v1.10.0
2 parents cd98ddc + 58f36cd commit 324e3a7

30 files changed

+917
-874
lines changed

‎MSDKDns.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@
10471047
LINK_WITH_STANDARD_LIBRARIES = NO;
10481048
MACH_O_TYPE = mh_object;
10491049
MACOSX_DEPLOYMENT_TARGET = "";
1050-
MARKETING_VERSION = 1.9.0;
1050+
MARKETING_VERSION = 1.10.0;
10511051
ONLY_ACTIVE_ARCH = NO;
10521052
OTHER_CFLAGS = "-fembed-bitcode";
10531053
OTHER_LDFLAGS = (
@@ -1094,7 +1094,7 @@
10941094
LINK_WITH_STANDARD_LIBRARIES = NO;
10951095
MACH_O_TYPE = mh_object;
10961096
MACOSX_DEPLOYMENT_TARGET = "";
1097-
MARKETING_VERSION = 1.9.0;
1097+
MARKETING_VERSION = 1.10.0;
10981098
OTHER_CFLAGS = "-fembed-bitcode";
10991099
OTHER_LDFLAGS = (
11001100
"-ObjC",
@@ -1137,7 +1137,7 @@
11371137
LINK_WITH_STANDARD_LIBRARIES = NO;
11381138
MACH_O_TYPE = mh_object;
11391139
MACOSX_DEPLOYMENT_TARGET = "";
1140-
MARKETING_VERSION = 1.9.0;
1140+
MARKETING_VERSION = 1.10.0;
11411141
ONLY_ACTIVE_ARCH = NO;
11421142
OTHER_CFLAGS = "-fembed-bitcode";
11431143
OTHER_LDFLAGS = (
@@ -1179,7 +1179,7 @@
11791179
LINK_WITH_STANDARD_LIBRARIES = NO;
11801180
MACH_O_TYPE = mh_object;
11811181
MACOSX_DEPLOYMENT_TARGET = "";
1182-
MARKETING_VERSION = 1.9.0;
1182+
MARKETING_VERSION = 1.10.0;
11831183
OTHER_CFLAGS = "-fembed-bitcode";
11841184
OTHER_LDFLAGS = (
11851185
"-ObjC",
@@ -1228,7 +1228,7 @@
12281228
LINK_WITH_STANDARD_LIBRARIES = NO;
12291229
MACH_O_TYPE = mh_object;
12301230
MACOSX_DEPLOYMENT_TARGET = "";
1231-
MARKETING_VERSION = 1.9.0;
1231+
MARKETING_VERSION = 1.10.0;
12321232
ONLY_ACTIVE_ARCH = NO;
12331233
OTHER_CFLAGS = "-fembed-bitcode";
12341234
OTHER_LDFLAGS = (
@@ -1276,7 +1276,7 @@
12761276
LINK_WITH_STANDARD_LIBRARIES = NO;
12771277
MACH_O_TYPE = mh_object;
12781278
MACOSX_DEPLOYMENT_TARGET = "";
1279-
MARKETING_VERSION = 1.9.0;
1279+
MARKETING_VERSION = 1.10.0;
12801280
OTHER_CFLAGS = "-fembed-bitcode";
12811281
OTHER_LDFLAGS = (
12821282
"-ObjC",
@@ -1314,7 +1314,7 @@
13141314
LINK_WITH_STANDARD_LIBRARIES = NO;
13151315
MACH_O_TYPE = mh_object;
13161316
MACOSX_DEPLOYMENT_TARGET = "";
1317-
MARKETING_VERSION = 1.9.0;
1317+
MARKETING_VERSION = 1.10.0;
13181318
ONLY_ACTIVE_ARCH = NO;
13191319
OTHER_CFLAGS = "-fembed-bitcode";
13201320
OTHER_LDFLAGS = (
@@ -1354,7 +1354,7 @@
13541354
LINK_WITH_STANDARD_LIBRARIES = NO;
13551355
MACH_O_TYPE = mh_object;
13561356
MACOSX_DEPLOYMENT_TARGET = "";
1357-
MARKETING_VERSION = 1.9.0;
1357+
MARKETING_VERSION = 1.10.0;
13581358
OTHER_CFLAGS = "-fembed-bitcode";
13591359
OTHER_LDFLAGS = (
13601360
"-ObjC",

‎MSDKDns/CacheManager/MSDKDnsManager.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ typedef enum {
2828
- (void)refreshCacheDelay:(NSArray *)domains clearDispatchTag:(BOOL)needClear;
2929
- (void)preResolveDomains;
3030
- (void)dnsHasDone:(MSDKDnsService *)service;
31-
- (void)cacheDomainInfo:(NSDictionary *)domainInfo Domain:(NSString *)domain;
31+
- (void)cacheDomainInfo:(NSDictionary *)domainInfo domain:(NSString *)domain;
3232
- (void)clearCacheForDomain:(NSString *)domain;
3333
- (void)clearCacheForDomains:(NSArray<NSString *> *)domains;
3434
- (void)clearAllCache;
35+
- (BOOL)isOpenOptimismCache;
3536
- (NSDictionary *)getDnsDetail:(NSString *)domain;
3637

3738
- (NSString *)currentDnsServer;
@@ -48,7 +49,7 @@ typedef enum {
4849
/*
4950
* 获取底层配置
5051
*/
51-
- (void)fetchConfig:(int) mdnsId MEncryptType:(HttpDnsEncryptType)mdnsEncryptType MDnsKey:(NSString *)mdnsKey MToken:(NSString* )mdnsToken;
52+
- (void)fetchConfig:(int) mdnsId encryptType:(HttpDnsEncryptType)mdnsEncryptType dnsKey:(NSString *)mdnsKey token:(NSString* )mdnsToken;
5253
/*
5354
* 获取三网域名解析IP
5455
*/

‎MSDKDns/CacheManager/MSDKDnsManager.m

+160-201
Large diffs are not rendered by default.

‎MSDKDns/CacheManager/MSDKDnsNetworkManager.m

+27-23
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ @interface MSDKDnsNetworkManager ()
2424

2525
@implementation MSDKDnsNetworkManager
2626

27-
static MSDKDnsNetworkManager *manager = nil;
27+
static MSDKDnsNetworkManager *gManager = nil;
2828

2929
- (void)dealloc
3030
{
@@ -43,27 +43,27 @@ + (instancetype)shareInstance
4343
{
4444
@synchronized(self)
4545
{
46-
if (!manager)
46+
if (!gManager)
4747
{
48-
manager = [[MSDKDnsNetworkManager alloc] init];
48+
gManager = [[MSDKDnsNetworkManager alloc] init];
4949
}
5050
}
5151

52-
return manager;
52+
return gManager;
5353
}
5454

5555
- (instancetype)init
5656
{
5757
@synchronized(self)
5858
{
59-
if (manager)
59+
if (gManager)
6060
{
61-
return manager;
61+
return gManager;
6262
}
6363

6464
if (self = [super init])
6565
{
66-
manager = self;
66+
gManager = self;
6767
[NSNotificationCenter.defaultCenter addObserverForName:kMSDKDnsReachabilityChangedNotification
6868
object:nil
6969
queue:nil
@@ -144,7 +144,7 @@ - (BOOL)networkAvailable
144144
}
145145
}
146146

147-
static SCNetworkConnectionFlags ana_connectionFlags;
147+
static SCNetworkConnectionFlags gConnectionFlags;
148148
-(BOOL) is_networkAvaliable{
149149
#ifdef ANA_UNIT_TEST
150150
return YES;
@@ -158,14 +158,14 @@ -(BOOL) is_networkAvaliable{
158158
//
159159
// SCNetworkReachabilityRef defaultRouteReachablilty = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, (struct sockaddr *)&ipAddress);
160160
SCNetworkReachabilityRef defaultRouteReachablilty = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, "www.qq.com");
161-
BOOL didRetrieveFlags = SCNetworkReachabilityGetFlags(defaultRouteReachablilty, &ana_connectionFlags);
161+
BOOL didRetrieveFlags = SCNetworkReachabilityGetFlags(defaultRouteReachablilty, &gConnectionFlags);
162162

163163
CFRelease(defaultRouteReachablilty);
164164
if(!didRetrieveFlags) {
165165
printf("Error. Could not recover flags\n");
166166
}
167-
BOOL isReachable = ((ana_connectionFlags & kSCNetworkFlagsReachable) != 0);
168-
BOOL needConnection = ((ana_connectionFlags & kSCNetworkFlagsConnectionRequired) != 0);
167+
BOOL isReachable = ((gConnectionFlags & kSCNetworkFlagsReachable) != 0);
168+
BOOL needConnection = ((gConnectionFlags & kSCNetworkFlagsConnectionRequired) != 0);
169169
return (isReachable && !needConnection) ? YES : NO;
170170
#endif
171171
}
@@ -207,15 +207,7 @@ - (NSString*)networkType{
207207
} else if ([networkModel isEqualToString:CTRadioAccessTechnologyGPRS] ||
208208
[networkModel isEqualToString:CTRadioAccessTechnologyEdge]) {
209209
networkType = @"2G";
210-
} else if ([networkModel isEqualToString:CTRadioAccessTechnologyWCDMA] ||
211-
[networkModel isEqualToString:CTRadioAccessTechnologyEdge] ||
212-
[networkModel isEqualToString:CTRadioAccessTechnologyHSDPA] ||
213-
[networkModel isEqualToString:CTRadioAccessTechnologyHSUPA] ||
214-
[networkModel isEqualToString:CTRadioAccessTechnologyCDMA1x] ||
215-
[networkModel isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0] ||
216-
[networkModel isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA] ||
217-
[networkModel isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB] ||
218-
[networkModel isEqualToString:CTRadioAccessTechnologyeHRPD]){
210+
} else if ([self is3gNetWork:networkModel]){
219211
networkType = @"3G";
220212
}
221213
}
@@ -232,6 +224,18 @@ - (NSString*)networkType{
232224
#endif
233225
}
234226

227+
- (BOOL)is3gNetWork:(NSString *)networkModel {
228+
return [networkModel isEqualToString:CTRadioAccessTechnologyWCDMA] ||
229+
[networkModel isEqualToString:CTRadioAccessTechnologyEdge] ||
230+
[networkModel isEqualToString:CTRadioAccessTechnologyHSDPA] ||
231+
[networkModel isEqualToString:CTRadioAccessTechnologyHSUPA] ||
232+
[networkModel isEqualToString:CTRadioAccessTechnologyCDMA1x] ||
233+
[networkModel isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0] ||
234+
[networkModel isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA] ||
235+
[networkModel isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB] ||
236+
[networkModel isEqualToString:CTRadioAccessTechnologyeHRPD];
237+
}
238+
235239
-(BOOL) activeWLAN {
236240

237241
if (![self is_networkAvaliable]) return NO;
@@ -251,18 +255,18 @@ -(BOOL) activeWWAN {
251255
}
252256
}
253257
if (![self is_networkAvaliable]) return NO;
254-
return ((ana_connectionFlags & kSCNetworkReachabilityFlagsIsWWAN) != 0) ? YES : NO;
258+
return ((gConnectionFlags & kSCNetworkReachabilityFlagsIsWWAN) != 0) ? YES : NO;
255259
#endif
256260
}
257261

258262
-(BOOL) is2G {
259263
if (![self is_networkAvaliable]) {
260264
return NO;
261265
}
262-
if ((ana_connectionFlags & kSCNetworkReachabilityFlagsIsWWAN) == 0) {
266+
if ((gConnectionFlags & kSCNetworkReachabilityFlagsIsWWAN) == 0) {
263267
return NO;
264268
}
265-
if((ana_connectionFlags & kSCNetworkReachabilityFlagsTransientConnection) == kSCNetworkReachabilityFlagsTransientConnection) {
269+
if((gConnectionFlags & kSCNetworkReachabilityFlagsTransientConnection) == kSCNetworkReachabilityFlagsTransientConnection) {
266270
return YES;
267271
}
268272
return NO;

‎MSDKDns/CacheManager/MSDKDnsParamsManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
- (void)msdkDnsSetMDnsIp:(NSString *) mdnsIp;
1616
- (void)msdkDnsSetMOpenId:(NSString *) mdnsOpenId;
17-
- (void)msdkDnsSetMAppId:(NSString *) mdnsAppId MTimeOut:(int)mdnsTimeOut MEncryptType:(HttpDnsEncryptType)mdnsEncryptType;
18-
- (void)msdkDnsSetMDnsId:(int) mdnsId MDnsKey:(NSString *)mdnsKey MToken:(NSString* )mdnsToken;
17+
- (void)msdkDnsSetMAppId:(NSString *) mdnsAppId timeOut:(int)mdnsTimeOut encryptType:(HttpDnsEncryptType)mdnsEncryptType;
18+
- (void)msdkDnsSetMDnsId:(int) mdnsId dnsKey:(NSString *)mdnsKey token:(NSString* )mdnsToken;
1919
- (void)msdkDnsSetRouteIp:(NSString *)routeIp;
2020
- (void)msdkDnsSetHttpOnly:(BOOL)httpOnly;
2121
// 设置切换ip之前重试次数
@@ -29,7 +29,7 @@
2929
- (void)msdkDnsSetPreResolvedDomains: (NSArray *)domains;
3030
- (void)msdkDnsSetAddressType: (HttpDnsAddressType)addressType;
3131
- (void)msdkDnsSetKeepAliveDomains: (NSArray *)domains;
32-
- (void)msdkDnsSetIPRankData: (NSDictionary *)IPRankData;
32+
- (void)msdkDnsSetIPRankData: (NSDictionary *)ipRankData;
3333
- (void)msdkDnsSetEnableKeepDomainsAlive: (BOOL)enableKeepDomainsAlive;
3434
- (void)msdkDnsSetExpiredIPEnabled: (BOOL)enable;
3535
- (void)msdkDnsSetPersistCacheIPEnabled: (BOOL)enable;

‎MSDKDns/CacheManager/MSDKDnsParamsManager.m

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ @interface MSDKDnsParamsManager()
3333
@property (strong, nonatomic, readwrite) NSArray* preResolvedDomains;
3434
@property (assign, nonatomic, readwrite) HttpDnsAddressType msdkAddressType;
3535
@property (strong, nonatomic, readwrite) NSArray* keepAliveDomains;
36-
@property (strong, nonatomic, readwrite) NSDictionary* IPRankData;
36+
@property (strong, nonatomic, readwrite) NSDictionary* ipRankData;
3737
@property (assign, nonatomic, readwrite) BOOL enableKeepDomainsAlive;
3838
@property (assign, nonatomic, readwrite) BOOL expiredIPEnabled;
3939
@property (assign, nonatomic, readwrite) BOOL persistCacheIPEnabled;
@@ -43,14 +43,14 @@ @interface MSDKDnsParamsManager()
4343

4444
@implementation MSDKDnsParamsManager
4545

46-
static MSDKDnsParamsManager * _sharedInstance = nil;
46+
static MSDKDnsParamsManager * gSharedInstance = nil;
4747

4848
+ (instancetype)shareInstance {
4949
static dispatch_once_t onceToken;
5050
dispatch_once(&onceToken, ^{
51-
_sharedInstance = [[MSDKDnsParamsManager alloc] init];
51+
gSharedInstance = [[MSDKDnsParamsManager alloc] init];
5252
});
53-
return _sharedInstance;
53+
return gSharedInstance;
5454
}
5555

5656
- (id) init {
@@ -102,7 +102,7 @@ - (void)msdkDnsSetMOpenId:(NSString *) mdnsOpenId {
102102
});
103103
}
104104

105-
- (void)msdkDnsSetMAppId:(NSString *) mdnsAppId MTimeOut:(int)mdnsTimeOut MEncryptType:(HttpDnsEncryptType)mdnsEncryptType
105+
- (void)msdkDnsSetMAppId:(NSString *) mdnsAppId timeOut:(int)mdnsTimeOut encryptType:(HttpDnsEncryptType)mdnsEncryptType
106106
{
107107
dispatch_async([MSDKDnsInfoTool msdkdns_queue], ^{
108108
self.msdkDnsAppId = mdnsAppId;
@@ -112,7 +112,7 @@ - (void)msdkDnsSetMAppId:(NSString *) mdnsAppId MTimeOut:(int)mdnsTimeOut MEncry
112112
}
113113

114114

115-
- (void)msdkDnsSetMDnsId:(int) mdnsId MDnsKey:(NSString *)mdnsKey MToken:(NSString* )mdnsToken{
115+
- (void)msdkDnsSetMDnsId:(int) mdnsId dnsKey:(NSString *)mdnsKey token:(NSString* )mdnsToken{
116116
dispatch_async([MSDKDnsInfoTool msdkdns_queue], ^{
117117
self.msdkDnsId = mdnsId;
118118
self.msdkDnsKey = mdnsKey;
@@ -185,9 +185,9 @@ - (void)msdkDnsSetKeepAliveDomains: (NSArray *)domains {
185185
});
186186
}
187187

188-
- (void)msdkDnsSetIPRankData: (NSDictionary *)IPRankData {
188+
- (void)msdkDnsSetIPRankData: (NSDictionary *)ipRankData {
189189
dispatch_async([MSDKDnsInfoTool msdkdns_queue], ^{
190-
self.IPRankData = [IPRankData copy];
190+
self.ipRankData = [ipRankData copy];
191191
});
192192
}
193193

@@ -291,7 +291,7 @@ - (NSArray *)msdkDnsGetKeepAliveDomains {
291291
}
292292

293293
- (NSDictionary *)msdkDnsGetIPRankData {
294-
return _IPRankData;
294+
return _ipRankData;
295295
}
296296

297297
- (BOOL)msdkDnsGetEnableKeepDomainsAlive {

‎MSDKDns/DB/MSDKDnsDB.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010

1111
+ (instancetype)shareInstance;
1212

13-
- (void)insertOrReplaceDomainInfo:(NSDictionary *)domainInfo Domain:(NSString *)domain;
13+
- (void)insertOrReplaceDomainInfo:(NSDictionary *)domainInfo domain:(NSString *)domain;
1414

1515
- (NSDictionary *)getDataFromDB;
1616

1717
- (void)deleteDBData: (NSArray *)domains;
1818

19+
- (void)deleteAllData;
20+
1921
@end
2022

0 commit comments

Comments
 (0)