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

multiplex: Holepuncher packets have version number 3

This commit is contained in:
Heikki Tampio 2023-06-27 12:08:45 +03:00
parent 21884f7969
commit eea9f9b17a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/holepuncher.cc
View File

@ -67,7 +67,7 @@ void uvgrtp::holepuncher::keepalive()
}
UVG_LOG_DEBUG("Sending keep-alive");
uint8_t payload = 0x00;
uint8_t payload = 0b11000000;
socket_->sendto(remote_sockaddr_, remote_sockaddr_ip6_, &payload, 1, 0);
last_dgram_sent_ = uvgrtp::clock::ntp::now();
}

8
src/reception_flow.cc
View File

@ -531,6 +531,7 @@ void uvgrtp::reception_flow::process_packet(int rce_flags)
uint32_t rtcp_ssrc = ntohl(*(uint32_t*)&ptr[4]);
size_t size = (size_t)ring_buffer_[ring_read_index_].read;
bool rtcp_pkt = false;
uint8_t version = (*(uint8_t*)&ptr[0] >> 6) & 0x3;
handler* handlers = nullptr;
for (auto& p : packet_handlers_) {
@ -553,7 +554,6 @@ void uvgrtp::reception_flow::process_packet(int rce_flags)
if (handlers != nullptr) {
/* SSRC match is found -> call handlers */
rtp_error_t retval;
uint8_t version = (*(uint8_t*)&ptr[0] >> 6) & 0x3;
uvgrtp::frame::rtp_frame* frame = nullptr;
/* -------------------- Protocol checks -------------------- */
@ -561,7 +561,7 @@ void uvgrtp::reception_flow::process_packet(int rce_flags)
* 1. SSRC is in octets 4-7 -> RTCP packet
* 2. Version 0 and Magic Cookie is 0x5a525450 -> ZRTP packet
* 3. Version is 2 -> RTP packet (or SRTP)
* 4. Empty packet -> Keep-Alive/Holepuncher
* 4. Version is 3 -> Keep-Alive/Holepuncher
* 5. Otherwise -> User packet */
if (rtcp_pkt && (rce_flags & RCE_RTCP_MUX)) {
uint8_t pt = (uint8_t)ptr[1]; // Packet type
@ -622,7 +622,7 @@ void uvgrtp::reception_flow::process_packet(int rce_flags)
}
}
/* No SSRC match found -> Holepuncher or user packet */
else if (&ptr[0] == 0) {
else if (version == 0x3) {
UVG_LOG_DEBUG("Holepuncher packet");
}
else {
@ -631,7 +631,7 @@ void uvgrtp::reception_flow::process_packet(int rce_flags)
}
else {
/* No SSRC match found -> Holepuncher or user packet */
if (&ptr[0] == 0) {
if (version == 0x3) {
UVG_LOG_DEBUG("Holepuncher packet");
}
else {