public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- compatibility with pcap++

This commit is contained in:
Dmytro Bogovych 2023-04-09 15:46:33 +03:00
parent f01c5040e1
commit 5182cb8379
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/helper/CMakeLists.txt
View File

@ -5,7 +5,7 @@ project (helper_lib)
set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CXX_STANDARD_REQUIRED ON)
set (USE_NULL_UUID OFF CACHE BOOL "When enabled linking to libuuid is avoided")
option (USE_NULL_UUID "When enabled linking to libuuid is avoided" OFF)
set (CMAKE_POSITION_INDEPENDENT_CODE ON)

4
src/engine/helper/HL_Rtp.cpp
View File

@ -83,9 +83,9 @@ unsigned RtpHelper::findSsrc(const void* buffer, size_t length)
void RtpHelper::setSsrc(void* buffer, size_t length, uint32_t ssrc)
{
if (isRtp(buffer, length))
reinterpret_cast<RtpHeader*>(buffer)->ssrc = ssrc;
reinterpret_cast<RtpHeader*>(buffer)->ssrc = htonl(ssrc);
else
reinterpret_cast<RtcpHeader*>(buffer)->ssrc = ssrc;
reinterpret_cast<RtcpHeader*>(buffer)->ssrc = htonl(ssrc);
}
int RtpHelper::findPtype(const void* buffer, size_t length)

2
src/engine/media/CMakeLists.txt
View File

@ -50,7 +50,7 @@ if (USE_EVS_CODEC)
message("Media: EVS codec will be included.")
add_definitions (-DUSE_EVS_CODEC)
set (SOURCES ${SOURCES} MT_EvsCodec.cpp MT_EvsCodec.h)
set (LIBS_CODEC evs)
set (LIBS_CODEC evs_codec)
endif()
if (USE_OPUS_CODEC)

18
src/libs/ice/ICEAddress.cpp
View File

@ -185,6 +185,24 @@ NetworkAddress::NetworkAddress(const char *ip, unsigned short port)
setPort(port);
}
NetworkAddress::NetworkAddress(uint32_t ip_4, uint16_t port)
:mInitialized(true), mRelayed(false)
{
memset(&mAddr6, 0, sizeof(mAddr6));
mAddr4.sin_family = AF_INET;
mAddr4.sin_addr.s_addr = ip_4;
mAddr4.sin_port = port;
}
NetworkAddress::NetworkAddress(const uint8_t* ip_6, uint16_t port)
:mInitialized(true), mRelayed(false)
{
memset(&mAddr6, 0, sizeof(mAddr6));
mAddr6.sin6_family = AF_INET6;
memmove(&mAddr6.sin6_addr, ip_6, sizeof(mAddr6.sin6_addr));
mAddr6.sin6_port = port;
}
NetworkAddress::NetworkAddress(const sockaddr& addr, unsigned addrLen)
:mInitialized(true), mRelayed(false)
{

9
src/libs/ice/ICEAddress.h
View File

@ -26,9 +26,16 @@ namespace ice
NetworkAddress(int stunType);
NetworkAddress(const std::string& ip, unsigned short port);
NetworkAddress(const char* ip, unsigned short port);
// Both ip_4 and port are network byte order
NetworkAddress(uint32_t ip_4, uint16_t port);
// Both ip_6 and port are network byte order
NetworkAddress(const uint8_t* ip_6, uint16_t port);
NetworkAddress(const in6_addr& ip, unsigned short port);
NetworkAddress(const in_addr& ip, unsigned short port);
NetworkAddress(const sockaddr& addr, unsigned addrLen);
NetworkAddress(const sockaddr& addr, unsigned addrLen);
NetworkAddress(const NetworkAddress& src);
~NetworkAddress();