diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
commit | 797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c (patch) | |
tree | e020813e04c0d63487147f9b586b34367bed9252 /src/net.cpp | |
parent | 5951d9fe3224b11ba9ae45df4fe44804ec0efd83 (diff) | |
parent | 9e98fe6f584d8bdd0ffe4d5dc5c0b908beb456db (diff) | |
download | bitcoin-797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c.tar.xz |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/net.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 e0041ed24b..793ec223df 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -357,7 +357,7 @@ bool GetMyExternalIP(unsigned int& 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) { @@ -680,7 +680,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) @@ -1758,7 +1758,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) @@ -1805,7 +1805,7 @@ void StartNode(void* parg) pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress("127.0.0.1", 0, false, nLocalServices)); #ifdef WIN32 - // Get local host ip + // Get local host IP char pszHostName[1000] = ""; if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR) { @@ -1819,7 +1819,7 @@ void StartNode(void* parg) } } #else - // Get local host ip + // Get local host IP struct ifaddrs* myaddrs; if (getifaddrs(&myaddrs) == 0) { |