qiurui
/
uvgrtp-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiplex: Add SSRC to ZRTP HelloACK packets

This commit is contained in:
Heikki Tampio 2023-06-27 14:53:38 +03:00
parent d145dc04ef
commit 2781fb3def
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zrtp.cc
View File

@ -382,7 +382,7 @@ bool uvgrtp::zrtp::are_we_initiator(uint8_t *our_hvi, uint8_t *their_hvi)
rtp_error_t uvgrtp::zrtp::begin_session() rtp_error_t uvgrtp::zrtp::begin_session()
{ {
auto hello = uvgrtp::zrtp_msg::hello(session_); auto hello = uvgrtp::zrtp_msg::hello(session_);
auto hello_ack = uvgrtp::zrtp_msg::hello_ack(); auto hello_ack = uvgrtp::zrtp_msg::hello_ack(session_);
bool hello_recv = false; bool hello_recv = false;
uvgrtp::clock::hrc::hrc_t start = uvgrtp::clock::hrc::now(); uvgrtp::clock::hrc::hrc_t start = uvgrtp::clock::hrc::now();

3
src/zrtp/hello_ack.cc
View File

@ -11,12 +11,13 @@
#define ZRTP_HELLO_ACK "HelloACK" #define ZRTP_HELLO_ACK "HelloACK"
uvgrtp::zrtp_msg::hello_ack::hello_ack() uvgrtp::zrtp_msg::hello_ack::hello_ack(zrtp_session_t& session)
{ {
allocate_frame(sizeof(zrtp_hello_ack)); allocate_frame(sizeof(zrtp_hello_ack));
zrtp_hello_ack *msg = (zrtp_hello_ack *)frame_; zrtp_hello_ack *msg = (zrtp_hello_ack *)frame_;
UVG_LOG_DEBUG("Constructing ZRTP Hello ACK"); UVG_LOG_DEBUG("Constructing ZRTP Hello ACK");
set_zrtp_start_base(msg->msg_start, ZRTP_HELLO_ACK); set_zrtp_start_base(msg->msg_start, ZRTP_HELLO_ACK);
msg->msg_start.header.ssrc = htonl(session.ssrc);
msg->crc = uvgrtp::crypto::crc32::calculate_crc32((uint8_t *)frame_, len_ - sizeof(uint32_t)); msg->crc = uvgrtp::crypto::crc32::calculate_crc32((uint8_t *)frame_, len_ - sizeof(uint32_t));
} }

2
src/zrtp/hello_ack.hh
View File

@ -28,7 +28,7 @@ namespace uvgrtp {
class hello_ack : public zrtp_message { class hello_ack : public zrtp_message {
public: public:
hello_ack(); hello_ack(zrtp_session_t& session);
~hello_ack(); ~hello_ack();
virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver, virtual rtp_error_t parse_msg(uvgrtp::zrtp_msg::receiver& receiver,