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

zrtp_timing: Fix timing for sending ZRTP messages in dh_part1(), dh_part2() and responder_finalise_session()

This commit is contained in:
Heikki Tampio 2023-05-30 13:04:47 +03:00
parent c166a8c61a
commit 14ee7c0cef
1 changed files with 78 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/zrtp.cc
View File

@ -495,10 +495,10 @@ rtp_error_t uvgrtp::zrtp::init_session(int key_agreement)
* This assumption may prove to be false if remote also sends Commit message * This assumption may prove to be false if remote also sends Commit message
* and Commit contention is resolved in their favor. */ * and Commit contention is resolved in their favor. */
session_.role = INITIATOR; session_.role = INITIATOR;
uvgrtp::clock::hrc::hrc_t start = uvgrtp::clock::hrc::now(); uvgrtp::clock::hrc::hrc_t start = uvgrtp::clock::hrc::now();
int interval = 150; int interval = 150;
int i = 1; int i = 1;
while (true) { while (true) {
long int next_sendslot = i * interval; long int next_sendslot = i * interval;
long int run_time = (long int)uvgrtp::clock::hrc::diff_now(start); long int run_time = (long int)uvgrtp::clock::hrc::diff_now(start);
@ -549,15 +549,24 @@ rtp_error_t uvgrtp::zrtp::init_session(int key_agreement)
rtp_error_t uvgrtp::zrtp::dh_part1() rtp_error_t uvgrtp::zrtp::dh_part1()
{ {
auto dhpart = uvgrtp::zrtp_msg::dh_key_exchange(session_, 1); auto dhpart = uvgrtp::zrtp_msg::dh_key_exchange(session_, 1);
int rto = 150;
int type = 0; int type = 0;
uvgrtp::clock::hrc::hrc_t start = uvgrtp::clock::hrc::now();
int interval = 150;
int i = 1;
for (int i = 0; i < 10; ++i) { while (true) {
if (dhpart.send_msg(local_socket_, remote_addr_, remote_ip6_addr_) != RTP_OK) { long int next_sendslot = i * interval;
UVG_LOG_ERROR("Failed to send DHPart1 Message!"); long int run_time = (long int)uvgrtp::clock::hrc::diff_now(start);
long int diff_ms = next_sendslot - run_time;
int poll_timeout = (int)diff_ms;
if (diff_ms < 0) {
if (dhpart.send_msg(local_socket_, remote_addr_, remote_ip6_addr_) != RTP_OK) {
UVG_LOG_ERROR("Failed to send DHPart1 Message!");
}
++i;
} }
if (receiver_.recv_msg(local_socket_, poll_timeout, 0, type) == RTP_OK) {
if (receiver_.recv_msg(local_socket_, rto, 0, type) == RTP_OK) {
if (type == ZRTP_FT_DH_PART2) { if (type == ZRTP_FT_DH_PART2) {
if (dhpart.parse_msg(receiver_, session_) != RTP_OK) { if (dhpart.parse_msg(receiver_, session_) != RTP_OK) {
UVG_LOG_ERROR("Failed to parse DHPart2 Message!"); UVG_LOG_ERROR("Failed to parse DHPart2 Message!");
@ -572,9 +581,16 @@ rtp_error_t uvgrtp::zrtp::dh_part1()
return RTP_OK; return RTP_OK;
} }
} }
else
if (rto < 1200) {
rto *= 2; std::this_thread::sleep_for(std::chrono::milliseconds(diff_ms));
if (interval < 1200) {
interval *= 2;
}
}
if (i > 10) {
break;
}
} }
return RTP_TIMEOUT; return RTP_TIMEOUT;
@ -583,7 +599,6 @@ rtp_error_t uvgrtp::zrtp::dh_part1()
rtp_error_t uvgrtp::zrtp::dh_part2() rtp_error_t uvgrtp::zrtp::dh_part2()
{ {
int type = 0; int type = 0;
int rto = 150;
rtp_error_t ret = RTP_OK; rtp_error_t ret = RTP_OK;
auto dhpart = uvgrtp::zrtp_msg::dh_key_exchange(session_, 2); auto dhpart = uvgrtp::zrtp_msg::dh_key_exchange(session_, 2);
@ -596,23 +611,40 @@ rtp_error_t uvgrtp::zrtp::dh_part2()
* Now we must generate shared secrets (DHResult, total_hash, and s0) */ * Now we must generate shared secrets (DHResult, total_hash, and s0) */
generate_shared_secrets_dh(); generate_shared_secrets_dh();
for (int i = 0; i < 10; ++i) { uvgrtp::clock::hrc::hrc_t start = uvgrtp::clock::hrc::now();
if ((ret = dhpart.send_msg(local_socket_, remote_addr_, remote_ip6_addr_)) != RTP_OK) { int interval = 150;
UVG_LOG_ERROR("Failed to send DHPart2 Message!"); int i = 1;
return ret;
}
if (receiver_.recv_msg(local_socket_, rto, 0, type) == RTP_OK) { while (true) {
long int next_sendslot = i * interval;
long int run_time = (long int)uvgrtp::clock::hrc::diff_now(start);
long int diff_ms = next_sendslot - run_time;
int poll_timeout = (int)diff_ms;
if (diff_ms < 0) {
if ((ret = dhpart.send_msg(local_socket_, remote_addr_, remote_ip6_addr_)) != RTP_OK) {
UVG_LOG_ERROR("Failed to send DHPart2 Message!");
return ret;
}
++i;
}
if (receiver_.recv_msg(local_socket_, poll_timeout, 0, type) == RTP_OK) {
if (type == ZRTP_FT_CONFIRM1) { if (type == ZRTP_FT_CONFIRM1) {
UVG_LOG_DEBUG("Confirm1 Message received"); UVG_LOG_DEBUG("Confirm1 Message received");
return RTP_OK; return RTP_OK;
} }
} }
else
if (rto < 1200) {
rto *= 2; std::this_thread::sleep_for(std::chrono::milliseconds(diff_ms));
if (interval < 1200) {
interval *= 2;
}
}
if (i > 10) {
break;
}
} }
return RTP_TIMEOUT; return RTP_TIMEOUT;
} }
@ -620,15 +652,24 @@ rtp_error_t uvgrtp::zrtp::responder_finalize_session()
{ {
auto confirm = uvgrtp::zrtp_msg::confirm(session_, 1); auto confirm = uvgrtp::zrtp_msg::confirm(session_, 1);
auto confack = uvgrtp::zrtp_msg::confack(session_); auto confack = uvgrtp::zrtp_msg::confack(session_);
int rto = 150;
int type = 0; int type = 0;
uvgrtp::clock::hrc::hrc_t start = uvgrtp::clock::hrc::now();
int interval = 150;
int i = 1;
for (int i = 0; i < 10; ++i) { while (true) {
if (confirm.send_msg(local_socket_, remote_addr_, remote_ip6_addr_) != RTP_OK) { long int next_sendslot = i * interval;
UVG_LOG_ERROR("Failed to send Confirm1 Message!"); long int run_time = (long int)uvgrtp::clock::hrc::diff_now(start);
long int diff_ms = next_sendslot - run_time;
int poll_timeout = (int)diff_ms;
if (diff_ms < 0) {
if (confirm.send_msg(local_socket_, remote_addr_, remote_ip6_addr_) != RTP_OK) {
UVG_LOG_ERROR("Failed to send Confirm1 Message!");
}
++i;
} }
if (receiver_.recv_msg(local_socket_, poll_timeout, 0, type) == RTP_OK) {
if (receiver_.recv_msg(local_socket_, rto, 0, type) == RTP_OK) {
if (type == ZRTP_FT_CONFIRM2) { if (type == ZRTP_FT_CONFIRM2) {
if (confirm.parse_msg(receiver_, session_) != RTP_OK) { if (confirm.parse_msg(receiver_, session_) != RTP_OK) {
UVG_LOG_ERROR("Failed to parse Confirm2 Message!"); UVG_LOG_ERROR("Failed to parse Confirm2 Message!");
@ -646,9 +687,16 @@ rtp_error_t uvgrtp::zrtp::responder_finalize_session()
return RTP_OK; return RTP_OK;
} }
} }
else
if (rto < 1200) {
rto *= 2; std::this_thread::sleep_for(std::chrono::milliseconds(diff_ms));
if (interval < 1200) {
interval *= 2;
}
}
if (i > 10) {
break;
}
} }
return RTP_TIMEOUT; return RTP_TIMEOUT;