Merge branch 'master' of gitee:zsxxsz/acl into gitee-master

harmony/api9/acl_one/AppScope/app.json5

@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "com.example.api9",
+    "bundleName": "com.example.acl_one",
     "vendor": "example",
     "versionCode": 1000000,
     "versionName": "1.0.0",

harmony/api9/acl_one/AppScope/resources/base/element/string.json

@@ -2,7 +2,7 @@
   "string": [
     {
       "name": "app_name",
-      "value": "api9"
+      "value": "acl_one"
     }
   ]
 }

harmony/api9/acl_one/entry/src/main/cpp/CMakeLists.txt

@@ -1,20 +1,23 @@
 # the minimum version of CMake.
 cmake_minimum_required(VERSION 3.4.1)
-project(api9)
+project(acl_one)
 
 set(NATIVERENDER_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 
 include_directories(${NATIVERENDER_ROOT_PATH}
                     ${NATIVERENDER_ROOT_PATH}/include)
 
-set(acl_home ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../..)
+set(acl_home ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../..)
 set(acl_c_path ${acl_home}/lib_acl)
 set(acl_c_include ${acl_c_path}/include)
+set(pro_c_path ${acl_home}/lib_protocol)
+set(pro_c_include ${acl_home}/lib_protocol/include)
 set(acl_cpp_path ${acl_home}/lib_acl_cpp)
 set(acl_cpp_include ${acl_cpp_path}/include)
 
 include_directories(
         ${acl_c_include}
+	${pro_c_include}
         ${acl_cpp_include}
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -38,9 +41,9 @@ endforeach()
 add_library(entry SHARED ${mylib_src})
 #add_library(entry SHARED hello.cpp)
 
-add_subdirectory(../../../../../../lib_acl acl)
-add_subdirectory(../../../../../../lib_protocol protocol)
-add_subdirectory(../../../../../../lib_acl_cpp acl_cpp)
+add_subdirectory(${acl_c_path} acl)
+add_subdirectory(${pro_c_path} protocol)
+add_subdirectory(${acl_cpp_path} acl_cpp)
 
 set(lib_acl_path ${acl_home}/harmony/lib/${OHOS_ARCH})
 set(libacl ${lib_acl_path}/libacl.a)
@@ -56,4 +59,3 @@ find_library(
 )
 target_link_libraries(entry PUBLIC libace_napi.z.so ${lib_all} ${hilog-lib} libace_napi.z.so libc++.a)
 #target_link_libraries(entry PUBLIC libace_napi.z.so ${lib_all} ${hilog-lib} libc++.a)
-

harmony/api9/acl_one/oh-package.json5

@@ -1,5 +1,5 @@
 {
-  "name": "api9",
+  "name": "acl_one",
   "version": "1.0.0",
   "description": "Please describe the basic information.",
   "main": "",

lib_acl/src/net/acl_host_port.c

@@ -155,6 +155,8 @@ struct addrinfo *acl_host_addrinfo2(const char *addr, int type, int family)
 	hints.ai_socktype = type;
 #ifdef	ACL_MACOSX
 	hints.ai_flags    = AI_DEFAULT;
+#elif	defined(ACL_OHOS)
+	hints.ai_flags    = 0;
 #elif	defined(ACL_ANDROID)
 	hints.ai_flags    = AI_ADDRCONFIG;
 #elif	defined(ACL_WINDOWS)