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

Remove all SRTP-related code from src/socket.cc 

SRTP functionality is provided to packet handlers
This commit is contained in:
Aaro Altonen 2020-08-13 06:54:26 +03:00
parent b6595822cb
commit ef2a27e3b6
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/socket.hh
View File

@ -144,9 +144,6 @@ namespace uvg_rtp {
* This is used when calling send() */
void set_sockaddr(sockaddr_in addr);
/* TODO: */
void set_srtp(uvg_rtp::srtp *srtp);
/* Get the out address for the socket if it exists */
sockaddr_in& get_out_address();
@ -171,7 +168,6 @@ namespace uvg_rtp {
socket_t socket_;
sockaddr_in addr_;
uvg_rtp::srtp *srtp_;
int flags_;
/* __sendto() calls these handlers in order before sending the packet*/

22
src/socket.cc
View File

@ -23,7 +23,6 @@ using namespace mingw;
uvg_rtp::socket::socket(int flags):
socket_(-1),
srtp_(nullptr),
flags_(flags)
{
}
@ -125,11 +124,6 @@ void uvg_rtp::socket::set_sockaddr(sockaddr_in addr)
addr_ = addr;
}
void uvg_rtp::socket::set_srtp(uvg_rtp::srtp *srtp)
{
srtp_ = srtp;
}
socket_t& uvg_rtp::socket::get_raw_socket()
{
return socket_;
@ -285,11 +279,6 @@ rtp_error_t uvg_rtp::socket::__sendtov(
return RTP_SEND_ERROR;
}
#ifdef __RTP_CRYPTO__
if (srtp_ && flags_ & RCE_SRTP_AUTHENTICATE_RTP)
delete buffers.at(buffers.size() - 1).second;
#endif
set_bytes(bytes_sent, sent_bytes);
return RTP_OK;
@ -509,17 +498,6 @@ rtp_error_t uvg_rtp::socket::__recvfrom(uint8_t *buf, size_t buf_len, int flags,
return RTP_GENERIC_ERROR;
}
#ifdef __RTP_CRYPTO__
if (srtp_) {
auto status = srtp_->decrypt(buf, (size_t)ret);
if (status != RTP_OK) {
LOG_ERROR("Failed to encrypt RTP packet!");
return status;
}
}
#endif
set_bytes(bytes_read, ret);
return RTP_OK;
#else