From 012de49bd4a3a91ec5b7b2e772f2b7eccb590e8b Mon Sep 17 00:00:00 2001 From: SubmarinePhantom Date: Thu, 16 Nov 2023 10:08:21 +0800 Subject: [PATCH 1/4] Add OH_NetConn_GetAllNets interface to NDK~ Signed-off-by: SubmarinePhantom --- network/netmanager/BUILD.gn | 10 ++- network/netmanager/include/net_connection.h | 18 ++++- .../netmanager/include/net_connection_type.h | 77 +++++++++++++++++++ network/netmanager/libnet_connection.ndk.json | 8 +- 4 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 network/netmanager/include/net_connection_type.h diff --git a/network/netmanager/BUILD.gn b/network/netmanager/BUILD.gn index 339128a89..e32b612c2 100644 --- a/network/netmanager/BUILD.gn +++ b/network/netmanager/BUILD.gn @@ -20,10 +20,16 @@ ohos_ndk_library("libnet_connection") { ndk_description_file = "./libnet_connection.ndk.json" min_compact_version = "1" system_capability = "SystemCapability.Communication.NetManager.Core" - system_capability_headers = [ "./include/net_connection.h" ] + system_capability_headers = [ + "network/netmanager/net_connection.h", + "network/netmanager/net_connection_type.h", + ] } ohos_ndk_headers("netconn_header") { dest_dir = "$ndk_headers_out_dir/network/netmanager" - sources = [ "./include/net_connection.h" ] + sources = [ + "network/netmanager/net_connection.h", + "network/netmanager/net_connection_type.h", + ] } diff --git a/network/netmanager/include/net_connection.h b/network/netmanager/include/net_connection.h index a1b069d78..67edc302a 100644 --- a/network/netmanager/include/net_connection.h +++ b/network/netmanager/include/net_connection.h @@ -39,6 +39,8 @@ #include +#include "net_connection_type.h" + #ifdef __cplusplus extern "C" { #endif @@ -75,9 +77,23 @@ int32_t OH_NetConn_GetAddrInfo(char *host, char *serv, struct addrinfo *hint, st */ int32_t OH_NetConn_FreeDnsResult(struct addrinfo *res); +/** + * @brief Queries all activated data networks. + * + * @param netHandleList Network handle that stores the network ID list. + * @return 0 - Success. 201 - Missing permissions. + * 401 - Parameter error. 2100002 - Unable to connect to service. + * 2100003 - Internal error. + * @permission ohos.permission.GET_NETWORK_INFO + * @syscap SystemCapability.Communication.NetManager.Core + * @since 11 + * @version 1.0 + */ +int32_t OH_NetConn_GetAllNets(OH_NetConn_NetHandleList *netHandleList); + #ifdef __cplusplus } #endif /** @} */ -#endif /* NATIVE_NET_CONN_API_H */ +#endif /* NATIVE_NET_CONN_API_H */ \ No newline at end of file diff --git a/network/netmanager/include/net_connection_type.h b/network/netmanager/include/net_connection_type.h new file mode 100644 index 000000000..e18a9310f --- /dev/null +++ b/network/netmanager/include/net_connection_type.h @@ -0,0 +1,77 @@ +/* +* Copyright (c) 2023 Huawei Device Co., Ltd. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +#ifndef NATIVE_NET_CONN_TYPE_H +#define NATIVE_NET_CONN_TYPE_H + +/** +* @addtogroup NetConnection +* @{ +* +* @brief Provides the data structures for the C APIs of the network connection module for network management. +* +* @since 11 +* @version 1.0 +*/ + +/** +* @file net_connection_type.h +* @brief Defines the data structures for the C APIs of the network connection module. +* +* @library libnet_connection.so +* @syscap SystemCapability.Communication.NetManager.Core +* @since 11 +* @version 1.0 +* +*/ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define OH_NETCONN_MAX_NET_SIZE 32 + +/** +* @brief Defines the network handle. +* +* @since 11 +* @version 1.0 +*/ +typedef struct OH_NetConn_NetHandle { + /** Network ID */ + int32_t netId; +} OH_NetConn_NetHandle; + +/** +* @brief Defines the network handle list. +* +* @since 11 +* @version 1.0 +*/ +typedef struct OH_NetConn_NetHandleList { + /** Network handle list */ + OH_NetConn_NetHandle netHandles[OH_NETCONN_MAX_NET_SIZE]; + /** Actual size of the network handle list */ + int32_t netHandleListSize; +} OH_NetConn_NetHandleList; + +#ifdef __cplusplus +} +#endif + +/** @} */ +#endif /* NATIVE_NET_CONN_TYPE_H */ \ No newline at end of file diff --git a/network/netmanager/libnet_connection.ndk.json b/network/netmanager/libnet_connection.ndk.json index 2c5ac35b0..a7c090088 100644 --- a/network/netmanager/libnet_connection.ndk.json +++ b/network/netmanager/libnet_connection.ndk.json @@ -1,10 +1,14 @@ [ { - "first_introdeced":"11", + "first_introduced": "11", "name": "OH_NetConn_GetAddrInfo" }, { - "first_introdeced":"11", + "first_introduced": "11", "name": "OH_NetConn_FreeDnsResult" + }, + { + "first_introduced": "11", + "name": "OH_NetConn_GetAllNets" } ] \ No newline at end of file -- Gitee From 273f59e881d6e52d13e39fd7a80bc5b7e663af30 Mon Sep 17 00:00:00 2001 From: Aurora Date: Thu, 16 Nov 2023 02:31:56 +0000 Subject: [PATCH 2/4] update network/netmanager/BUILD.gn. Signed-off-by: Aurora --- network/netmanager/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/netmanager/BUILD.gn b/network/netmanager/BUILD.gn index e32b612c2..b8bd5bf3d 100644 --- a/network/netmanager/BUILD.gn +++ b/network/netmanager/BUILD.gn @@ -29,7 +29,7 @@ ohos_ndk_library("libnet_connection") { ohos_ndk_headers("netconn_header") { dest_dir = "$ndk_headers_out_dir/network/netmanager" sources = [ - "network/netmanager/net_connection.h", - "network/netmanager/net_connection_type.h", + "net_connection.h", + "net_connection_type.h", ] } -- Gitee From 980c27492439bbebb4d2371cbfaf1e1a8a6678fe Mon Sep 17 00:00:00 2001 From: SubmarinePhantom Date: Thu, 16 Nov 2023 17:54:55 +0800 Subject: [PATCH 3/4] update network/netmanager/BUILD.gn Signed-off-by: SubmarinePhantom --- network/netmanager/BUILD.gn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/network/netmanager/BUILD.gn b/network/netmanager/BUILD.gn index b8bd5bf3d..6acf76e42 100644 --- a/network/netmanager/BUILD.gn +++ b/network/netmanager/BUILD.gn @@ -21,15 +21,15 @@ ohos_ndk_library("libnet_connection") { min_compact_version = "1" system_capability = "SystemCapability.Communication.NetManager.Core" system_capability_headers = [ - "network/netmanager/net_connection.h", - "network/netmanager/net_connection_type.h", + "network/netmanager/include/net_connection.h", + "network/netmanager/include/net_connection_type.h", ] } ohos_ndk_headers("netconn_header") { dest_dir = "$ndk_headers_out_dir/network/netmanager" sources = [ - "net_connection.h", - "net_connection_type.h", + "network/netmanager/include/net_connection.h", + "network/netmanager/include/net_connection_type.h", ] } -- Gitee From 43b513745ed4a0f569d9a2ddcdb7770f4e2989f1 Mon Sep 17 00:00:00 2001 From: SubmarinePhantom Date: Thu, 16 Nov 2023 19:05:10 +0800 Subject: [PATCH 4/4] update Signed-off-by: SubmarinePhantom --- network/netmanager/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/netmanager/BUILD.gn b/network/netmanager/BUILD.gn index 6acf76e42..b288df8fe 100644 --- a/network/netmanager/BUILD.gn +++ b/network/netmanager/BUILD.gn @@ -29,7 +29,7 @@ ohos_ndk_library("libnet_connection") { ohos_ndk_headers("netconn_header") { dest_dir = "$ndk_headers_out_dir/network/netmanager" sources = [ - "network/netmanager/include/net_connection.h", - "network/netmanager/include/net_connection_type.h", + "include/net_connection.h", + "include/net_connection_type.h", ] } -- Gitee