diff --git a/src/interface/x.h b/src/interface/x.h index 3b479b9..2263f0c 100644 --- a/src/interface/x.h +++ b/src/interface/x.h @@ -82,7 +82,8 @@ typedef void (*OnConnectionStatus)(ConnectionStatus, const char*, const size_t, void*); typedef void (*NetStatusReport)(const char*, const size_t, TraversalMode, - const XNetTrafficStats*, void*); + const XNetTrafficStats*, const char*, + const size_t, void*); typedef struct { bool use_cfg_file; diff --git a/src/pc/peer_connection.cpp b/src/pc/peer_connection.cpp index cf92f53..56b9b66 100644 --- a/src/pc/peer_connection.cpp +++ b/src/pc/peer_connection.cpp @@ -403,7 +403,7 @@ void PeerConnection::ProcessSignal(const std::string &signal) { net_status_report_(user_id_.data(), user_id_.size(), TraversalMode::UnknownMode, &net_traffic_stats, - user_data_); + user_id_.data(), user_id_.size(), user_data_); LOG_INFO("Login success with id [{}]", user_id_); signal_status_ = SignalStatus::SignalConnected; on_signal_status_(SignalStatus::SignalConnected, user_data_); diff --git a/src/pc/peer_connection.h b/src/pc/peer_connection.h index 671e461..f7c1c73 100644 --- a/src/pc/peer_connection.h +++ b/src/pc/peer_connection.h @@ -31,7 +31,8 @@ typedef void (*OnConnectionStatus)(ConnectionStatus, const char *, const size_t, void *); typedef void (*NetStatusReport)(const char *, const size_t, TraversalMode, - const XNetTrafficStats *, void *); + const XNetTrafficStats *, const char *, + const size_t, void *); typedef struct { bool use_cfg_file; @@ -174,11 +175,6 @@ class PeerConnection { std::function on_ice_status_change_ = nullptr; - std::function - on_net_status_report_ = nullptr; bool ice_ready_ = false; OnReceiveBuffer on_receive_video_buffer_; diff --git a/src/transmission/ice_transmission.cpp b/src/transmission/ice_transmission.cpp index 8c15ee4..130e17a 100644 --- a/src/transmission/ice_transmission.cpp +++ b/src/transmission/ice_transmission.cpp @@ -67,9 +67,10 @@ int IceTransmission::InitIceTransmission( memcpy(&xnet_traffic_stats, &net_traffic_stats, sizeof(XNetTrafficStats)); - on_receive_net_status_report_(user_id_.data(), user_id_.size(), - TraversalMode(traversal_type_), - &xnet_traffic_stats, user_data_); + on_receive_net_status_report_( + user_id_.data(), user_id_.size(), TraversalMode(traversal_type_), + &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_.size(), 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, diff --git a/src/transmission/ice_transmission.h b/src/transmission/ice_transmission.h index 308ab42..6441763 100644 --- a/src/transmission/ice_transmission.h +++ b/src/transmission/ice_transmission.h @@ -86,7 +86,8 @@ class IceTransmission { void SetOnReceiveNetStatusReportFunc( std::function + const XNetTrafficStats *, const char *, const size_t, + void *)> on_receive_net_status_report) { on_receive_net_status_report_ = on_receive_net_status_report; } @@ -175,7 +176,8 @@ class IceTransmission { nullptr; std::function + const XNetTrafficStats *, const char *, const size_t, + void *)> on_receive_net_status_report_ = nullptr; private: