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

Fix crash caused by server leave and rejoin

Browse Source
This commit is contained in:
dijunkun
2023-10-11 17:30:29 +08:00
parent 34274001dc
commit 48b1d025fc
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/signal_server/signal_server.cpp
View File

@@ -176,7 +176,6 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
std::string user_id = j["user_id"].get<std::string>(); std::string user_id = j["user_id"].get<std::string>();
LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(), LOG_INFO("[{}] leaves transmission [{}]", user_id.c_str(),
transmission_id.c_str()); transmission_id.c_str());
transmission_manager_.ReleaseUserIdFromTransmission(hdl);
json message = {{"type", "user_leave_transmission"}, json message = {{"type", "user_leave_transmission"},
{"transmission_id", transmission_id}, {"transmission_id", transmission_id},
@@ -189,6 +188,14 @@ void SignalServer::on_message(websocketpp::connection_hdl hdl,
send_msg(transmission_manager_.GetWsHandle(user_id), message); send_msg(transmission_manager_.GetWsHandle(user_id), message);
} }
transmission_manager_.ReleaseUserIdFromTransmission(hdl);
if (std::string::npos != user_id.find("S-")) {
transmission_list_.erase(transmission_id);
transmission_manager_.ReleaseAllUserIdFromTransmission(transmission_id);
LOG_INFO("Release transmission [{}] due to server leaves",
transmission_id);
}
break; break;
} }
case "query_user_id_list"_H: { case "query_user_id_list"_H: {

3
src/ice/ice_agent.cpp
View File

@@ -143,5 +143,8 @@ int IceAgent::SetRemoteGatheringDone() {
} }
int IceAgent::Send(const char *data, size_t size) { int IceAgent::Send(const char *data, size_t size) {
if (juice_state_t::JUICE_STATE_COMPLETED != juice_get_state(agent_)) {
return -1;
}
return juice_send(agent_, data, size); return juice_send(agent_, data, size);
} }

3
src/pc/peer_connection.cpp
View File

@@ -223,6 +223,8 @@ int PeerConnection::Leave() {
transmission_id_); transmission_id_);
} }
ice_ready_ = false;
for (auto &user_id_it : ice_transmission_list_) { for (auto &user_id_it : ice_transmission_list_) {
user_id_it.second->DestroyIceTransmission(); user_id_it.second->DestroyIceTransmission();
} }
@@ -312,6 +314,7 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
if (user_id_it != ice_transmission_list_.end()) { if (user_id_it != ice_transmission_list_.end()) {
user_id_it->second->DestroyIceTransmission(); user_id_it->second->DestroyIceTransmission();
ice_transmission_list_.erase(user_id_it); ice_transmission_list_.erase(user_id_it);
ice_ready_ = false;
LOG_INFO("Terminate transmission to user [{}]", user_id); LOG_INFO("Terminate transmission to user [{}]", user_id);
if (std::string::npos != user_id.find("S-")) { if (std::string::npos != user_id.find("S-")) {