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

[fix] only offer peer use use id list to create ice agent

Browse Source
This commit is contained in:
dijunkun
2024-09-02 16:54:29 +08:00
parent 98bd477af5
commit fd392922d7
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pc/peer_connection.cpp
View File

@@ -191,17 +191,19 @@ int PeerConnection::Init(PeerConnectionParams params,
try_rejoin_with_turn_ = true; try_rejoin_with_turn_ = true;
if (try_rejoin_with_turn_) { if (try_rejoin_with_turn_) {
enable_turn_ = true; enable_turn_ = true;
LOG_INFO("Ice failed, destroy ice agent"); LOG_INFO(
"Ice failed, destroy ice agent and rereate it with TURN enabled");
IceWorkMsg msg; IceWorkMsg msg;
msg.type = IceWorkMsg::Type::Destroy; msg.type = IceWorkMsg::Type::Destroy;
PushIceWorkMsg(msg); PushIceWorkMsg(msg);
LOG_INFO("Create ice agent with TURN"); if (offer_peer_) {
msg.type = IceWorkMsg::Type::UserIdList; msg.type = IceWorkMsg::Type::UserIdList;
msg.transmission_id = remote_transmission_id_; msg.transmission_id = remote_transmission_id_;
msg.user_id_list = user_id_list_; msg.user_id_list = user_id_list_;
PushIceWorkMsg(msg); PushIceWorkMsg(msg);
}
} else { } else {
LOG_INFO("Unknown ice state"); LOG_INFO("Unknown ice state");
} }
@@ -389,6 +391,7 @@ int PeerConnection::Join(const std::string &transmission_id,
int ret = 0; int ret = 0;
offer_peer_ = true;
password_ = password; password_ = password;
leave_ = false; leave_ = false;

1
src/pc/peer_connection.h
View File

@@ -136,6 +136,7 @@ class PeerConnection {
std::function<void(const std::string &)> on_receive_ws_msg_ = nullptr; std::function<void(const std::string &)> on_receive_ws_msg_ = nullptr;
std::function<void(WsStatus)> on_ws_status_ = nullptr; std::function<void(WsStatus)> on_ws_status_ = nullptr;
unsigned int ws_connection_id_ = 0; unsigned int ws_connection_id_ = 0;
bool offer_peer_ = false;
std::string user_id_ = ""; std::string user_id_ = "";
std::string local_transmission_id_ = ""; std::string local_transmission_id_ = "";
std::string remote_transmission_id_ = ""; std::string remote_transmission_id_ = "";