diff --git a/src/engine/helper/HL_Exception.h b/src/engine/helper/HL_Exception.h index a921eaf1..ddba1d4f 100644 --- a/src/engine/helper/HL_Exception.h +++ b/src/engine/helper/HL_Exception.h @@ -3,8 +3,8 @@ * 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/. */ -#ifndef __EXCEPTION_H -#define __EXCEPTION_H +#ifndef __HL_EXCEPTION_H +#define __HL_EXCEPTION_H #include #include diff --git a/src/engine/helper/HL_Sync.h b/src/engine/helper/HL_Sync.h index d4196f77..6bd57531 100644 --- a/src/engine/helper/HL_Sync.h +++ b/src/engine/helper/HL_Sync.h @@ -11,6 +11,7 @@ #include #include #include +#include #include typedef std::recursive_mutex Mutex; diff --git a/src/libs/ice/ICEAddress.cpp b/src/libs/ice/ICEAddress.cpp index 499f44e3..994d35b9 100644 --- a/src/libs/ice/ICEAddress.cpp +++ b/src/libs/ice/ICEAddress.cpp @@ -467,6 +467,8 @@ unsigned char* NetworkAddress::ipBytes() const return (unsigned char*)mAddr6.sin6_addr.u.Byte; #elif defined(TARGET_OSX) || defined(TARGET_IOS) 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) return (unsigned char*)&mAddr6.sin6_addr.__in6_u.__u6_addr8; #elif defined(TARGET_ANDROID) diff --git a/src/libs/ice/ICENetworkHelper.cpp b/src/libs/ice/ICENetworkHelper.cpp index 74569ecc..c47a687a 100644 --- a/src/libs/ice/ICENetworkHelper.cpp +++ b/src/libs/ice/ICENetworkHelper.cpp @@ -443,6 +443,8 @@ void NetworkHelper::NetworkToHost(const in6_addr& addr6, uint32_t* output) output[i] = ntohl(((uint32_t*)addr6.u.Byte[0])[i]); #elif defined(TARGET_IOS) || defined(TARGET_OSX) 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) output[i] = ntohl(addr6.__in6_u.__u6_addr32[i]); #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]); #elif defined(TARGET_OSX) || defined(TARGET_IOS) 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) output.__in6_u.__u6_addr32[i] = htonl(input[i]); #elif defined(TARGET_ANDROID)