Mercurial > cabal
diff sources/network.cpp @ 5:0faceb076254
code clean up
added PID to the default Core argument
bool => true|false
| author | Vlad Glagolev <enqlave@gmail.com> |
|---|---|
| date | Thu, 24 Jan 2008 21:00:52 +0300 |
| parents | a7051ac7118b |
| children | 9be05a31b7f9 |
line wrap: on
line diff
--- a/sources/network.cpp Thu Jan 24 19:38:34 2008 +0300 +++ b/sources/network.cpp Thu Jan 24 21:00:52 2008 +0300 @@ -73,14 +73,14 @@ err = recv(cs, &cbuffer, 1, 0); if (!err) - shut ("remote server closed connection"); + shut("remote server closed connection"); else if (err < 0) - shut ("failed to receive data"); + shut("failed to receive data"); else sbuffer += cbuffer; } } else if (!err) - shut ("remote server closed connection"); + shut("remote server closed connection"); return sbuffer; } @@ -91,7 +91,7 @@ bool Network::resolveHost(pchar name, struct address_type *a, int inet) { #ifdef ENABLE_IPV6 - bool e = 0; + bool e = false; struct addrinfo hints, *res, *reso; struct sockaddr_in *in; @@ -114,17 +114,17 @@ in6 = (struct sockaddr_in6 *)res->ai_addr; memcpy (&a->sa6.sin6_addr, &in6->sin6_addr, \ sizeof (struct in6_addr)); - e = 1; + e = true; break; case AF_INET: a->inet = AF_INET; in = (struct sockaddr_in *)res->ai_addr; memcpy (&a->sa.sin_addr, &in->sin_addr, \ sizeof (struct in_addr)); - e = 1; + e = true; break; default: - e = 0; + e = false; } } @@ -176,10 +176,10 @@ #ifdef ENABLE_IPV6 if (a.inet == AF_INET6) - e = bind(cs, (struct sockaddr *)&a.sa6, sizeof (a.sa6)); + e = bind(cs, (struct sockaddr *)&a.sa6, sizeof(a.sa6)); else #endif // ENABLE_IPV6 - e = bind(cs, (struct sockaddr *)&a.sa, sizeof (a.sa)); + e = bind(cs, (struct sockaddr *)&a.sa, sizeof(a.sa)); if (e == -1) { close(cs); @@ -207,7 +207,7 @@ connected = 0; connecting = 1; - cout << "NETWORK: socket opened........... " << cs << endl; + cout << "NETWORK: socket opened..........: " << cs << endl; return 1; } @@ -224,8 +224,8 @@ if (e == -1) { if (errno == EISCONN) { - connected = 1; - connecting = 0; + connected = true; + connecting = false; return 1; } @@ -233,7 +233,7 @@ if (errno != EWOULDBLOCK && errno != EINPROGRESS && errno != EALREADY) { closeSocket(); - connecting = 0; + connecting = false; return 0; } @@ -241,10 +241,10 @@ return 1; } - connected = 1; - connecting = 0; + connected = true; + connecting = false; - cout << "NETWORK: socket connected........ " << cs << endl; + cout << "NETWORK: socket connected.......: " << cs << endl; return 1; }
