YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 04:35:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash during rejoin connection

Browse Source
This commit is contained in:
dijunkun
2023-10-10 17:09:24 +08:00
parent 4efaccd5e4
commit aba06f3289
7 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/remote_desk/remote_desk_gui/main.cpp
View File

@@ -1,7 +1,8 @@
#include <SDL.h> #include <SDL.h>
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32 #ifdef _WIN32
#pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"") // #pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")
#pragma comment(linker, "/subsystem:\"console\"")
#include <Winsock2.h> #include <Winsock2.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#elif __APPLE__ #elif __APPLE__
@@ -237,10 +238,10 @@ void ReceiveDataBuffer(const char *data, size_t size, const char *user_id,
ip.mi.time = 0; ip.mi.time = 0;
// Set cursor pos // Set cursor pos
SetCursorPos(ip.mi.dx, ip.mi.dy); // SetCursorPos(ip.mi.dx, ip.mi.dy);
// Send the press // Send the press
if (ip.mi.dwFlags != MOUSEEVENTF_MOVE) { if (ip.mi.dwFlags != MOUSEEVENTF_MOVE) {
SendInput(1, &ip, sizeof(INPUT)); // SendInput(1, &ip, sizeof(INPUT));
} }
std::cout << "Receive data from [" << user << "], " << ip.type << " " std::cout << "Receive data from [" << user << "], " << ip.type << " "
@@ -370,7 +371,12 @@ int main() {
GetMac(mac_addr); GetMac(mac_addr);
peer_server = CreatePeer(&params); peer_server = CreatePeer(&params);
std::string server_user_id = "S-" + std::string(GetMac(mac_addr));
Init(peer_server, server_user_id.c_str());
peer_client = CreatePeer(&params); peer_client = CreatePeer(&params);
std::string client_user_id = "C-" + std::string(GetMac(mac_addr));
Init(peer_client, client_user_id.c_str());
// Setup SDL // Setup SDL
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) != if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) !=
@@ -478,7 +484,7 @@ int main() {
std::string user_id = "S-" + std::string(GetMac(mac_addr)); std::string user_id = "S-" + std::string(GetMac(mac_addr));
if (strcmp(online_label, "Online") == 0) { if (strcmp(online_label, "Online") == 0) {
CreateConnection(peer_server, mac_addr, user_id.c_str()); CreateConnection(peer_server, mac_addr);
nv12_buffer_ = new char[NV12_BUFFER_SIZE]; nv12_buffer_ = new char[NV12_BUFFER_SIZE];
#ifdef _WIN32 #ifdef _WIN32
@@ -554,7 +560,7 @@ int main() {
if (ImGui::Button(connect_label)) { if (ImGui::Button(connect_label)) {
if (strcmp(connect_label, "Connect") == 0 && !joined) { if (strcmp(connect_label, "Connect") == 0 && !joined) {
std::string user_id = "C-" + std::string(GetMac(mac_addr)); std::string user_id = "C-" + std::string(GetMac(mac_addr));
JoinConnection(peer_client, buf, user_id.c_str()); JoinConnection(peer_client, buf);
joined = true; joined = true;
} else if (strcmp(connect_label, "Disconnect") == 0 && joined) { } else if (strcmp(connect_label, "Disconnect") == 0 && joined) {
LeaveConnection(peer_client); LeaveConnection(peer_client);

8
application/signal_server/signal_server.cpp
View File

@@ -164,6 +164,14 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
break; break;
} }
case "leave_transmission"_H: {
std::string transmission_id = j["transmission_id"].get<std::string>();
std::string user_id = j["user_id"].get<std::string>();
LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(),
transmission_id.c_str());
transmission_manager_.ReleaseUserIdFromTransmission(hdl);
break;
}
case "query_user_id_list"_H: { case "query_user_id_list"_H: {
std::string transmission_id = j["transmission_id"].get<std::string>(); std::string transmission_id = j["transmission_id"].get<std::string>();
std::vector<std::string> user_id_list = std::vector<std::string> user_id_list =

8
src/interface/x.h
View File

@@ -27,11 +27,11 @@ typedef struct {
PeerPtr* CreatePeer(const Params* params); PeerPtr* CreatePeer(const Params* params);
int CreateConnection(PeerPtr* peer_ptr, const char* transmission_id, int Init(PeerPtr* peer_ptr, const char* user_id);
const char* user_id);
int JoinConnection(PeerPtr* peer_ptr, const char* transmission_id, int CreateConnection(PeerPtr* peer_ptr, const char* transmission_id);
const char* user_id);
int JoinConnection(PeerPtr* peer_ptr, const char* transmission_id);
int LeaveConnection(PeerPtr* peer_ptr); int LeaveConnection(PeerPtr* peer_ptr);

33
src/pc/peer_connection.cpp
View File

@@ -19,8 +19,11 @@ PeerConnection::~PeerConnection() {
} }
int PeerConnection::Init(PeerConnectionParams params, int PeerConnection::Init(PeerConnectionParams params,
const std::string &transmission_id,
const std::string &user_id) { const std::string &user_id) {
if (inited_) {
LOG_INFO("Peer already inited");
return 0;
}
// Todo: checkout user_id unique or not // Todo: checkout user_id unique or not
user_id_ = user_id; user_id_ = user_id;
@@ -116,6 +119,7 @@ int PeerConnection::Init(PeerConnectionParams params,
return -1; return -1;
} }
inited_ = true;
return 0; return 0;
} }
@@ -176,14 +180,11 @@ int PeerConnection::CreateVideoCodec(bool hardware_acceleration) {
} }
int PeerConnection::Create(PeerConnectionParams params, int PeerConnection::Create(PeerConnectionParams params,
const std::string &transmission_id, const std::string &transmission_id) {
const std::string &user_id) {
int ret = 0; int ret = 0;
// ret = Init(params, transmission_id, user_id);
json message = {{"type", "create_transmission"}, json message = {{"type", "create_transmission"},
{"user_id", user_id}, {"user_id", user_id_},
{"transmission_id", transmission_id}}; {"transmission_id", transmission_id}};
if (ws_transport_) { if (ws_transport_) {
ws_transport_->Send(message.dump()); ws_transport_->Send(message.dump());
@@ -194,24 +195,23 @@ int PeerConnection::Create(PeerConnectionParams params,
} }
int PeerConnection::Join(PeerConnectionParams params, int PeerConnection::Join(PeerConnectionParams params,
const std::string &transmission_id, const std::string &transmission_id) {
const std::string &user_id) {
int ret = 0; int ret = 0;
// ret = Init(params, transmission_id, user_id);
transmission_id_ = transmission_id; transmission_id_ = transmission_id;
ret = RequestTransmissionMemberList(transmission_id_); ret = RequestTransmissionMemberList(transmission_id_);
return ret; return ret;
} }
int PeerConnection::Leave() { int PeerConnection::Leave() {
for (auto &ice_transmission : ice_transmission_list_) { json message = {{"type", "leave_transmission"},
ice_transmission.second->DestroyIceTransmission(); {"user_id", user_id_},
{"transmission_id", transmission_id_}};
if (ws_transport_) {
ws_transport_->Send(message.dump());
LOG_INFO("[{}] sends leave transmission [{}] notification ",
transmission_id_);
} }
ice_transmission_list_.erase(ice_transmission_list_.begin(),
ice_transmission_list_.end());
return 0; return 0;
} }
@@ -256,6 +256,9 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
LOG_INFO("]"); LOG_INFO("]");
for (auto &remote_user_id : user_id_list_) { for (auto &remote_user_id : user_id_list_) {
if (remote_user_id == user_id_) {
continue;
}
ice_transmission_list_[remote_user_id] = ice_transmission_list_[remote_user_id] =
std::make_unique<IceTransmission>(true, transmission_id, user_id_, std::make_unique<IceTransmission>(true, transmission_id, user_id_,
remote_user_id, ws_transport_, remote_user_id, ws_transport_,

10
src/pc/peer_connection.h
View File

@@ -31,15 +31,12 @@ class PeerConnection {
~PeerConnection(); ~PeerConnection();
public: public:
int Init(PeerConnectionParams params, const std::string &transmission_id, int Init(PeerConnectionParams params, const std::string &user_id);
const std::string &user_id);
int Create(PeerConnectionParams params, int Create(PeerConnectionParams params,
const std::string &transmission_id = "", const std::string &transmission_id = "");
const std::string &user_id = "");
int Join(PeerConnectionParams params, const std::string &transmission_id, int Join(PeerConnectionParams params, const std::string &transmission_id);
const std::string &user_id = "");
int Leave(); int Leave();
@@ -100,6 +97,7 @@ class PeerConnection {
OnReceiveBuffer on_receive_audio_buffer_; OnReceiveBuffer on_receive_audio_buffer_;
OnReceiveBuffer on_receive_data_buffer_; OnReceiveBuffer on_receive_data_buffer_;
char *nv12_data_ = nullptr; char *nv12_data_ = nullptr;
bool inited_ = false;
private: private:
std::unique_ptr<VideoEncoder> video_encoder_ = nullptr; std::unique_ptr<VideoEncoder> video_encoder_ = nullptr;

26
src/rtc/x_inner.cpp
View File

@@ -24,29 +24,19 @@ PeerPtr *CreatePeer(const Params *params) {
return peer_ptr; return peer_ptr;
} }
// int CreateConnection(PeerPtr *peer_ptr) { int Init(PeerPtr *peer_ptr, const char *user_id) {
// peer_ptr->peer_connection->Create(peer_ptr->pc_params); peer_ptr->peer_connection->Init(peer_ptr->pc_params, user_id);
// return 0; return 0;
// } }
int CreateConnection(PeerPtr *peer_ptr, const char *transmission_id, int CreateConnection(PeerPtr *peer_ptr, const char *transmission_id) {
const char *user_id) { peer_ptr->peer_connection->Create(peer_ptr->pc_params, transmission_id);
peer_ptr->peer_connection->Init(peer_ptr->pc_params, transmission_id,
user_id);
peer_ptr->peer_connection->Create(peer_ptr->pc_params, transmission_id,
user_id);
LOG_INFO("CreateConnection"); LOG_INFO("CreateConnection");
return 0; return 0;
} }
int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id, int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id) {
const char *user_id) { peer_ptr->peer_connection->Join(peer_ptr->pc_params, transmission_id);
peer_ptr->peer_connection->Init(peer_ptr->pc_params, transmission_id,
user_id);
peer_ptr->peer_connection->Join(peer_ptr->pc_params, transmission_id,
user_id);
LOG_INFO("JoinConnection"); LOG_INFO("JoinConnection");
return 0; return 0;
} }

8
src/transmission/ice_transmission.cpp
View File

@@ -125,11 +125,13 @@ int IceTransmission::InitIceTransmission(std::string &stun_ip, int stun_port,
IceTransmission *ice_transmission_obj = IceTransmission *ice_transmission_obj =
static_cast<IceTransmission *>(user_ptr); static_cast<IceTransmission *>(user_ptr);
LOG_INFO("[{}->{}] state_change: {}", ice_transmission_obj->user_id_, LOG_INFO("[{}->{}] state_change: {}", ice_transmission_obj->user_id_,
ice_transmission_obj->remote_user_id_, ice_status[state]); ice_transmission_obj->remote_user_id_,
juice_state_to_string(state));
ice_transmission_obj->state_ = state; ice_transmission_obj->state_ = state;
ice_transmission_obj->on_ice_status_change_(ice_status[state]); ice_transmission_obj->on_ice_status_change_(
juice_state_to_string(state));
} else { } else {
LOG_INFO("state_change: {}", ice_status[state]); LOG_INFO("state_change: {}", juice_state_to_string(state));
} }
}, },
[](juice_agent_t *agent, const char *sdp, void *user_ptr) { [](juice_agent_t *agent, const char *sdp, void *user_ptr) {