Merge branch 'master' into dev

README.md

@@ -20,7 +20,7 @@ but simpler apis and richer protocols.
     - ftp
     - smtp
 - apps
-    - ls
+    - ls,mkdir_p,rmdir_p
     - ifconfig
     - ping
     - nc
@@ -163,8 +163,8 @@ bin/nc 127.0.0.1 1111
 bin/udp 2222
 bin/nc -u 127.0.0.1 2222
 
-make loop
-bin/loop
+make hloop_test
+bin/hloop_test
 bin/nc 127.0.0.1 10514
 ```
 

readme_cn.md

@@ -19,7 +19,7 @@
     - ftp
     - smtp
 - apps
-    - ls
+    - ls,mkdir_p,rmdir_p
     - ifconfig
     - ping
     - nc
@@ -162,8 +162,8 @@ bin/nc 127.0.0.1 1111
 bin/udp 2222
 bin/nc -u 127.0.0.1 2222
 
-make loop
-bin/loop
+make hloop_test
+bin/hloop_test
 bin/nc 127.0.0.1 10514
 ```
 

unittest/nslookup_test.c

@@ -15,7 +15,11 @@ int main(int argc, char* argv[]) {
 #ifdef OS_WIN
     WSADATA wsadata;
     WSAStartup(MAKEWORD(2,2), &wsadata);
+#endif
+
+#ifndef OS_LINUX
     nameserver = "114.114.114.114";
+    // nameserver = "8.8.8.8";
 #endif
 
     if (argc > 2) {