Skip to content

Commit 751a23c

Browse files
committed
Correct indenting to consistently use tabs
1 parent f9c8d77 commit 751a23c

2 files changed

Lines changed: 67 additions & 67 deletions

File tree

Network/TcpClient.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,45 @@ namespace Network
2929
{
3030
TcpConnection TcpClient::GetTcpClientConnection(Logger::Logger* logger, const std::string& host, const unsigned short port)
3131
{
32-
struct sockaddr_storage address;
33-
struct sockaddr_in* addressPointer = reinterpret_cast<struct sockaddr_in*>(&address);
34-
addressPointer->sin_family = AF_INET;
35-
addressPointer->sin_port = htons(port);
36-
int ok = inet_pton(AF_INET, host.c_str(), &(addressPointer->sin_addr));
37-
if (ok <= 0)
38-
{
32+
struct sockaddr_storage address;
33+
struct sockaddr_in* addressPointer = reinterpret_cast<struct sockaddr_in*>(&address);
34+
addressPointer->sin_family = AF_INET;
35+
addressPointer->sin_port = htons(port);
36+
int ok = inet_pton(AF_INET, host.c_str(), &(addressPointer->sin_addr));
37+
if (ok <= 0)
38+
{
3939
logger->Error(Languages::TextUnableToResolveAddress, host);
40-
return TcpConnection(0);
41-
}
40+
return TcpConnection(0);
41+
}
4242

43-
int sock = socket(AF_INET, SOCK_STREAM, 0);
44-
if (sock < 0)
45-
{
43+
int sock = socket(AF_INET, SOCK_STREAM, 0);
44+
if (sock < 0)
45+
{
4646
logger->Error(Languages::TextUnableToCreateTcpSocket, host, port);
47-
return TcpConnection(0);
48-
}
47+
return TcpConnection(0);
48+
}
4949

50-
ok = ConnectWithTimeout(sock, reinterpret_cast<struct sockaddr*>(addressPointer), sizeof(address));
51-
if (ok < 0)
52-
{
53-
Languages::TextSelector text;
54-
switch (errno)
55-
{
56-
case ECONNREFUSED:
57-
text = Languages::TextConnectionRefused;
58-
break;
50+
ok = ConnectWithTimeout(sock, reinterpret_cast<struct sockaddr*>(addressPointer), sizeof(address));
51+
if (ok < 0)
52+
{
53+
Languages::TextSelector text;
54+
switch (errno)
55+
{
56+
case ECONNREFUSED:
57+
text = Languages::TextConnectionRefused;
58+
break;
5959

60-
case ENETUNREACH:
61-
text = Languages::TextNetworkUnreachable;
62-
break;
60+
case ENETUNREACH:
61+
text = Languages::TextNetworkUnreachable;
62+
break;
6363

64-
default:
65-
text = Languages::TextConnectionFailed;
66-
}
64+
default:
65+
text = Languages::TextConnectionFailed;
66+
}
6767
logger->Error(text, host, port);
68-
close(sock);
69-
return TcpConnection(0);
70-
}
68+
close(sock);
69+
return TcpConnection(0);
70+
}
7171

7272
return TcpConnection(sock, &address);
7373
}

Utils/Network.cpp

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ namespace Utils
3232
{
3333
char buffer[40] = { 0 };
3434
unsigned short port = 0;
35-
switch(sockaddr->ss_family) {
36-
case AF_INET:
37-
{
38-
const struct sockaddr_in* sa4 = reinterpret_cast<const struct sockaddr_in*>(sockaddr);
39-
inet_ntop(AF_INET, &(sa4->sin_addr), buffer, sizeof(buffer));
40-
port = ntohs(sa4->sin_port);
41-
break;
42-
}
43-
44-
case AF_INET6:
45-
{
46-
const struct sockaddr_in6* sa6 = reinterpret_cast<const struct sockaddr_in6*>(sockaddr);
47-
inet_ntop(AF_INET6, &(sa6->sin6_addr), buffer, sizeof(buffer));
48-
port = ntohs(sa6->sin6_port);
49-
break;
50-
}
51-
52-
default:
53-
break;
54-
}
55-
return string("[") + string(buffer) + string("]:") + std::to_string(port);
35+
switch(sockaddr->ss_family) {
36+
case AF_INET:
37+
{
38+
const struct sockaddr_in* sa4 = reinterpret_cast<const struct sockaddr_in*>(sockaddr);
39+
inet_ntop(AF_INET, &(sa4->sin_addr), buffer, sizeof(buffer));
40+
port = ntohs(sa4->sin_port);
41+
break;
42+
}
43+
44+
case AF_INET6:
45+
{
46+
const struct sockaddr_in6* sa6 = reinterpret_cast<const struct sockaddr_in6*>(sockaddr);
47+
inet_ntop(AF_INET6, &(sa6->sin6_addr), buffer, sizeof(buffer));
48+
port = ntohs(sa6->sin6_port);
49+
break;
50+
}
51+
52+
default:
53+
break;
54+
}
55+
return string("[") + string(buffer) + string("]:") + std::to_string(port);
5656
}
5757

5858
bool Network::CompareAddresses(const struct sockaddr_storage *address1, const struct sockaddr_storage *address2)
@@ -66,26 +66,26 @@ namespace Utils
6666
switch (family)
6767
{
6868
case AF_INET:
69-
{
70-
const struct sockaddr_in* inet1 = reinterpret_cast<const struct sockaddr_in*>(address1);
71-
const struct sockaddr_in* inet2 = reinterpret_cast<const struct sockaddr_in*>(address2);
72-
if (inet1->sin_port != inet2->sin_port)
7369
{
74-
return false;
70+
const struct sockaddr_in* inet1 = reinterpret_cast<const struct sockaddr_in*>(address1);
71+
const struct sockaddr_in* inet2 = reinterpret_cast<const struct sockaddr_in*>(address2);
72+
if (inet1->sin_port != inet2->sin_port)
73+
{
74+
return false;
75+
}
76+
return (0 == memcmp(&(inet1->sin_addr), &(inet2->sin_addr), sizeof(inet1->sin_addr)));
7577
}
76-
return (0 == memcmp(&(inet1->sin_addr), &(inet2->sin_addr), sizeof(inet1->sin_addr)));
77-
}
7878

7979
case AF_INET6:
80-
{
81-
const struct sockaddr_in6* inet1 = reinterpret_cast<const struct sockaddr_in6*>(address1);
82-
const struct sockaddr_in6* inet2 = reinterpret_cast<const struct sockaddr_in6*>(address2);
83-
if (inet1->sin6_port != inet2->sin6_port)
8480
{
85-
return false;
81+
const struct sockaddr_in6* inet1 = reinterpret_cast<const struct sockaddr_in6*>(address1);
82+
const struct sockaddr_in6* inet2 = reinterpret_cast<const struct sockaddr_in6*>(address2);
83+
if (inet1->sin6_port != inet2->sin6_port)
84+
{
85+
return false;
86+
}
87+
return (0 == memcmp(&(inet1->sin6_addr), &(inet2->sin6_addr), sizeof(inet1->sin6_addr)));
8688
}
87-
return (0 == memcmp(&(inet1->sin6_addr), &(inet2->sin6_addr), sizeof(inet1->sin6_addr)));
88-
}
8989

9090
default:
9191
return false;

0 commit comments

Comments
 (0)