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 caused by the initialization of answer peer ahead of offer peer

Browse Source
This commit is contained in:
dijunkun
2023-07-31 15:21:32 +08:00
parent 7ad8375ddc
commit ff8e1ed34d
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ice/ice_transport.cpp
View File

@@ -2,6 +2,7 @@
#include <map> #include <map>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <thread>
#include "log.h" #include "log.h"
@@ -123,6 +124,7 @@ int IceTransport::CreateTransport() {
int IceTransport::CreateTransport(std::string transport_id) { int IceTransport::CreateTransport(std::string transport_id) {
LOG_INFO("Join transport"); LOG_INFO("Join transport");
offer_peer_ = false; offer_peer_ = false;
transport_id_ = transport_id;
// if (SignalStatus::Connected != signal_status_) { // if (SignalStatus::Connected != signal_status_) {
// LOG_ERROR("Not connect to signalserver"); // LOG_ERROR("Not connect to signalserver");
@@ -247,11 +249,19 @@ void IceTransport::OnReceiveMessage(const std::string &msg) {
} }
case 4: { case 4: {
remote_sdp_ = j["sdp"].get<std::string>(); remote_sdp_ = j["sdp"].get<std::string>();
LOG_INFO("Receive remote sdp [{}]", remote_sdp_);
SetRemoteSdp(remote_sdp_);
if (!offer_peer_) { if (remote_sdp_.empty()) {
GatherCandidates(); LOG_INFO(
"Offer peer not ready, wait 1 second and requery remote sdp");
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
QueryRemoteSdp(transport_id_);
} else {
LOG_INFO("Receive remote sdp [{}]", remote_sdp_);
SetRemoteSdp(remote_sdp_);
if (!offer_peer_) {
GatherCandidates();
}
} }
break; break;
} }