openharmony/communication_netstack
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_netstack synced 2024-11-27 00:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

netstack bug fix for tls_socket_server

Browse Source 
Signed-off-by: fanqibing <fanqibing@huawei.com>
This commit is contained in:
fanqibing 2024-11-12 15:03:16 +08:00
parent 5c51f6407c
commit 3f10abb138
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frameworks/js/napi/tls/src/tls_socket_server.cpp
View File

@ -1314,7 +1314,14 @@ void TLSSocketServer::Connection::CallOnMessageCallback(int32_t socketFd, const
}
if (CallBackfunc) {
while (!dataCache_->IsEmpty()) {
CacheInfo cache = dataCache_->Get();
CallBackfunc(socketFd, cache.data, cache.remoteInfo);
}
CallBackfunc(socketFd, data, remoteInfo);
} else {
CacheInfo cache = {data, remoteInfo};
dataCache_->Set(cache);
}
}

31
interfaces/innerkits/tls_socket/include/tls_socket_server.h
View File

@ -46,6 +46,10 @@ namespace OHOS {
namespace NetStack {
namespace TlsSocketServer {
constexpr int USER_LIMIT = 10;
struct CacheInfo {
std::string data;
Socket::SocketRemoteInfo remoteInfo;
};
using OnMessageCallback =
std::function<void(const int &socketFd, const std::string &data, const Socket::SocketRemoteInfo &remoteInfo)>;
using OnCloseCallback = std::function<void(const int &socketFd)>;
@ -400,6 +404,32 @@ public:
void CallOnErrorCallback(int32_t err, const std::string &errString);
class DataCache {
public:
CacheInfo Get()
{
std::lock_guard l(mutex_);
CacheInfo cache = cacheDeque_.front();
cacheDeque_.pop_front();
return cache;
}
void Set(const CacheInfo &data)
{
std::lock_guard l(mutex_);
cacheDeque_.emplace_back(data);
}
bool IsEmpty()
{
std::lock_guard l(mutex_);
return cacheDeque_.empty();
}
private:
std::deque<CacheInfo> cacheDeque_;
std::mutex mutex_;
};
TlsSocket::OnErrorCallback onErrorCallback_;
private:
@ -433,6 +463,7 @@ public:
std::shared_ptr<EventManager> eventManager_ = nullptr;
int32_t clientID_ = 0;
OnMessageCallback onMessageCallback_;
std::shared_ptr<DataCache> dataCache_ = std::make_shared<DataCache>();
};
private: