From aba06f32890f66ef32e5b73a9f4629961116b073 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Tue, 10 Oct 2023 17:09:24 +0800 Subject: [PATCH] Fix crash during rejoin connection --- .../remote_desk/remote_desk_gui/main.cpp | 16 ++++++--- application/signal_server/signal_server.cpp | 8 +++++ src/interface/x.h | 8 ++--- src/pc/peer_connection.cpp | 33 ++++++++++--------- src/pc/peer_connection.h | 10 +++--- src/rtc/x_inner.cpp | 26 +++++---------- src/transmission/ice_transmission.cpp | 8 +++-- 7 files changed, 58 insertions(+), 51 deletions(-) diff --git a/application/remote_desk/remote_desk_gui/main.cpp b/application/remote_desk/remote_desk_gui/main.cpp index dd0a875..e6431d3 100644 --- a/application/remote_desk/remote_desk_gui/main.cpp +++ b/application/remote_desk/remote_desk_gui/main.cpp @@ -1,7 +1,8 @@ #include #include #ifdef _WIN32 -#pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"") +// #pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"") +#pragma comment(linker, "/subsystem:\"console\"") #include #include #elif __APPLE__ @@ -237,10 +238,10 @@ void ReceiveDataBuffer(const char *data, size_t size, const char *user_id, ip.mi.time = 0; // Set cursor pos - SetCursorPos(ip.mi.dx, ip.mi.dy); + // SetCursorPos(ip.mi.dx, ip.mi.dy); // Send the press if (ip.mi.dwFlags != MOUSEEVENTF_MOVE) { - SendInput(1, &ip, sizeof(INPUT)); + // SendInput(1, &ip, sizeof(INPUT)); } std::cout << "Receive data from [" << user << "], " << ip.type << " " @@ -370,7 +371,12 @@ int main() { GetMac(mac_addr); peer_server = CreatePeer(¶ms); + std::string server_user_id = "S-" + std::string(GetMac(mac_addr)); + Init(peer_server, server_user_id.c_str()); + peer_client = CreatePeer(¶ms); + std::string client_user_id = "C-" + std::string(GetMac(mac_addr)); + Init(peer_client, client_user_id.c_str()); // Setup SDL 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)); 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]; #ifdef _WIN32 @@ -554,7 +560,7 @@ int main() { if (ImGui::Button(connect_label)) { if (strcmp(connect_label, "Connect") == 0 && !joined) { std::string user_id = "C-" + std::string(GetMac(mac_addr)); - JoinConnection(peer_client, buf, user_id.c_str()); + JoinConnection(peer_client, buf); joined = true; } else if (strcmp(connect_label, "Disconnect") == 0 && joined) { LeaveConnection(peer_client); diff --git a/application/signal_server/signal_server.cpp b/application/signal_server/signal_server.cpp index ac65f63..0d85ec7 100644 --- a/application/signal_server/signal_server.cpp +++ b/application/signal_server/signal_server.cpp @@ -164,6 +164,14 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl, break; } + case "leave_transmission"_H: { + std::string transmission_id = j["transmission_id"].get(); + std::string user_id = j["user_id"].get(); + LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(), + transmission_id.c_str()); + transmission_manager_.ReleaseUserIdFromTransmission(hdl); + break; + } case "query_user_id_list"_H: { std::string transmission_id = j["transmission_id"].get(); std::vector user_id_list = diff --git a/src/interface/x.h b/src/interface/x.h index 3dafda0..5c45f98 100644 --- a/src/interface/x.h +++ b/src/interface/x.h @@ -27,11 +27,11 @@ typedef struct { PeerPtr* CreatePeer(const Params* params); -int CreateConnection(PeerPtr* peer_ptr, const char* transmission_id, - const char* user_id); +int Init(PeerPtr* peer_ptr, const char* user_id); -int JoinConnection(PeerPtr* peer_ptr, const char* transmission_id, - const char* user_id); +int CreateConnection(PeerPtr* peer_ptr, const char* transmission_id); + +int JoinConnection(PeerPtr* peer_ptr, const char* transmission_id); int LeaveConnection(PeerPtr* peer_ptr); diff --git a/src/pc/peer_connection.cpp b/src/pc/peer_connection.cpp index e0c0bfe..a7011b3 100644 --- a/src/pc/peer_connection.cpp +++ b/src/pc/peer_connection.cpp @@ -19,8 +19,11 @@ PeerConnection::~PeerConnection() { } int PeerConnection::Init(PeerConnectionParams params, - const std::string &transmission_id, const std::string &user_id) { + if (inited_) { + LOG_INFO("Peer already inited"); + return 0; + } // Todo: checkout user_id unique or not user_id_ = user_id; @@ -116,6 +119,7 @@ int PeerConnection::Init(PeerConnectionParams params, return -1; } + inited_ = true; return 0; } @@ -176,14 +180,11 @@ int PeerConnection::CreateVideoCodec(bool hardware_acceleration) { } int PeerConnection::Create(PeerConnectionParams params, - const std::string &transmission_id, - const std::string &user_id) { + const std::string &transmission_id) { int ret = 0; - // ret = Init(params, transmission_id, user_id); - json message = {{"type", "create_transmission"}, - {"user_id", user_id}, + {"user_id", user_id_}, {"transmission_id", transmission_id}}; if (ws_transport_) { ws_transport_->Send(message.dump()); @@ -194,24 +195,23 @@ int PeerConnection::Create(PeerConnectionParams params, } int PeerConnection::Join(PeerConnectionParams params, - const std::string &transmission_id, - const std::string &user_id) { + const std::string &transmission_id) { int ret = 0; - // ret = Init(params, transmission_id, user_id); - transmission_id_ = transmission_id; ret = RequestTransmissionMemberList(transmission_id_); return ret; } int PeerConnection::Leave() { - for (auto &ice_transmission : ice_transmission_list_) { - ice_transmission.second->DestroyIceTransmission(); + json message = {{"type", "leave_transmission"}, + {"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; } @@ -256,6 +256,9 @@ void PeerConnection::ProcessSignal(const std::string &signal) { LOG_INFO("]"); for (auto &remote_user_id : user_id_list_) { + if (remote_user_id == user_id_) { + continue; + } ice_transmission_list_[remote_user_id] = std::make_unique(true, transmission_id, user_id_, remote_user_id, ws_transport_, diff --git a/src/pc/peer_connection.h b/src/pc/peer_connection.h index d4ceafe..a3663a3 100644 --- a/src/pc/peer_connection.h +++ b/src/pc/peer_connection.h @@ -31,15 +31,12 @@ class PeerConnection { ~PeerConnection(); public: - int Init(PeerConnectionParams params, const std::string &transmission_id, - const std::string &user_id); + int Init(PeerConnectionParams params, const std::string &user_id); int Create(PeerConnectionParams params, - const std::string &transmission_id = "", - const std::string &user_id = ""); + const std::string &transmission_id = ""); - int Join(PeerConnectionParams params, const std::string &transmission_id, - const std::string &user_id = ""); + int Join(PeerConnectionParams params, const std::string &transmission_id); int Leave(); @@ -100,6 +97,7 @@ class PeerConnection { OnReceiveBuffer on_receive_audio_buffer_; OnReceiveBuffer on_receive_data_buffer_; char *nv12_data_ = nullptr; + bool inited_ = false; private: std::unique_ptr video_encoder_ = nullptr; diff --git a/src/rtc/x_inner.cpp b/src/rtc/x_inner.cpp index 48ef1ad..c42c54d 100644 --- a/src/rtc/x_inner.cpp +++ b/src/rtc/x_inner.cpp @@ -24,29 +24,19 @@ PeerPtr *CreatePeer(const Params *params) { return peer_ptr; } -// int CreateConnection(PeerPtr *peer_ptr) { -// peer_ptr->peer_connection->Create(peer_ptr->pc_params); -// return 0; -// } +int Init(PeerPtr *peer_ptr, const char *user_id) { + peer_ptr->peer_connection->Init(peer_ptr->pc_params, user_id); + return 0; +} -int CreateConnection(PeerPtr *peer_ptr, const char *transmission_id, - const char *user_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); +int CreateConnection(PeerPtr *peer_ptr, const char *transmission_id) { + peer_ptr->peer_connection->Create(peer_ptr->pc_params, transmission_id); LOG_INFO("CreateConnection"); return 0; } -int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id, - const char *user_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); +int JoinConnection(PeerPtr *peer_ptr, const char *transmission_id) { + peer_ptr->peer_connection->Join(peer_ptr->pc_params, transmission_id); LOG_INFO("JoinConnection"); return 0; } diff --git a/src/transmission/ice_transmission.cpp b/src/transmission/ice_transmission.cpp index 8aa90dc..8202aca 100644 --- a/src/transmission/ice_transmission.cpp +++ b/src/transmission/ice_transmission.cpp @@ -125,11 +125,13 @@ int IceTransmission::InitIceTransmission(std::string &stun_ip, int stun_port, IceTransmission *ice_transmission_obj = static_cast(user_ptr); 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->on_ice_status_change_(ice_status[state]); + ice_transmission_obj->on_ice_status_change_( + juice_state_to_string(state)); } 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) {