diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:16:40 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:19:48 +0000 |
| commit | cafa8f2879c255c4526709e77b3e42c5b2533b5e (patch) | |
| tree | 616fe57c52df382e48341f595871ff43721ea90c /src/net.cpp | |
| parent | 89c5c381b7e8e29da361e1bf647010ad94e5fea0 (diff) | |
| parent | 982f4fd301435e56bb959267a8f69ff793b10e26 (diff) | |
| download | bitcoin-cafa8f2879c255c4526709e77b3e42c5b2533b5e.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/key.h
src/keystore.h
src/net.h
src/protocol.cpp
src/qt/guiutil.h
src/test/DoS_tests.cpp
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net.cpp b/src/net.cpp index 7f2f48a678..00d7e5a13e 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -200,7 +200,7 @@ bool GetMyExternalIP(CNetAddr& ipRet) { // We should be phasing out our use of sites like these. If we need // replacements, we should ask for volunteers to put this simple - // php file on their webserver that prints the client IP: + // php file on their web server that prints the client IP: // <?php echo $_SERVER["REMOTE_ADDR"]; ?> if (nHost == 1) { @@ -444,7 +444,7 @@ CNode* ConnectNode(CAddress addrConnect, int64 nTimeout) /// debug print printf("connected %s\n", addrConnect.ToString().c_str()); - // Set to nonblocking + // Set to non-blocking #ifdef WIN32 u_long nOne = 1; if (ioctlsocket(hSocket, FIONBIO, &nOne) == SOCKET_ERROR) @@ -1588,7 +1588,7 @@ bool BindListenPort(string& strError) #endif #ifdef WIN32 - // Set to nonblocking, incoming connections will also inherit this + // Set to non-blocking, incoming connections will also inherit this if (ioctlsocket(hListenSocket, FIONBIO, (u_long*)&nOne) == SOCKET_ERROR) #else if (fcntl(hListenSocket, F_SETFL, O_NONBLOCK) == SOCKET_ERROR) @@ -1643,7 +1643,7 @@ void StartNode(void* parg) pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress(CService("127.0.0.1", 0), nLocalServices)); #ifdef WIN32 - // Get local host ip + // Get local host IP char pszHostName[1000] = ""; if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR) { @@ -1657,7 +1657,7 @@ void StartNode(void* parg) } } #else - // Get local host ip + // Get local host IP struct ifaddrs* myaddrs; if (getifaddrs(&myaddrs) == 0) { |