refactor: format code
This commit is contained in:
@@ -62,27 +62,27 @@ std::ostream& operator<<(std::ostream& os, const DataBuffer& buffer) {
|
||||
return os;
|
||||
}
|
||||
|
||||
bool DataBuffer::ReadFile(const std::string& fileName){
|
||||
try{
|
||||
bool DataBuffer::ReadFile(const std::string& fileName) {
|
||||
try {
|
||||
std::ifstream file(fileName);
|
||||
std::ostringstream ss;
|
||||
ss << file.rdbuf();
|
||||
const std::string& s = ss.str();
|
||||
m_Buffer = DataBuffer::Data(s.begin(), s.end());
|
||||
m_ReadOffset = 0;
|
||||
}catch(std::exception& e){
|
||||
} catch (std::exception& e) {
|
||||
std::cerr << "Failed to read file \"" << fileName << "\" reason : " << e.what() << std::endl;
|
||||
return false;
|
||||
}
|
||||
return m_Buffer.size() > 0;
|
||||
}
|
||||
|
||||
bool DataBuffer::WriteFile(const std::string& fileName){
|
||||
try{
|
||||
bool DataBuffer::WriteFile(const std::string& fileName) {
|
||||
try {
|
||||
std::ofstream file(fileName);
|
||||
file.write((const char*) m_Buffer.data(), m_Buffer.size());
|
||||
file.write((const char*)m_Buffer.data(), m_Buffer.size());
|
||||
file.flush();
|
||||
}catch(std::exception& e){
|
||||
} catch (std::exception& e) {
|
||||
std::cerr << "Failed to write file \"" << fileName << "\" reason : " << e.what() << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -16,13 +16,13 @@ namespace network {
|
||||
|
||||
/* Create an invalid address */
|
||||
IPAddress::IPAddress() noexcept
|
||||
: m_Address(0), m_Valid(false){
|
||||
|
||||
}
|
||||
: m_Address(0), m_Valid(false) {
|
||||
|
||||
}
|
||||
|
||||
/* Initialize by string IP */
|
||||
IPAddress::IPAddress(const std::string& ip)
|
||||
: m_Address(0), m_Valid(false){
|
||||
: m_Address(0), m_Valid(false) {
|
||||
|
||||
std::sregex_iterator begin(ip.begin(), ip.end(), IPRegex);
|
||||
std::sregex_iterator end;
|
||||
@@ -41,7 +41,7 @@ IPAddress::IPAddress(const std::string& ip)
|
||||
}
|
||||
|
||||
IPAddress::IPAddress(const std::wstring& ip)
|
||||
: m_Address(0), m_Valid(false){
|
||||
: m_Address(0), m_Valid(false) {
|
||||
|
||||
std::wsregex_iterator begin(ip.begin(), ip.end(), IPRegexW);
|
||||
std::wsregex_iterator end;
|
||||
@@ -61,7 +61,7 @@ IPAddress::IPAddress(const std::wstring& ip)
|
||||
|
||||
/* Initialize by octets */
|
||||
IPAddress::IPAddress(uint8_t octet1, uint8_t octet2, uint8_t octet3, uint8_t octet4) noexcept
|
||||
: m_Valid(true){
|
||||
: m_Valid(true) {
|
||||
m_Address = (octet1 << 24) | (octet2 << 16) | (octet3 << 8) | octet4;
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ NetworkInitializer initializer;
|
||||
|
||||
IPAddresses Dns::Resolve(const std::string& host) {
|
||||
IPAddresses list;
|
||||
addrinfo hints = { 0 }, *addresses;
|
||||
addrinfo hints = { 0 }, * addresses;
|
||||
|
||||
//hints.ai_family = AF_UNSPEC;
|
||||
hints.ai_family = AF_INET;
|
||||
@@ -42,7 +42,7 @@ IPAddresses Dns::Resolve(const std::string& host) {
|
||||
|
||||
getaddrinfo(host.c_str(), NULL, &hints, &addresses);
|
||||
|
||||
for (addrinfo *p = addresses; p != NULL; p = p->ai_next) {
|
||||
for (addrinfo* p = addresses; p != NULL; p = p->ai_next) {
|
||||
#ifdef _WIN32
|
||||
//wchar_t straddr[35];
|
||||
//char straddr[512];
|
||||
|
||||
@@ -13,10 +13,10 @@ namespace td {
|
||||
namespace network {
|
||||
|
||||
Socket::Socket(Type type)
|
||||
: m_Blocking(false),
|
||||
: m_Blocking(false),
|
||||
m_Type(type),
|
||||
m_Status(Disconnected),
|
||||
m_Handle((SocketHandle) INVALID_SOCKET)
|
||||
m_Handle((SocketHandle)INVALID_SOCKET)
|
||||
{
|
||||
|
||||
}
|
||||
@@ -28,9 +28,9 @@ Socket::~Socket() {
|
||||
bool Socket::SetBlocking(bool block) {
|
||||
unsigned long mode = block ? 0 : 1;
|
||||
|
||||
if(ioctl(m_Handle, FIONBIO, &mode) < 0){
|
||||
if (ioctl(m_Handle, FIONBIO, &mode) < 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
m_Blocking = block;
|
||||
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
#define ioctlsocket ioctl
|
||||
#endif
|
||||
|
||||
namespace td{
|
||||
namespace network{
|
||||
namespace td {
|
||||
namespace network {
|
||||
|
||||
TCPListener::TCPListener(){}
|
||||
TCPListener::TCPListener() {}
|
||||
|
||||
TCPListener::~TCPListener(){
|
||||
TCPListener::~TCPListener() {
|
||||
destroy();
|
||||
}
|
||||
|
||||
bool TCPListener::listen(uint16_t port, int maxConnections){
|
||||
bool TCPListener::listen(uint16_t port, int maxConnections) {
|
||||
if ((m_Handle = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
|
||||
return false;
|
||||
|
||||
@@ -38,7 +38,7 @@ bool TCPListener::listen(uint16_t port, int maxConnections){
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TCPListener::accept(TCPSocket& newSocket){
|
||||
bool TCPListener::accept(TCPSocket& newSocket) {
|
||||
int addrlen = sizeof(newSocket.m_RemoteAddr);
|
||||
if ((newSocket.m_Handle = ::accept(m_Handle, reinterpret_cast<sockaddr*>(&newSocket.m_RemoteAddr),
|
||||
reinterpret_cast<socklen_t*>(&addrlen))) < 0)
|
||||
@@ -48,21 +48,21 @@ bool TCPListener::accept(TCPSocket& newSocket){
|
||||
return true;
|
||||
}
|
||||
|
||||
void TCPListener::destroy(){
|
||||
if(m_Handle < 0)
|
||||
void TCPListener::destroy() {
|
||||
if (m_Handle < 0)
|
||||
::closesocket(m_Handle);
|
||||
}
|
||||
|
||||
bool TCPListener::close(){
|
||||
bool TCPListener::close() {
|
||||
if (::shutdown(m_Handle, SD_BOTH) == 0)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool TCPListener::setBlocking(bool blocking){
|
||||
bool TCPListener::setBlocking(bool blocking) {
|
||||
unsigned long mode = blocking ? 0 : 1;
|
||||
|
||||
if(ioctlsocket(m_Handle, FIONBIO, &mode) < 0){
|
||||
if (ioctlsocket(m_Handle, FIONBIO, &mode) < 0) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -16,14 +16,14 @@ namespace network {
|
||||
TCPSocket::TCPSocket()
|
||||
: Socket(Socket::TCP), m_Port(0)
|
||||
{
|
||||
m_Handle = (SocketHandle) INVALID_SOCKET;
|
||||
m_Handle = (SocketHandle)INVALID_SOCKET;
|
||||
}
|
||||
|
||||
bool TCPSocket::Connect(const IPAddress& address, unsigned short port) {
|
||||
if (this->GetStatus() == Connected)
|
||||
return true;
|
||||
|
||||
struct addrinfo hints = { 0 }, *result = nullptr;
|
||||
struct addrinfo hints = { 0 }, * result = nullptr;
|
||||
|
||||
if ((m_Handle = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
|
||||
return false;
|
||||
@@ -55,7 +55,7 @@ bool TCPSocket::Connect(const IPAddress& address, unsigned short port) {
|
||||
return true;
|
||||
}
|
||||
|
||||
size_t TCPSocket::Send(const unsigned char* data, size_t size){
|
||||
size_t TCPSocket::Send(const unsigned char* data, size_t size) {
|
||||
if (this->GetStatus() != Connected)
|
||||
return 0;
|
||||
|
||||
@@ -118,19 +118,19 @@ DataBuffer TCPSocket::Receive(std::size_t amount) {
|
||||
return DataBuffer(std::string(buf.get(), received));
|
||||
}
|
||||
|
||||
TCPSocket::TCPSocket(TCPSocket&& other) : Socket(TCP){
|
||||
TCPSocket::TCPSocket(TCPSocket&& other) : Socket(TCP) {
|
||||
m_Handle = other.m_Handle;
|
||||
m_Port = other.m_Port;
|
||||
m_RemoteAddr = other.m_RemoteAddr;
|
||||
m_RemoteIP = other.m_RemoteIP;
|
||||
SetStatus(other.GetStatus());
|
||||
SetBlocking(other.IsBlocking());
|
||||
other.m_Handle = (SocketHandle) INVALID_SOCKET;
|
||||
other.m_Handle = (SocketHandle)INVALID_SOCKET;
|
||||
}
|
||||
|
||||
void SendPacket(const DataBuffer& data, network::TCPSocket& socket){
|
||||
void SendPacket(const DataBuffer& data, network::TCPSocket& socket) {
|
||||
DataBuffer compressed = utils::Compress(data);
|
||||
socket.Send((const std::uint8_t*) compressed.ToString().data(), compressed.GetSize());
|
||||
socket.Send((const std::uint8_t*)compressed.ToString().data(), compressed.GetSize());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user