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

[feat] add user id in NetStatusReport

Browse Source
This commit is contained in:
dijunkun
2024-12-03 17:20:31 +08:00
parent 49d6307154
commit 6e3c8c488d
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/interface/x.h
View File

@@ -82,7 +82,8 @@ typedef void (*OnConnectionStatus)(ConnectionStatus, const char*, const size_t,
void*); void*);
typedef void (*NetStatusReport)(const char*, const size_t, TraversalMode, typedef void (*NetStatusReport)(const char*, const size_t, TraversalMode,
const XNetTrafficStats*, void*); const XNetTrafficStats*, const char*,
const size_t, void*);
typedef struct { typedef struct {
bool use_cfg_file; bool use_cfg_file;

2
src/pc/peer_connection.cpp
View File

@@ -403,7 +403,7 @@ void PeerConnection::ProcessSignal(const std::string &signal) {
net_status_report_(user_id_.data(), user_id_.size(), net_status_report_(user_id_.data(), user_id_.size(),
TraversalMode::UnknownMode, &net_traffic_stats, TraversalMode::UnknownMode, &net_traffic_stats,
user_data_); user_id_.data(), user_id_.size(), user_data_);
LOG_INFO("Login success with id [{}]", user_id_); LOG_INFO("Login success with id [{}]", user_id_);
signal_status_ = SignalStatus::SignalConnected; signal_status_ = SignalStatus::SignalConnected;
on_signal_status_(SignalStatus::SignalConnected, user_data_); on_signal_status_(SignalStatus::SignalConnected, user_data_);

8
src/pc/peer_connection.h
View File

@@ -31,7 +31,8 @@ typedef void (*OnConnectionStatus)(ConnectionStatus, const char *, const size_t,
void *); void *);
typedef void (*NetStatusReport)(const char *, const size_t, TraversalMode, typedef void (*NetStatusReport)(const char *, const size_t, TraversalMode,
const XNetTrafficStats *, void *); const XNetTrafficStats *, const char *,
const size_t, void *);
typedef struct { typedef struct {
bool use_cfg_file; bool use_cfg_file;
@@ -174,11 +175,6 @@ class PeerConnection {
std::function<void(std::string, const std::string &)> on_ice_status_change_ = std::function<void(std::string, const std::string &)> on_ice_status_change_ =
nullptr; nullptr;
std::function<void(const std::string &, IceTransmission::TraversalType,
const uint64_t, const uint64_t, const uint64_t,
const uint64_t, const uint64_t, const uint64_t,
const uint64_t, const uint64_t, void *)>
on_net_status_report_ = nullptr;
bool ice_ready_ = false; bool ice_ready_ = false;
OnReceiveBuffer on_receive_video_buffer_; OnReceiveBuffer on_receive_video_buffer_;

11
src/transmission/ice_transmission.cpp
View File

@@ -67,9 +67,10 @@ int IceTransmission::InitIceTransmission(
memcpy(&xnet_traffic_stats, &net_traffic_stats, memcpy(&xnet_traffic_stats, &net_traffic_stats,
sizeof(XNetTrafficStats)); sizeof(XNetTrafficStats));
on_receive_net_status_report_(user_id_.data(), user_id_.size(), on_receive_net_status_report_(
TraversalMode(traversal_type_), user_id_.data(), user_id_.size(), TraversalMode(traversal_type_),
&xnet_traffic_stats, user_data_); &xnet_traffic_stats, remote_user_id_.data(),
remote_user_id_.size(), user_data_);
} }
}); });
@@ -346,7 +347,9 @@ int IceTransmission::InitIceTransmission(
ice_transmission_obj->user_id_.data(), ice_transmission_obj->user_id_.data(),
ice_transmission_obj->user_id_.size(), ice_transmission_obj->user_id_.size(),
TraversalMode(ice_transmission_obj->traversal_type_), TraversalMode(ice_transmission_obj->traversal_type_),
&net_traffic_stats, ice_transmission_obj->user_data_); &net_traffic_stats, ice_transmission_obj->remote_user_id_.data(),
ice_transmission_obj->remote_user_id_.size(),
ice_transmission_obj->user_data_);
} }
}, },
[]([[maybe_unused]] NiceAgent *agent, [[maybe_unused]] guint stream_id, []([[maybe_unused]] NiceAgent *agent, [[maybe_unused]] guint stream_id,

6
src/transmission/ice_transmission.h
View File

@@ -86,7 +86,8 @@ class IceTransmission {
void SetOnReceiveNetStatusReportFunc( void SetOnReceiveNetStatusReportFunc(
std::function<void(const char *, const size_t, TraversalMode, std::function<void(const char *, const size_t, TraversalMode,
const XNetTrafficStats *, void *)> const XNetTrafficStats *, const char *, const size_t,
void *)>
on_receive_net_status_report) { on_receive_net_status_report) {
on_receive_net_status_report_ = on_receive_net_status_report; on_receive_net_status_report_ = on_receive_net_status_report;
} }
@@ -175,7 +176,8 @@ class IceTransmission {
nullptr; nullptr;
std::function<void(const char *, const size_t, TraversalMode, std::function<void(const char *, const size_t, TraversalMode,
const XNetTrafficStats *, void *)> const XNetTrafficStats *, const char *, const size_t,
void *)>
on_receive_net_status_report_ = nullptr; on_receive_net_status_report_ = nullptr;
private: private: