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

- fix for OpenWRT builds

This commit is contained in:
Dmytro Bogovych 2019-02-05 12:59:10 +03:00
parent 7483db5fac
commit cf89c17e66
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/helper/HL_Exception.h
View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef __EXCEPTION_H #ifndef __HL_EXCEPTION_H
#define __EXCEPTION_H #define __HL_EXCEPTION_H
#include <exception> #include <exception>
#include <memory.h> #include <memory.h>

1
src/engine/helper/HL_Sync.h
View File

@ -11,6 +11,7 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <queue> #include <queue>
#include <functional>
#include <assert.h> #include <assert.h>
typedef std::recursive_mutex Mutex; typedef std::recursive_mutex Mutex;

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

@ -467,6 +467,8 @@ unsigned char* NetworkAddress::ipBytes() const
return (unsigned char*)mAddr6.sin6_addr.u.Byte; return (unsigned char*)mAddr6.sin6_addr.u.Byte;
#elif defined(TARGET_OSX) || defined(TARGET_IOS) #elif defined(TARGET_OSX) || defined(TARGET_IOS)
return (unsigned char*)&mAddr6.sin6_addr.__u6_addr.__u6_addr8; return (unsigned char*)&mAddr6.sin6_addr.__u6_addr.__u6_addr8;
#elif defined(TARGET_OPENWRT)
return (unsigned char*)&mAddr6.sin6_addr.__in6_union.__s6_addr;
#elif defined(TARGET_LINUX) #elif defined(TARGET_LINUX)
return (unsigned char*)&mAddr6.sin6_addr.__in6_u.__u6_addr8; return (unsigned char*)&mAddr6.sin6_addr.__in6_u.__u6_addr8;
#elif defined(TARGET_ANDROID) #elif defined(TARGET_ANDROID)

4
src/libs/ice/ICENetworkHelper.cpp
View File

@ -443,6 +443,8 @@ void NetworkHelper::NetworkToHost(const in6_addr& addr6, uint32_t* output)
output[i] = ntohl(((uint32_t*)addr6.u.Byte[0])[i]); output[i] = ntohl(((uint32_t*)addr6.u.Byte[0])[i]);
#elif defined(TARGET_IOS) || defined(TARGET_OSX) #elif defined(TARGET_IOS) || defined(TARGET_OSX)
output[i] = ntohl(addr6.__u6_addr.__u6_addr32[i]); output[i] = ntohl(addr6.__u6_addr.__u6_addr32[i]);
#elif defined(TARGET_OPENWRT)
output[i] = ntohl(addr6.__in6_union.__s6_addr32[i]);
#elif defined(TARGET_LINUX) #elif defined(TARGET_LINUX)
output[i] = ntohl(addr6.__in6_u.__u6_addr32[i]); output[i] = ntohl(addr6.__in6_u.__u6_addr32[i]);
#elif defined(TARGET_ANDROID) #elif defined(TARGET_ANDROID)
@ -457,6 +459,8 @@ void NetworkHelper::HostToNetwork(const uint32_t* input, in6_addr& output)
((uint32_t*)&output.u.Byte[0])[i] = htonl(input[i]); ((uint32_t*)&output.u.Byte[0])[i] = htonl(input[i]);
#elif defined(TARGET_OSX) || defined(TARGET_IOS) #elif defined(TARGET_OSX) || defined(TARGET_IOS)
output.__u6_addr.__u6_addr32[i] = htonl(input[i]); output.__u6_addr.__u6_addr32[i] = htonl(input[i]);
#elif defined(TARGET_OPENWRT)
output.__in6_union.__s6_addr32[i] = htonl(input[i]);
#elif defined(TARGET_LINUX) #elif defined(TARGET_LINUX)
output.__in6_u.__u6_addr32[i] = htonl(input[i]); output.__in6_u.__u6_addr32[i] = htonl(input[i]);
#elif defined(TARGET_ANDROID) #elif defined(TARGET_ANDROID)