Merge pull request #24 from longbai/ipv6_opt

fixed cocoapod release
qiniu · May 27, 2016 · e341d28 · e341d28
2 parents 8e39dea + 57134b7
commit e341d28
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/HappyDNS.podspec b/HappyDNS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'HappyDNS'
-  s.version      = '0.3.2'
+  s.version      = '0.3.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'

diff --git a/HappyDNS/QNResolvUtil.h b/HappyDNS/QNResolvUtil.h
@@ -9,8 +9,10 @@
 #ifndef QNResolv_h
 #define QNResolv_h
 
-BOOL isV6(NSString *address);
+#include <resolv.h>
 
-int setup_dns_server(res_state res, NSString *dns_server);
+extern BOOL isV6(NSString *address);
+
+extern int setup_dns_server(res_state res, NSString *dns_server);
 
 #endif /* QNResolv_h */
diff --git a/HappyDNS/Util/QNIP.h b/HappyDNS/Util/QNIP.h
@@ -8,8 +8,8 @@
 
 #import <Foundation/Foundation.h>
 
-int qn_localIp(char *buf, int buf_size);
-void qn_nat64(char *buf, int buf_size, uint32_t ipv4addr);
+extern int qn_localIp(char *buf, int buf_size);
+extern void qn_nat64(char *buf, int buf_size, uint32_t ipv4addr);
 
 @interface QNIP : NSObject
 

diff --git a/HappyDNS/Util/QNIP.m b/HappyDNS/Util/QNIP.m
@@ -191,7 +191,7 @@ + (NSString *)nat64:(NSString *)ip {
     struct in_addr s = {0};
     inet_pton(AF_INET, ip.UTF8String, (void *)&s);
     char buf[64] = {0};
-    qn_nat64(buf, sizeof(buf), s.s_addr);
+    qn_nat64(buf, sizeof(buf), (uint32_t)s.s_addr);
     return [NSString stringWithUTF8String:buf];
 }