From 6bca12e8b9b048d10da5f67cbd71331d52101022 Mon Sep 17 00:00:00 2001 From: jeosif Date: Mon, 11 Apr 2022 15:24:29 +0800 Subject: [PATCH] sync 3.1release and adapter different eth name Signed-off-by: jeosif --- adapter/BUILD.gn | 3 ++ .../bus_center/network/lnn_netlink_monitor.c | 5 +-- .../bus_center/platform/bus_center_adapter.c | 2 +- .../kernel/liteos_a/softbus_adapter_file.c | 8 ++-- .../kernel/liteos_a/softbus_adapter_thread.c | 6 +++ .../kernel/liteos_m/softbus_adapter_file.c | 4 +- .../common/mbedtls/softbus_adapter_crypto.c | 1 + .../include/softbus_adapter_ble_gatt_server.h | 38 ------------------- .../common/softbus_wifi_api_adapter_virtual.c | 3 ++ adapter/common/net/wifi/net_wifi.gni | 3 +- .../feature_config/mini/config.gni | 1 + .../feature_config/small/config.gni | 1 + .../feature_config/standard/config.gni | 1 + .../spec_config/softbus_config_adapter.c | 11 ++++++ .../src/lnn_exchange_device_info.c | 2 +- 15 files changed, 39 insertions(+), 50 deletions(-) mode change 100755 => 100644 adapter/common/net/wifi/common/softbus_wifi_api_adapter_virtual.c diff --git a/adapter/BUILD.gn b/adapter/BUILD.gn index d351cbbed..a638171ba 100644 --- a/adapter/BUILD.gn +++ b/adapter/BUILD.gn @@ -105,6 +105,9 @@ if (defined(ohos_lite)) { "$softbus_adapter_config/spec_config", "$dsoftbus_root_path/core/common/include", ] + if (target_cpu == "arm") { + defines = [ "MINE_HARMONY_VERSION=\"MineHarmony Std-Interact ${mine_harmony_version}, arm cortex-a55\"" ] + } } ohos_shared_library("softbus_adapter") { diff --git a/adapter/common/bus_center/network/lnn_netlink_monitor.c b/adapter/common/bus_center/network/lnn_netlink_monitor.c index 917e710a6..23a89aef7 100755 --- a/adapter/common/bus_center/network/lnn_netlink_monitor.c +++ b/adapter/common/bus_center/network/lnn_netlink_monitor.c @@ -76,7 +76,7 @@ static int32_t CreateNetlinkSocket(void) return sockFd; } -static void ParseRtAttr(struct rtattr **tb, int max, struct rtattr *attr, int len) +static void ParseRtAttr(struct rtattr **tb, uint32_t max, struct rtattr *attr, int len) { struct rtattr *attr1 = attr; for (; RTA_OK(attr1, len); attr1 = RTA_NEXT(attr1, len)) { @@ -106,7 +106,6 @@ static void ProcessAddrEvent(struct nlmsghdr *nlh) } } - static void ProcessLinkEvent(struct nlmsghdr *nlh) { int len; @@ -115,7 +114,7 @@ static void ProcessLinkEvent(struct nlmsghdr *nlh) ConnectionAddrType type = CONNECTION_ADDR_MAX; len = (int32_t)nlh->nlmsg_len - NLMSG_SPACE(sizeof(*ifinfo)); - ParseRtAttr(tb, IFLA_MAX, IFLA_RTA(ifinfo), len); + ParseRtAttr(tb, (uint32_t)IFLA_MAX, IFLA_RTA(ifinfo), len); if (tb[IFLA_IFNAME] == NULL) { SoftBusLog(SOFTBUS_LOG_LNN, SOFTBUS_LOG_ERROR, "netlink msg is invalid"); diff --git a/adapter/common/bus_center/platform/bus_center_adapter.c b/adapter/common/bus_center/platform/bus_center_adapter.c index 61222d363..5944ce385 100644 --- a/adapter/common/bus_center/platform/bus_center_adapter.c +++ b/adapter/common/bus_center/platform/bus_center_adapter.c @@ -25,7 +25,7 @@ #include "softbus_common.h" #include "softbus_errcode.h" -#define DEFAULT_DEVICE_NAME "OpenHarmony" +#define DEFAULT_DEVICE_NAME "MineHarmony" int32_t GetCommonDevInfo(const CommonDeviceKey key, char *value, uint32_t len) { diff --git a/adapter/common/kernel/liteos_a/softbus_adapter_file.c b/adapter/common/kernel/liteos_a/softbus_adapter_file.c index 114fd4c7e..325cb6ca2 100644 --- a/adapter/common/kernel/liteos_a/softbus_adapter_file.c +++ b/adapter/common/kernel/liteos_a/softbus_adapter_file.c @@ -68,7 +68,7 @@ static int32_t SoftBusCreateFile(const char *fileName) int32_t SoftBusReadFile(const char *fileName, char *readBuf, uint32_t maxLen) { - if (fileName == NULL || readBuf == NULL || maxLen <= 0) { + if (fileName == NULL || readBuf == NULL || maxLen == 0) { return SOFTBUS_FILE_ERR; } @@ -78,7 +78,7 @@ int32_t SoftBusReadFile(const char *fileName, char *readBuf, uint32_t maxLen) return SOFTBUS_FILE_ERR; } int32_t fileLen = lseek(fd, 0, SEEK_END); - if (fileLen <= 0 || fileLen > maxLen) { + if (fileLen <= 0 || fileLen > (int32_t)maxLen) { HILOG_ERROR(SOFTBUS_HILOG_ID, "ReadFile maxLen failed or over maxLen"); close(fd); return SOFTBUS_FILE_ERR; @@ -101,7 +101,7 @@ int32_t SoftBusReadFile(const char *fileName, char *readBuf, uint32_t maxLen) int32_t SoftBusWriteFile(const char *fileName, const char *writeBuf, uint32_t len) { - if (fileName == NULL || writeBuf == NULL || len <= 0) { + if (fileName == NULL || writeBuf == NULL || len == 0) { return SOFTBUS_FILE_ERR; } if (access(fileName, F_OK) != 0 && SoftBusCreateFile(fileName) != SOFTBUS_OK) { @@ -114,7 +114,7 @@ int32_t SoftBusWriteFile(const char *fileName, const char *writeBuf, uint32_t le return SOFTBUS_FILE_ERR; } int32_t ret = write(fd, writeBuf, len); - if (ret != len) { + if (ret != (int32_t)len) { HILOG_ERROR(SOFTBUS_HILOG_ID, "WriteFile write fail"); close(fd); return SOFTBUS_FILE_ERR; diff --git a/adapter/common/kernel/liteos_a/softbus_adapter_thread.c b/adapter/common/kernel/liteos_a/softbus_adapter_thread.c index 7dd90140d..26da915a2 100644 --- a/adapter/common/kernel/liteos_a/softbus_adapter_thread.c +++ b/adapter/common/kernel/liteos_a/softbus_adapter_thread.c @@ -73,6 +73,7 @@ int32_t SoftBusMutexInit(SoftBusMutex *mutex, SoftBusMutexAttr *mutexAttr) if (ret != 0) { HILOG_ERROR(SOFTBUS_HILOG_ID, "SoftBusMutexInit failed, ret[%{public}d]", ret); SoftBusFree(tempMutex); + tempMutex = NULL; return SOFTBUS_ERR; } @@ -125,10 +126,12 @@ int32_t SoftBusMutexDestroy(SoftBusMutex *mutex) if (ret != 0) { HILOG_ERROR(SOFTBUS_HILOG_ID, "SoftBusMutexDestroy failed, ret[%{public}d]", ret); SoftBusFree((void *)*mutex); + *mutex = (SoftBusMutex)NULL; return SOFTBUS_ERR; } SoftBusFree((void *)*mutex); + *mutex = (SoftBusMutex)NULL; return SOFTBUS_OK; } @@ -374,6 +377,7 @@ int32_t SoftBusCondInit(SoftBusCond *cond) if (ret != 0) { HILOG_ERROR(SOFTBUS_HILOG_ID, "SoftBusCondInit failed, ret[%{public}d]", ret); SoftBusFree(tempCond); + tempCond = NULL; return SOFTBUS_ERR; } @@ -460,9 +464,11 @@ int32_t SoftBusCondDestroy(SoftBusCond *cond) if (ret != 0) { HILOG_ERROR(SOFTBUS_HILOG_ID, "SoftBusCondDestroy failed, ret[%{public}d]", ret); SoftBusFree((void *)*cond); + *cond = (SoftBusCond)NULL; return SOFTBUS_ERR; } SoftBusFree((void *)*cond); + *cond = (SoftBusCond)NULL; return SOFTBUS_OK; } diff --git a/adapter/common/kernel/liteos_m/softbus_adapter_file.c b/adapter/common/kernel/liteos_m/softbus_adapter_file.c index 5a81274da..db3d7f6f8 100644 --- a/adapter/common/kernel/liteos_m/softbus_adapter_file.c +++ b/adapter/common/kernel/liteos_m/softbus_adapter_file.c @@ -22,7 +22,7 @@ int32_t SoftBusReadFile(const char *fileName, char *readBuf, uint32_t maxLen) { - if (fileName == NULL || readBuf == NULL || maxLen <= 0) { + if (fileName == NULL || readBuf == NULL || maxLen == 0) { return SOFTBUS_INVALID_PARAM; } uint32_t fileLen = 0; @@ -67,7 +67,7 @@ int32_t SoftBusWriteFile(const char *fileName, const char *writeBuf, uint32_t le return SOFTBUS_FILE_ERR; } ret = UtilsFileWrite(fd, writeBuf, len); - if (ret != len) { + if (ret != (int32_t)len) { HILOG_ERROR(SOFTBUS_HILOG_ID, "UtilsFileOpen UtilsFileWrite fail"); UtilsFileClose(fd); return SOFTBUS_FILE_ERR; diff --git a/adapter/common/mbedtls/softbus_adapter_crypto.c b/adapter/common/mbedtls/softbus_adapter_crypto.c index 5ee015abe..e2796a552 100644 --- a/adapter/common/mbedtls/softbus_adapter_crypto.c +++ b/adapter/common/mbedtls/softbus_adapter_crypto.c @@ -278,5 +278,6 @@ int32_t SoftBusDecryptData(AesGcmCipherKey *cipherKey, const unsigned char *inpu int32_t SoftBusDecryptDataWithSeq(AesGcmCipherKey *cipherKey, const unsigned char *input, uint32_t inLen, unsigned char *decryptData, uint32_t *decryptLen, int32_t seqNum) { + (void)seqNum; return SoftBusDecryptData(cipherKey, input, inLen, decryptData, decryptLen); } \ No newline at end of file diff --git a/adapter/common/net/bluetooth/include/softbus_adapter_ble_gatt_server.h b/adapter/common/net/bluetooth/include/softbus_adapter_ble_gatt_server.h index 80f96b631..79b030482 100644 --- a/adapter/common/net/bluetooth/include/softbus_adapter_ble_gatt_server.h +++ b/adapter/common/net/bluetooth/include/softbus_adapter_ble_gatt_server.h @@ -72,94 +72,56 @@ typedef enum { } SoftBusGattAttrPermission; typedef struct { - /** 连接索引 */ int connId; - /** transport Id，reserved */ int transId; - /** 设备地址 */ SoftBusBtAddr *btAddr; - /** 请求读的attribute的handle号 */ int attrHandle; - /** 从第一个字节偏移offset个字节开始读，从头读则设置为0 */ int offset; - /** 如果设置为true则这个请求读是Long Read方式 */ bool isLong; } SoftBusGattReadRequest; typedef struct { - /** 连接索引 */ int connId; - /** transport Id，reserved */ int transId; - /** 设备地址 */ SoftBusBtAddr *btAddr; - /** 请求写的attribute的handle号 */ int attrHandle; - /** 从第一个字节偏移offset个字节开始写，从头写则设置为0 */ int offset; - /** 写的数据长度 */ int length; - /** 设置为true表示需要给远端client回复响应，设置为false则不需要回复响应 */ bool needRsp; - /** 设置为true表示Prepare write，设置为false表示立即写 */ bool isPrep; - /** 写的数据 */ unsigned char *value; } SoftBusGattWriteRequest; typedef struct { - /** 添加service后回调 */ void (*ServiceAddCallback)(int status, SoftBusBtUuid *uuid, int srvcHandle); - /** 添加characteristic后回调 */ void (*CharacteristicAddCallback)(int status, SoftBusBtUuid *uuid, int srvcHandle, int characteristicHandle); - /** 添加descriptor后回调 */ void (*DescriptorAddCallback)(int status, SoftBusBtUuid *uuid, int srvcHandle, int descriptorHandle); - /** 启动service后回调 */ void (*ServiceStartCallback)(int status, int srvcHandle); - /** 停止service后回调 */ void (*ServiceStopCallback)(int status, int srvcHandle); - /** 删除service后回调 */ void (*ServiceDeleteCallback)(int status, int srvcHandle); - /** 和远端client连接上回调 */ void (*ConnectServerCallback)(int connId, const SoftBusBtAddr *btAddr); - /** 和远端client断连回调 */ void (*DisconnectServerCallback)(int connId, const SoftBusBtAddr *btAddr); - /** 收到client请求读回调 */ void (*RequestReadCallback)(SoftBusGattReadRequest readCbPara); - /** 收到client请求写回调 */ void (*RequestWriteCallback)(SoftBusGattWriteRequest writeCbPara); - /** 发送响应给远端client后回调 */ void (*ResponseConfirmationCallback)(int status, int handle); - /** 发送indication/notification的回调 */ void (*NotifySentCallback)(int connId, int status); - /** MTU发生变化时回调 */ void (*MtuChangeCallback)(int connId, int mtu); } SoftBusGattsCallback; typedef struct { - /** 连接索引 */ int connectId; - /** 读/写的结果状态，{@link SoftBusGattStatus} */ int status; - /** attribute的handle号 */ int attrHandle; - /** 响应的数据长度 */ int valueLen; - /** 响应的数据 */ char *value; } SoftBusGattsResponse; typedef struct { - /** 连接索引 */ int connectId; - /** attribute的handle号 */ int attrHandle; - /** 1表示发送indication且client需要回复确认，0表示发送notification */ int confirm; - /** 发送的数据长度 */ int valueLen; - /** 发送的数据 */ char *value; } SoftBusGattsNotify; diff --git a/adapter/common/net/wifi/common/softbus_wifi_api_adapter_virtual.c b/adapter/common/net/wifi/common/softbus_wifi_api_adapter_virtual.c old mode 100755 new mode 100644 index fef8c265f..3843356d3 --- a/adapter/common/net/wifi/common/softbus_wifi_api_adapter_virtual.c +++ b/adapter/common/net/wifi/common/softbus_wifi_api_adapter_virtual.c @@ -20,11 +20,14 @@ int32_t SoftBusGetWifiDeviceConfig(SoftBusWifiDevConf *configList, uint32_t *num) { + (void)configList; + (void)num; return SOFTBUS_OK; } int32_t SoftBusConnectToDevice(const SoftBusWifiDevConf *wifiConfig) { + (void)wifiConfig; return SOFTBUS_OK; } diff --git a/adapter/common/net/wifi/net_wifi.gni b/adapter/common/net/wifi/net_wifi.gni index 5eb10a626..829f43034 100755 --- a/adapter/common/net/wifi/net_wifi.gni +++ b/adapter/common/net/wifi/net_wifi.gni @@ -20,7 +20,8 @@ adapter_wifi_inc = [] adapter_wifi_deps = [] if (defined(ohos_lite) || - (defined(device_name) && device_name == "qemu-arm-linux")) { + (defined(device_name) && device_name == "qemu-arm-linux") || + (defined(global_parts_info) && !defined(global_parts_info.communication_wifi_standard))) { if (dsoftbus_standard_feature_lnn_net) { adapter_wifi_src += [ "$softbus_adapter_wifi_path/common/softbus_wifi_api_adapter_virtual.c", diff --git a/adapter/default_config/feature_config/mini/config.gni b/adapter/default_config/feature_config/mini/config.gni index 1a4d09584..6541513a5 100644 --- a/adapter/default_config/feature_config/mini/config.gni +++ b/adapter/default_config/feature_config/mini/config.gni @@ -30,6 +30,7 @@ declare_args() { dsoftbus_standard_feature_lnn_net = true dsoftbus_standard_feature_lnn_time_sync = false dsoftbus_standard_feature_lnn_heartbeat = false + dsoftbus_standard_feature_lnn_multilink_ctrl = true dsoftbus_standard_feature_lnn_meta_node = false dsoftbus_standard_feature_qos = false diff --git a/adapter/default_config/feature_config/small/config.gni b/adapter/default_config/feature_config/small/config.gni index 1f92d8812..5e1d74b2b 100644 --- a/adapter/default_config/feature_config/small/config.gni +++ b/adapter/default_config/feature_config/small/config.gni @@ -30,6 +30,7 @@ declare_args() { dsoftbus_standard_feature_lnn_net = true dsoftbus_standard_feature_lnn_time_sync = true dsoftbus_standard_feature_lnn_heartbeat = false + dsoftbus_standard_feature_lnn_multilink_ctrl = true dsoftbus_standard_feature_lnn_meta_node = false dsoftbus_standard_feature_qos = false diff --git a/adapter/default_config/feature_config/standard/config.gni b/adapter/default_config/feature_config/standard/config.gni index b85dc461b..765148daf 100644 --- a/adapter/default_config/feature_config/standard/config.gni +++ b/adapter/default_config/feature_config/standard/config.gni @@ -30,6 +30,7 @@ declare_args() { dsoftbus_standard_feature_lnn_net = true dsoftbus_standard_feature_lnn_time_sync = true dsoftbus_standard_feature_lnn_heartbeat = true + dsoftbus_standard_feature_lnn_multilink_ctrl = true dsoftbus_standard_feature_lnn_meta_node = true dsoftbus_standard_feature_qos = true diff --git a/adapter/default_config/spec_config/softbus_config_adapter.c b/adapter/default_config/spec_config/softbus_config_adapter.c index b97ad81a2..9b0acf458 100644 --- a/adapter/default_config/spec_config/softbus_config_adapter.c +++ b/adapter/default_config/spec_config/softbus_config_adapter.c @@ -13,8 +13,11 @@ * limitations under the License. */ +#include "softbus_adapter_log.h" #include "softbus_config_adapter.h" +#include + #define MAX_BYTES_LENGTH 4194304 void SoftbusConfigAdapterInit(const ConfigSetProc *sets) @@ -24,4 +27,12 @@ void SoftbusConfigAdapterInit(const ConfigSetProc *sets) sets->SetConfig(SOFTBUS_INT_MAX_BYTES_LENGTH, (unsigned char*)&val, sizeof(val)); val = 0x1; sets->SetConfig(SOFTBUS_INT_AUTH_ABILITY_COLLECTION, (unsigned char*)&val, sizeof(val)); + val = 100; + sets->SetConfig(SOFTBUS_INT_MAX_LNN_CONNECTION_CNT, (unsigned char*)&val, sizeof(val)); + val = SOFTBUS_LOG_INFO; + sets->SetConfig(SOFTBUS_INT_ADAPTER_LOG_LEVEL, (unsigned char*)&val, sizeof(val)); + bool autoNet = false; + sets->SetConfig(SOFTBUS_INT_AUTO_NETWORKING_SWITCH, (unsigned char*)&autoNet, sizeof(autoNet)); + unsigned char netIfName[] = "0:eth0,1:wlan0"; + sets->SetConfig(SOFTBUS_STR_LNN_NET_IF_NAME, (unsigned char*)&netIfName, sizeof(netIfName)); } \ No newline at end of file diff --git a/core/bus_center/lnn/net_builder/src/lnn_exchange_device_info.c b/core/bus_center/lnn/net_builder/src/lnn_exchange_device_info.c index 99fc8b70a..0f7fafa0f 100644 --- a/core/bus_center/lnn/net_builder/src/lnn_exchange_device_info.c +++ b/core/bus_center/lnn/net_builder/src/lnn_exchange_device_info.c @@ -26,7 +26,7 @@ #include "softbus_adapter_mem.h" #include "softbus_errcode.h" -#define DEFAULT_DEVICE_NAME "OpenHarmony" +#define DEFAULT_DEVICE_NAME "MineHarmony" static bool g_tryGetSettingData = true; static int32_t PackCommon(cJSON *json, const NodeInfo *info, SoftBusVersion version) -- Gitee