From a89295a997fa1712a60761995950669f0d73360b Mon Sep 17 00:00:00 2001 From: greada Date: Wed, 23 Mar 2022 17:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90communication=E3=80=91dsoftbus?= =?UTF-8?q?=E8=BD=AF=E6=80=BB=E7=BA=BF=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: greada --- .../common/net_trans_common.c | 216 +++++++++--------- .../common/softbus_test_permission.cpp | 4 +- .../common/softbus_test_permission.h | 2 +- .../softbus_standard/common/wifi_utils.cpp | 18 +- .../network/src/net_bindself_func_test.cpp | 18 +- .../transmission/src/trans_file_func_test.cpp | 16 +- .../transmission/src/trans_func_test.cpp | 6 +- .../src/trans_session_func_test.cpp | 12 +- 8 files changed, 146 insertions(+), 146 deletions(-) diff --git a/communication/softbus_standard/common/net_trans_common.c b/communication/softbus_standard/common/net_trans_common.c index 2140a2e..18b5c4b 100644 --- a/communication/softbus_standard/common/net_trans_common.c +++ b/communication/softbus_standard/common/net_trans_common.c @@ -114,7 +114,7 @@ int Wait(int timeout) return SOFTBUS_OK; } -int WaitNodeCount(int timeout, WaitNodeStateType state, int expectCount) +int WaitNodeCount(int timeout, WaitNodeStateType state, int expectCount) { LOG("Wait4Node,timeout:%d, type:%d, exp count:%d", timeout, state, expectCount); @@ -166,7 +166,7 @@ int WaitNodeCount(int timeout, WaitNodeStateType state, int expectCount) return SOFTBUS_OK; } -int Wait4Session(int timeout, WaitSessionType type) +int Wait4Session(int timeout, WaitSessionType type) { int hitFlag = -1; int t = timeout; @@ -216,7 +216,7 @@ int Wait4Session(int timeout, WaitSessionType type) return SOFTBUS_OK; } -uint64_t GetCurrentTimeOfMs(void) +uint64_t GetCurrentTimeOfMs(void) { int unit = 1000; struct timeval tv; @@ -224,7 +224,7 @@ uint64_t GetCurrentTimeOfMs(void) return (tv.tv_sec * unit + tv.tv_usec / unit); } -char* GetSoftbusPid(void) +char* GetSoftbusPid(void) { FILE* file = NULL; int buffSize = 20; @@ -247,13 +247,13 @@ char* GetSoftbusPid(void) return buffer; } -static int IncrementSubId(void) +static int IncrementSubId(void) { g_subscribeId++; return g_subscribeId; } -static int OnReceiveFileStarted(int sessionId, const char* files, int fileCnt) +static int OnReceiveFileStarted(int sessionId, const char* files, int fileCnt) { LOG("[recv file]start,sid:%d, fileCnt:%d", sessionId, fileCnt); return 0; @@ -262,44 +262,44 @@ static int OnReceiveFileStarted(int sessionId, const char* files, int fileCnt) static int OnReceiveFileProcess(int sessionId, const char* firstFile, uint64_t bytesUpload, - uint64_t bytesTotal) + uint64_t bytesTotal) { return 0; } static void OnReceiveFileFinished(int sessionId, const char* files, - int fileCnt) + int fileCnt) { LOG("[recv file]finish,sid:%d, fileCnt:%d", sessionId, fileCnt); } -static void OnRecvFileTransError(int sessionId) +static void OnRecvFileTransError(int sessionId) { LOG("[recv file]trans error,sid:%d", sessionId); } static int OnSendFileProcess(int sessionId, uint64_t bytesUpload, - uint64_t bytesTotal) + uint64_t bytesTotal) { return 0; } -static int OnSendFileFinished(int sessionId, const char* firstFile) +static int OnSendFileFinished(int sessionId, const char* firstFile) { g_waitFlag = WAIT_SUCCESS_VALUE; LOG("[send file]finish,sid:%d, firstFile:%s\n", sessionId, firstFile); return 0; } -static void OnSendFileTransError(int sessionId) +static void OnSendFileTransError(int sessionId) { g_waitFlag = WAIT_FAIL_VALUE; LOG("[send file]trans error,sid = %d\n", sessionId); } -static void OnDefDeviceFound(const DeviceInfo* device) +static void OnDefDeviceFound(const DeviceInfo* device) { g_discoverTimeEnd = GetCurrentTimeOfMs(); @@ -330,17 +330,17 @@ static void OnDefDeviceFound(const DeviceInfo* device) g_waitFlag = WAIT_SUCCESS_VALUE; } -static void OnDefDiscoverFail(int subscribeId, DiscoveryFailReason failReason) +static void OnDefDiscoverFail(int subscribeId, DiscoveryFailReason failReason) { LOG("[cb]discover fail, sub id:%d, reason:%d", subscribeId, failReason); } -static void OnDefDiscoverSuccess(int subscribeId) +static void OnDefDiscoverSuccess(int subscribeId) { LOG("[cb]discover success, sub id:%d", subscribeId); } -static void OnDefNodeOnline(NodeBasicInfo* info) +static void OnDefNodeOnline(NodeBasicInfo* info) { if (info == NULL) { LOG("[cb]Online: info is null"); @@ -353,7 +353,7 @@ static void OnDefNodeOnline(NodeBasicInfo* info) g_nodeOnlineCount++; } -static void OnDefNodeOffline(NodeBasicInfo* info) +static void OnDefNodeOffline(NodeBasicInfo* info) { if (info == NULL) { LOG("[cb]Offline: info is null"); @@ -365,7 +365,7 @@ static void OnDefNodeOffline(NodeBasicInfo* info) } static void OnDefNodeBasicInfoChanged(NodeBasicInfoType type, - NodeBasicInfo* info) + NodeBasicInfo* info) { if (info == NULL) { LOG("[cb]InfoChanged: info is null, type[%d]", type); @@ -376,7 +376,7 @@ static void OnDefNodeBasicInfoChanged(NodeBasicInfoType type, static void OnJoinNetCallBack(ConnectionAddr* addr, const char* networkId, - int32_t retCode) + int32_t retCode) { g_joinNetTimeEnd = GetCurrentTimeOfMs(); @@ -408,7 +408,7 @@ static void OnJoinNetCallBack(ConnectionAddr* addr, g_waitFlag = WAIT_SUCCESS_VALUE; } -static void OnLeaveNetCallBack(const char* networkId, int32_t ret) +static void OnLeaveNetCallBack(const char* networkId, int32_t ret) { g_leaveNetTimeEnd = GetCurrentTimeOfMs(); @@ -420,7 +420,7 @@ static void OnLeaveNetCallBack(const char* networkId, int32_t ret) } } -static int DataSessionOpened(int sessionId, int result) +static int DataSessionOpened(int sessionId, int result) { // wait 1s, ensure set current session id sleep(ONE_SECOND); @@ -441,7 +441,7 @@ static int DataSessionOpened(int sessionId, int result) return SOFTBUS_OK; } -static void DataSessionClosed(int sessionId) +static void DataSessionClosed(int sessionId) { g_sessionCloseCount4Data++; if (sessionId == g_currentSessionId4Data) { @@ -457,7 +457,7 @@ static void DataSessionClosed(int sessionId) static void CheckReceiveData(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { // check session id if (sessionId == g_currentSessionId4Data && dataLen == g_expectDataSize) { @@ -483,7 +483,7 @@ static void CheckReceiveData(int sessionId, static void DataBytesReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][data]ByteRec start"); CheckReceiveData(sessionId, data, dataLen); @@ -501,7 +501,7 @@ static void DataMessageReceived(int sessionId, LOG("[cb][data]MessageRec end"); } -static int ControlSessionOpened(int sessionId, int result) +static int ControlSessionOpened(int sessionId, int result) { // wait 1s, ensure set current session id sleep(ONE_SECOND); @@ -522,7 +522,7 @@ static int ControlSessionOpened(int sessionId, int result) return SOFTBUS_OK; } -static void ControlSessionClosed(int sessionId) +static void ControlSessionClosed(int sessionId) { g_sessionCloseCount4Ctrl++; if (sessionId == g_currentSessionId4Ctl) { @@ -538,7 +538,7 @@ static void ControlSessionClosed(int sessionId) static void ControlBytesReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][ctrl]ByteRec sid:%d, data len:%u", sessionId, dataLen); if (sessionId < 0 || sessionId > MAX_SESSION_NUM) { @@ -554,7 +554,7 @@ static void ControlBytesReceived(int sessionId, static void ControlMessageReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][ctrl]MessageRec sid:%d, data len:%u", sessionId, dataLen); if (sessionId < 0 || sessionId > MAX_SESSION_NUM) { @@ -568,7 +568,7 @@ static void ControlMessageReceived(int sessionId, g_recvMsgStat4Control[sessionId]++; } -static int PassiveSessionOpened(int sessionId, int result) +static int PassiveSessionOpened(int sessionId, int result) { LOG("[cb][pass]open session passive sid[%d],rst[%d]", sessionId, result); if (result == SOFTBUS_OK) { @@ -585,7 +585,7 @@ static int PassiveSessionOpened(int sessionId, int result) } } -static void PassiveSessionClosed(int sessionId) +static void PassiveSessionClosed(int sessionId) { LOG("[cb][pass]close session passive sid[%d]", sessionId); g_waitFlag = WAIT_SUCCESS_VALUE; @@ -593,7 +593,7 @@ static void PassiveSessionClosed(int sessionId) static void PassiveBytesReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][pass]ByteRec sid:%d, data len:%u", sessionId, dataLen); if (data == NULL) { @@ -612,7 +612,7 @@ static void PassiveBytesReceived(int sessionId, static void PassiveMessageReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][pass]MessageRec sid:%d, data len:%u", sessionId, dataLen); if (data == NULL) { @@ -629,7 +629,7 @@ static void PassiveMessageReceived(int sessionId, } } -static int PerfSessionOpened(int sessionId, int result) +static int PerfSessionOpened(int sessionId, int result) { g_openSessionTimeEnd = GetCurrentTimeOfMs(); @@ -642,14 +642,14 @@ static int PerfSessionOpened(int sessionId, int result) return SOFTBUS_OK; } -static void PerfSessionClosed(int sessionId) +static void PerfSessionClosed(int sessionId) { LOG("[cb][perf]closed session,sid[%d]", sessionId); } static void PerfBytesReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { g_transTimeEnd = GetCurrentTimeOfMs(); @@ -659,12 +659,12 @@ static void PerfBytesReceived(int sessionId, static void PerfMessageReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][perf]Message recv"); } -static int ProxySessionOpened(int sessionId, int result) +static int ProxySessionOpened(int sessionId, int result) { LOG("[cb][proxy]open session proxy sid[%d],rst[%d]", sessionId, result); if (result == SOFTBUS_OK) { @@ -675,7 +675,7 @@ static int ProxySessionOpened(int sessionId, int result) return SOFTBUS_OK; } -static void ProxySessionClosed(int sessionId) +static void ProxySessionClosed(int sessionId) { LOG("[cb][proxy]close session proxy sid[%d]", sessionId); g_waitFlag = WAIT_SUCCESS_VALUE; @@ -683,7 +683,7 @@ static void ProxySessionClosed(int sessionId) static void ProxyBytesReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][proxy]ByteRec sid:%d, data len:%u", sessionId, dataLen); if (data == NULL) { @@ -696,7 +696,7 @@ static void ProxyBytesReceived(int sessionId, static void ProxyMessageReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][proxy]MessageRec sid:%d, data len:%u", sessionId, dataLen); if (data == NULL) { @@ -707,32 +707,32 @@ static void ProxyMessageReceived(int sessionId, } } -void ResetWaitFlag(void) +void ResetWaitFlag(void) { g_waitFlag = WAIT_DEF_VALUE; } -void ResetWaitFlag4Data(void) +void ResetWaitFlag4Data(void) { g_waitFlag4Data = WAIT_DEF_VALUE; } -void ResetWaitFlag4Ctl(void) +void ResetWaitFlag4Ctl(void) { g_waitFlag4Ctl = WAIT_DEF_VALUE; } -void ResetWaitCount4Offline(void) +void ResetWaitCount4Offline(void) { g_nodeOfflineCount = 0; } -void ResetWaitCount4Online(void) +void ResetWaitCount4Online(void) { g_nodeOnlineCount = 0; } -int StartDiscoveryDevice(void) +int StartDiscoveryDevice(void) { int ret; int timeout = 10; @@ -752,7 +752,7 @@ int StartDiscoveryDevice(void) return ret; } -int JoinNetwork(void) +int JoinNetwork(void) { int ret; int timeout = 15; @@ -770,7 +770,7 @@ int JoinNetwork(void) return ret; } -int JoinNetworkByAddr(ConnectionAddr* addr) +int JoinNetworkByAddr(ConnectionAddr* addr) { int ret; int timeout = 15; @@ -792,7 +792,7 @@ int JoinNetworkByAddr(ConnectionAddr* addr) return ret; } -int DiscoverAndJoinNetwork(void) +int DiscoverAndJoinNetwork(void) { int ret = StartDiscoveryDevice(); int retStop = StopDiscovery(DEF_PKG_NAME, g_subscribeId); @@ -807,7 +807,7 @@ int DiscoverAndJoinNetwork(void) return JoinNetwork(); } -int LeaveNetWork(void) +int LeaveNetWork(void) { int ret; int timeout = 10; @@ -832,17 +832,17 @@ int LeaveNetWork(void) return ret; } -int RegisterDeviceStateDefCallback(void) +int RegisterDeviceStateDefCallback(void) { return RegNodeDeviceStateCb(DEF_PKG_NAME, &g_defNodeStateCallback); } -int UnRegisterDeviceStateDefCallback(void) +int UnRegisterDeviceStateDefCallback(void) { return UnregNodeDeviceStateCb(&g_defNodeStateCallback); } -int CreateSsAndOpenSession4Data(void) +int CreateSsAndOpenSession4Data(void) { int ret; int timeout = 10; @@ -881,7 +881,7 @@ int CreateSsAndOpenSession4Data(void) return ret; } -int OpenSession4Data(void) +int OpenSession4Data(void) { int ret; int sessionId; @@ -904,7 +904,7 @@ int OpenSession4Data(void) return ret; } -int CreateSsAndOpenSession4Ctl(void) +int CreateSsAndOpenSession4Ctl(void) { int ret; int timeout = 10; @@ -942,7 +942,7 @@ int CreateSsAndOpenSession4Ctl(void) return ret; } -int OpenSession4Ctl(void) +int OpenSession4Ctl(void) { int ret; int timeout = 10; @@ -965,7 +965,7 @@ int OpenSession4Ctl(void) return ret; } -int SendCtrlMsgToRemote(CtrlCodeType code) +int SendCtrlMsgToRemote(CtrlCodeType code) { int ret = -1; switch (code) { @@ -1062,7 +1062,7 @@ int SendCtrlMsgToRemote(CtrlCodeType code) return ret; } -int SendData4Data(DataType type, int size) +int SendData4Data(DataType type, int size) { int ret; if (size > 0) { @@ -1106,7 +1106,7 @@ int SendData4Data(DataType type, int size) } // if open session success, return session id -int OpenSession4Perf(void) +int OpenSession4Perf(void) { int ret; int sessionId; @@ -1129,7 +1129,7 @@ int OpenSession4Perf(void) int OpenSession4PerfWithParam(const char* sessionName, const char* groupId, - char* netId) + char* netId) { int ret; int sessionId; @@ -1150,7 +1150,7 @@ int OpenSession4PerfWithParam(const char* sessionName, return sessionId; } -int SendData4Perf(int sessionId, char* dataMsg, char* dataByte) +int SendData4Perf(int sessionId, char* dataMsg, char* dataByte) { int sleeptime = 500000; int timeout = 5; @@ -1182,12 +1182,12 @@ int SendData4Perf(int sessionId, char* dataMsg, char* dataByte) return isHitFail; } -void SetTransStartTime(void) +void SetTransStartTime(void) { g_transTimeStart = GetCurrentTimeOfMs(); } -int CloseSessionAndRemoveSs4Data(void) +int CloseSessionAndRemoveSs4Data(void) { int ret4Close; int timeout = 2; @@ -1212,7 +1212,7 @@ int CloseSessionAndRemoveSs4Data(void) } } -int CloseSessionAndRemoveSs4Ctl(void) +int CloseSessionAndRemoveSs4Ctl(void) { int ret4Close; int timeout = 2; @@ -1238,7 +1238,7 @@ int CloseSessionAndRemoveSs4Ctl(void) int OpenSessionBatch4Data(char groupId[][GROUP_ID_LEN], int* sessionId, - int count) + int count) { int ret; int timeout = 10; @@ -1265,7 +1265,7 @@ int OpenSessionBatch4Data(char groupId[][GROUP_ID_LEN], int OpenSessionBatch4Ctl(char groupId[][GROUP_ID_LEN], int* sessionId, - int count) + int count) { int ret; int timeout = 10; @@ -1290,7 +1290,7 @@ int OpenSessionBatch4Ctl(char groupId[][GROUP_ID_LEN], return rstFlag; } -int CloseSessionBatch4Data(int* sessionId, int count) +int CloseSessionBatch4Data(int* sessionId, int count) { for (int i = 0; i < count; i++) { int sid = *(sessionId + i); @@ -1302,7 +1302,7 @@ int CloseSessionBatch4Data(int* sessionId, int count) return SOFTBUS_OK; } -int CloseSessionBatch4Ctl(int* sessionId, int count) +int CloseSessionBatch4Ctl(int* sessionId, int count) { for (int i = 0; i < count; i++) { int sid = *(sessionId + i); @@ -1314,7 +1314,7 @@ int CloseSessionBatch4Ctl(int* sessionId, int count) return SOFTBUS_OK; } -void* OpenSessionTask4Data(void* param) +void* OpenSessionTask4Data(void* param) { LOG("OpenSessionTask[Data] start"); int ret; @@ -1361,7 +1361,7 @@ void* OpenSessionTask4Data(void* param) return NULL; } -void* OpenSessionTask4Ctl(void* param) +void* OpenSessionTask4Ctl(void* param) { LOG("OpenSessionTask[Ctrl] start"); int ret; @@ -1409,82 +1409,82 @@ void* OpenSessionTask4Ctl(void* param) } // set/get function -void ResetClosedSessionCount4Data(void) +void ResetClosedSessionCount4Data(void) { g_sessionCloseCount4Data = 0; } -void ResetClosedSessionCount4Ctrl(void) +void ResetClosedSessionCount4Ctrl(void) { g_sessionCloseCount4Ctrl = 0; } -int GetClosedSessionCount4Data(void) +int GetClosedSessionCount4Data(void) { return g_sessionCloseCount4Data; } -int GetClosedSessionCount4Ctrl(void) +int GetClosedSessionCount4Ctrl(void) { return g_sessionCloseCount4Ctrl; } -void ResetOpenSessionCount4Data(void) +void ResetOpenSessionCount4Data(void) { g_sessionOpenCount4Data = 0; } -void ResetOpenSessionCount4Ctrl(void) +void ResetOpenSessionCount4Ctrl(void) { g_sessionOpenCount4Ctrl = 0; } -int GetOpenSessionCount4Data(void) +int GetOpenSessionCount4Data(void) { return g_sessionOpenCount4Data; } -int GetOpenSessionCount4Ctrl(void) +int GetOpenSessionCount4Ctrl(void) { return g_sessionOpenCount4Ctrl; } -int* GetSid4Task2(void) +int* GetSid4Task2(void) { return g_sId4Task2; } -int* GetSid4Task3(void) +int* GetSid4Task3(void) { return g_sId4Task3; } -void ResetMsgStat4Control(void) +void ResetMsgStat4Control(void) { for (int i = 0; i < MAX_SESSION_NUM; i++) { g_recvMsgStat4Control[i] = 0; } } -void ResetByteStat4Control(void) +void ResetByteStat4Control(void) { for (int i = 0; i < MAX_SESSION_NUM; i++) { g_recvByteStat4Control[i] = 0; } } -pthread_barrier_t* GetThreadBarrier(void) +pthread_barrier_t* GetThreadBarrier(void) { return g_barrier; } -char* GetNetworkId(void) +char* GetNetworkId(void) { return g_networkId; } // To one device only -int CheckRemoteDeviceIsNull(int isSetNetId) +int CheckRemoteDeviceIsNull(int isSetNetId) { int nodeNum = 0; NodeBasicInfo* nodeInfo = NULL; @@ -1504,7 +1504,7 @@ int CheckRemoteDeviceIsNull(int isSetNetId) } } -int GetRemoteDeviceNetId(char** netId) +int GetRemoteDeviceNetId(char** netId) { int nodeNum = 0; NodeBasicInfo* nodeInfo = NULL; @@ -1529,7 +1529,7 @@ int GetRemoteDeviceNetId(char** netId) } // get remote device network id, then set to global array -int SetRemoteDeviceNetIdToGarray(void) +int SetRemoteDeviceNetIdToGarray(void) { int nodeNum = 0; NodeBasicInfo* nodeInfo = NULL; @@ -1551,7 +1551,7 @@ int SetRemoteDeviceNetIdToGarray(void) return nodeNum; } -int SetCurrentNetworkId(int index) +int SetCurrentNetworkId(int index) { if (index < 0 || index >= MULTI_REMOTE_DEV_COUNT) { LOG("input index is error"); @@ -1566,62 +1566,62 @@ int SetCurrentNetworkId(int index) return SOFTBUS_OK; } -ISessionListener* GetSessionListenser4Data(void) +ISessionListener* GetSessionListenser4Data(void) { return g_sessionlistener4Data; } -ISessionListener* GetSessionListenser4Ctl(void) +ISessionListener* GetSessionListenser4Ctl(void) { return g_sessionlistener4Ctl; } -ISessionListener* GetSessionListenser4Pass(void) +ISessionListener* GetSessionListenser4Pass(void) { return g_sessionlistener4Pass; } -ISessionListener* GetSessionListenser4Perf(void) +ISessionListener* GetSessionListenser4Perf(void) { return g_sessionlistener4Perf; } -ISessionListener* GetSessionListenser4Proxy(void) +ISessionListener* GetSessionListenser4Proxy(void) { return g_sessionlistener4Proxy; } -IFileSendListener* GetSendFileListener(void) +IFileSendListener* GetSendFileListener(void) { return g_fileSendListener; } -IFileReceiveListener* GetRecvFileListener(void) +IFileReceiveListener* GetRecvFileListener(void) { return g_fileRecvListener; } -SessionAttribute* GetSessionAttr4Data(void) +SessionAttribute* GetSessionAttr4Data(void) { return g_sessionAttr4Data; } -SessionAttribute* GetSessionAttr4Ctl(void) +SessionAttribute* GetSessionAttr4Ctl(void) { return g_sessionAttr4Ctl; } -SessionAttribute* GetSessionAttr4Pass(void) +SessionAttribute* GetSessionAttr4Pass(void) { return g_sessionAttr4Pass; } -SessionAttribute* GetSessionAttr4Perf(void) +SessionAttribute* GetSessionAttr4Perf(void) { return g_sessionAttr4Perf; } -SessionAttribute* GetSessionAttr4Proxy(void) +SessionAttribute* GetSessionAttr4Proxy(void) { return g_sessionAttr4Proxy; } @@ -1631,37 +1631,37 @@ void SetCurrentSessionId4Data(int sessionId) g_currentSessionId4Data = sessionId; } -void SetCurrentSessionId4Ctl(int sessionId) +void SetCurrentSessionId4Ctl(int sessionId) { g_currentSessionId4Ctl = sessionId; } -int GetCurrentSessionId4Data(void) +int GetCurrentSessionId4Data(void) { return g_currentSessionId4Data; } -int GetCurrentSessionId4Ctl(void) +int GetCurrentSessionId4Ctl(void) { return g_currentSessionId4Ctl; } -int GetThreadResult4Data(void) +int GetThreadResult4Data(void) { return g_threadResult4Data; } -int GetThreadResult4Ctl(void) +int GetThreadResult4Ctl(void) { return g_threadResult4Ctl; } -ConnectionAddr* GetConnectAddr(void) +ConnectionAddr* GetConnectAddr(void) { return &g_ethAddr; } -void TestSetUp(void) +void TestSetUp(void) { g_defNodeStateCallback.events = EVENT_NODE_STATE_MASK; g_defNodeStateCallback.onNodeOnline = OnDefNodeOnline; @@ -1767,7 +1767,7 @@ void TestSetUp(void) } } -void TestTearDown(void) +void TestTearDown(void) { if (g_sessionlistener4Data != NULL) { free(g_sessionlistener4Data); diff --git a/communication/softbus_standard/common/softbus_test_permission.cpp b/communication/softbus_standard/common/softbus_test_permission.cpp index 3a31f08..b0f4199 100644 --- a/communication/softbus_standard/common/softbus_test_permission.cpp +++ b/communication/softbus_standard/common/softbus_test_permission.cpp @@ -31,7 +31,7 @@ const static std::string TEST_DESCRIPTION = "test description"; const static int TEST_LABEL_ID = 9527; const static int TEST_DESCRIPTION_ID = 9528; -void SoftBus_Test_Permission::AddPermission(const string& pkgName) +void SoftBus_Test_Permission::AddPermission(const string& pkgName) { std::vector permDefList; PermissionDef permissionDefAlpha = {.permissionName = SYSTEM_APP_PERMISSION, @@ -72,7 +72,7 @@ void SoftBus_Test_Permission::AddPermission(const string& pkgName) PermissionKit::GrantSystemGrantedPermission(pkgName, BIND_DISCOVER_SERVICE); } -void SoftBus_Test_Permission::RemovePermission(const string& pkgName) +void SoftBus_Test_Permission::RemovePermission(const string& pkgName) { PermissionKit::RemoveDefPermissions(pkgName); PermissionKit::RemoveSystemGrantedReqPermissions(pkgName); diff --git a/communication/softbus_standard/common/softbus_test_permission.h b/communication/softbus_standard/common/softbus_test_permission.h index 3d3a249..ed0c8d2 100644 --- a/communication/softbus_standard/common/softbus_test_permission.h +++ b/communication/softbus_standard/common/softbus_test_permission.h @@ -15,7 +15,7 @@ #ifndef TEST_PERMISSION_H #define TEST_PERMISSION_H - + #include class SoftBus_Test_Permission { diff --git a/communication/softbus_standard/common/wifi_utils.cpp b/communication/softbus_standard/common/wifi_utils.cpp index 1f24ba1..3558881 100644 --- a/communication/softbus_standard/common/wifi_utils.cpp +++ b/communication/softbus_standard/common/wifi_utils.cpp @@ -22,7 +22,7 @@ using namespace OHOS::Wifi; const static int WIFI_SA_ID = 1125; unique_ptr wifiDevicePtr = WifiDevice::GetInstance(WIFI_SA_ID); -int WiFiUtils::EnableWifi() +int WiFiUtils::EnableWifi() { bool isActive = false; int ret = wifiDevicePtr->IsWifiActive(isActive); @@ -65,7 +65,7 @@ int WiFiUtils::EnableWifi() } } -int WiFiUtils::DisableWifi() +int WiFiUtils::DisableWifi() { bool isActive = false; int ret = wifiDevicePtr->IsWifiActive(isActive); @@ -108,7 +108,7 @@ int WiFiUtils::DisableWifi() } } -int WiFiUtils::DisableThenEnable(int delaySeconds) +int WiFiUtils::DisableThenEnable(int delaySeconds) { int ret; ret = DisableWifi(); @@ -124,7 +124,7 @@ int WiFiUtils::DisableThenEnable(int delaySeconds) return ret; } -int WiFiUtils::CheckIsConnectToDefault(void) +int WiFiUtils::CheckIsConnectToDefault(void) { WifiLinkedInfo linkInfo; int ret = wifiDevicePtr->GetLinkedInfo(linkInfo); @@ -148,7 +148,7 @@ int WiFiUtils::CheckIsConnectToDefault(void) return SOFTBUS_ERR; } -int WiFiUtils::ConnectTo(const std::string& ssid, const std::string& passwd) +int WiFiUtils::ConnectTo(const std::string& ssid, const std::string& passwd) { WifiDeviceConfig deviceConfig; deviceConfig.ssid = ssid; @@ -204,7 +204,7 @@ int WiFiUtils::ConnectTo(const std::string& ssid, const std::string& passwd) } int WiFiUtils::ConnectToNew(const std::string& ssid, - const std::string& passwd) + const std::string& passwd) { int ret = wifiDevicePtr->Disconnect(); LOG("[wifi]call Disconnect ret:%d", ret); @@ -212,7 +212,7 @@ int WiFiUtils::ConnectToNew(const std::string& ssid, return ret; } -int WiFiUtils::ConnectToOpenAP(const std::string& ssid) +int WiFiUtils::ConnectToOpenAP(const std::string& ssid) { WifiDeviceConfig deviceConfig; deviceConfig.ssid = ssid; @@ -256,7 +256,7 @@ int WiFiUtils::ConnectToOpenAP(const std::string& ssid) } int WiFiUtils::EnableThenConnect(const std::string& ssid, - const std::string& passwd) + const std::string& passwd) { int ret = EnableWifi(); if (ret != SOFTBUS_OK) { @@ -272,7 +272,7 @@ int WiFiUtils::EnableThenConnect(const std::string& ssid, int WiFiUtils::DisableThenEnableAndConnect(int delaySeconds, const std::string& ssid, - const std::string& passwd) + const std::string& passwd) { int ret; ret = DisableWifi(); diff --git a/communication/softbus_standard/network/src/net_bindself_func_test.cpp b/communication/softbus_standard/network/src/net_bindself_func_test.cpp index 6e7781e..65067ef 100644 --- a/communication/softbus_standard/network/src/net_bindself_func_test.cpp +++ b/communication/softbus_standard/network/src/net_bindself_func_test.cpp @@ -32,7 +32,7 @@ void Net_Bindself_Func_Test::SetUp() {} void Net_Bindself_Func_Test::TearDown() {} -void Net_Bindself_Func_Test::SetUpTestCase() +void Net_Bindself_Func_Test::SetUpTestCase() { LOG("[SetUp] begin"); TestSetUp(); @@ -44,7 +44,7 @@ void Net_Bindself_Func_Test::SetUpTestCase() LOG("[SetUp] end"); } -void Net_Bindself_Func_Test::TearDownTestCase() +void Net_Bindself_Func_Test::TearDownTestCase() { int ret = UnRegisterDeviceStateDefCallback(); EXPECT_EQ(SOFTBUS_OK, ret) << "call unReg node state callback fail"; @@ -53,7 +53,7 @@ void Net_Bindself_Func_Test::TearDownTestCase() SoftBus_Test_Permission::RemovePermission(DEF_PKG_NAME); } -static void WaitOnly(int seconds) +static void WaitOnly(int seconds) { if (seconds < TEN_SECOND) { sleep(seconds); @@ -75,7 +75,7 @@ static void WaitOnly(int seconds) */ HWTEST_F(Net_Bindself_Func_Test, SUB_Softbus_Net_Bind_Func_0100, - TestSize.Level3) + TestSize.Level3) { char* netId = NULL; int count = GetRemoteDeviceNetId(&netId); @@ -97,7 +97,7 @@ HWTEST_F(Net_Bindself_Func_Test, */ HWTEST_F(Net_Bindself_Func_Test, SUB_Softbus_Net_Bind_Func_0200, - TestSize.Level3) + TestSize.Level3) { int ret = StartDiscoveryDevice(); EXPECT_EQ(SOFTBUS_OK, ret) << "Discover fail"; @@ -112,7 +112,7 @@ HWTEST_F(Net_Bindself_Func_Test, */ HWTEST_F(Net_Bindself_Func_Test, SUB_Softbus_Net_Bind_Func_0300, - TestSize.Level3) + TestSize.Level3) { int ret = CheckRemoteDeviceIsNull(BOOL_FALSE); EXPECT_EQ(SOFTBUS_OK, ret) << "check node fail"; @@ -127,7 +127,7 @@ HWTEST_F(Net_Bindself_Func_Test, */ HWTEST_F(Net_Bindself_Func_Test, SUB_Softbus_Net_Bind_Func_0400, - TestSize.Level3) + TestSize.Level3) { int nodeCount = SetRemoteDeviceNetIdToGarray(); LOG("######node count:%d", nodeCount); @@ -144,7 +144,7 @@ HWTEST_F(Net_Bindself_Func_Test, */ HWTEST_F(Net_Bindself_Func_Test, SUB_Softbus_Net_Bind_Func_0500, - TestSize.Level3) + TestSize.Level3) { int ret = CheckRemoteDeviceIsNull(BOOL_TRUE); EXPECT_EQ(SOFTBUS_OK, ret) << "check node fail"; @@ -185,7 +185,7 @@ HWTEST_F(Net_Bindself_Func_Test, */ HWTEST_F(Net_Bindself_Func_Test, SUB_Softbus_Net_Bind_Func_0600, - TestSize.Level2) + TestSize.Level2) { int ret; int size = 1024; diff --git a/communication/softbus_standard/transmission/src/trans_file_func_test.cpp b/communication/softbus_standard/transmission/src/trans_file_func_test.cpp index d27f606..80e6ab7 100644 --- a/communication/softbus_standard/transmission/src/trans_file_func_test.cpp +++ b/communication/softbus_standard/transmission/src/trans_file_func_test.cpp @@ -20,7 +20,7 @@ static int g_waitFlag = WAIT_DEF_VALUE; -static int FileSessionOpened(int sessionId, int result) +static int FileSessionOpened(int sessionId, int result) { LOG("[cb][file]open session sid[%d],rst[%d]", sessionId, result); if (result == SOFTBUS_OK) { @@ -31,14 +31,14 @@ static int FileSessionOpened(int sessionId, int result) return SOFTBUS_OK; } -static void FileSessionClosed(int sessionId) +static void FileSessionClosed(int sessionId) { LOG("[cb][file]close session sid[%d]", sessionId); } static void FileBytesReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][file]ByteRec sid:%d, data len:%d", sessionId, dataLen); if (data == NULL) { @@ -51,7 +51,7 @@ static void FileBytesReceived(int sessionId, static void FileMessageReceived(int sessionId, const void* data, - unsigned int dataLen) + unsigned int dataLen) { LOG("[cb][file]MessageRec sid:%d, data len:%d", sessionId, dataLen); if (data == NULL) { @@ -93,7 +93,7 @@ void TransFileFuncTest::SetUp() {} void TransFileFuncTest::TearDown() {} -void TransFileFuncTest::SetUpTestCase() +void TransFileFuncTest::SetUpTestCase() { LOG("SetUp begin"); TestSetUp(); @@ -115,7 +115,7 @@ void TransFileFuncTest::SetUpTestCase() LOG("SetUp end"); } -void TransFileFuncTest::TearDownTestCase() +void TransFileFuncTest::TearDownTestCase() { int ret = UnRegisterDeviceStateDefCallback(); EXPECT_EQ(SOFTBUS_OK, ret) << "call unReg node state callback fail"; @@ -124,7 +124,7 @@ void TransFileFuncTest::TearDownTestCase() SoftBus_Test_Permission::RemovePermission(DEF_PKG_NAME); } -int WaitFile(int timeout) +int WaitFile(int timeout) { LOG("start waitfile,timeout:%d", timeout); int count = 0; @@ -155,7 +155,7 @@ int WaitFile(int timeout) */ HWTEST_F(TransFileFuncTest, SUB_Softbus_Trans_SendFile_Func_0100, - TestSize.Level2) + TestSize.Level2) { int ret; ret = CreateSessionServer(DEF_PKG_NAME, SESSION_NAME_FILE, diff --git a/communication/softbus_standard/transmission/src/trans_func_test.cpp b/communication/softbus_standard/transmission/src/trans_func_test.cpp index fe5aa4b..adc76e5 100644 --- a/communication/softbus_standard/transmission/src/trans_func_test.cpp +++ b/communication/softbus_standard/transmission/src/trans_func_test.cpp @@ -35,7 +35,7 @@ void TransFuncTest::SetUp() {} void TransFuncTest::TearDown() {} -void TransFuncTest::SetUpTestCase() +void TransFuncTest::SetUpTestCase() { LOG("SetUp begin"); TestSetUp(); @@ -67,7 +67,7 @@ void TransFuncTest::TearDownTestCase() * @tc.type : FUNC * @tc.size : MediumTest */ -HWTEST_F(TransFuncTest, SUB_Softbus_Trans_SendByte_Func_0100, TestSize.Level3) +HWTEST_F(TransFuncTest, SUB_Softbus_Trans_SendByte_Func_0100, TestSize.Level3) { int ret; ret = CreateSsAndOpenSession4Data(); @@ -90,7 +90,7 @@ HWTEST_F(TransFuncTest, SUB_Softbus_Trans_SendByte_Func_0100, TestSize.Level3) */ HWTEST_F(TransFuncTest, SUB_Softbus_Trans_SendMessage_Func_0100, - TestSize.Level3) + TestSize.Level3) { int ret; ret = CreateSsAndOpenSession4Data(); diff --git a/communication/softbus_standard/transmission/src/trans_session_func_test.cpp b/communication/softbus_standard/transmission/src/trans_session_func_test.cpp index e58ec22..efb316d 100644 --- a/communication/softbus_standard/transmission/src/trans_session_func_test.cpp +++ b/communication/softbus_standard/transmission/src/trans_session_func_test.cpp @@ -35,7 +35,7 @@ void TransSessionFuncTest::SetUp() {} void TransSessionFuncTest::TearDown() {} -void TransSessionFuncTest::SetUpTestCase() +void TransSessionFuncTest::SetUpTestCase() { LOG("SetUp begin"); TestSetUp(); @@ -54,7 +54,7 @@ void TransSessionFuncTest::SetUpTestCase() LOG("SetUp end"); } -void TransSessionFuncTest::TearDownTestCase() +void TransSessionFuncTest::TearDownTestCase() { int ret = UnRegisterDeviceStateDefCallback(); EXPECT_EQ(SOFTBUS_OK, ret) << "call unReg node state callback fail"; @@ -75,7 +75,7 @@ void TransSessionFuncTest::TearDownTestCase() */ HWTEST_F(TransSessionFuncTest, SUB_Softbus_Trans_Session_Func_0100, - TestSize.Level3) + TestSize.Level3) { int ret; char sessionNames[][SESSION_NAME_SIZE_MAX] = { @@ -112,7 +112,7 @@ HWTEST_F(TransSessionFuncTest, */ HWTEST_F(TransSessionFuncTest, SUB_Softbus_Trans_Session_Func_0200, - TestSize.Level3) + TestSize.Level3) { int ret; ret = CreateSessionServer(DEF_PKG_NAME, SESSION_NAME_DATA, @@ -162,7 +162,7 @@ HWTEST_F(TransSessionFuncTest, */ HWTEST_F(TransSessionFuncTest, SUB_Softbus_Trans_Session_Func_0300, - TestSize.Level3) + TestSize.Level3) { int ret; ret = CreateSsAndOpenSession4Data(); @@ -195,7 +195,7 @@ HWTEST_F(TransSessionFuncTest, */ HWTEST_F(TransSessionFuncTest, SUB_Softbus_Trans_Session_Func_0400, - TestSize.Level3) + TestSize.Level3) { int ret; ret = CreateSsAndOpenSession4Ctl();