This commit is contained in:
Grishka
2018-06-04 22:37:43 +03:00
parent 5ae5b34cc7
commit 342cc5a295
32 changed files with 2594 additions and 1545 deletions

View File

@@ -16,7 +16,7 @@
#include "logging.h"
#include "VoIPServerConfig.h"
#include "VoIPController.h"
#include "BufferInputStream.h"
#include "Buffers.h"
#define MIN_UDP_PORT 16384
#define MAX_UDP_PORT 32768
@@ -180,6 +180,10 @@ uint32_t IPv4Address::GetAddress(){
return address;
}
bool IPv4Address::IsEmpty(){
return address==0;
}
IPv6Address::IPv6Address(std::string addr){
#ifndef _WIN32
NetworkSocketPosix::StringToV6Address(addr, this->address);
@@ -188,7 +192,7 @@ IPv6Address::IPv6Address(std::string addr){
#endif
}
IPv6Address::IPv6Address(uint8_t addr[16]){
IPv6Address::IPv6Address(const uint8_t* addr){
memcpy(address, addr, 16);
}
@@ -197,7 +201,16 @@ IPv6Address::IPv6Address(){
}
std::string IPv6Address::ToString(){
return "";
#ifndef _WIN32
return NetworkSocketPosix::V6AddressToString(address);
#else
return NetworkSocketWinsock::V6AddressToString(address);
#endif
}
bool IPv6Address::IsEmpty(){
uint64_t* a=reinterpret_cast<uint64_t*>(address);
return a[0]==0LL && a[1]==0LL;
}
/*sockaddr &IPv6Address::ToSockAddr(uint16_t port){