diff options
| author | Jeff Garzik <jeff@garzik.org> | 2011-05-17 01:38:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-17 01:38:15 -0400 |
| commit | 0c97aa9e141f5c23dc9f80e5fb4c8297d8a6b4dd (patch) | |
| tree | 8bdd77d7c65aaa3bf16c400d101340015d32ed65 /src | |
| parent | 270e944e30cbfdcd4411dbe8d2fbc6bd0bab0fc0 (diff) | |
| parent | 112262cb2413f413f020e9141061efa086eb5538 (diff) | |
| download | bitcoin-0c97aa9e141f5c23dc9f80e5fb4c8297d8a6b4dd.tar.xz | |
Merge branch 'master' of git://github.com/bitcoin/bitcoinv0.3.22rc2
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/net.cpp b/src/net.cpp index 1320781cb2..85a5f35d28 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -56,6 +56,10 @@ CAddress addrProxy("127.0.0.1",9050); +unsigned short GetListenPort() +{ + return (unsigned short)(GetArg("-port", GetDefaultPort())); +} void CNode::PushGetBlocks(CBlockIndex* pindexBegin, uint256 hashEnd) { @@ -965,7 +969,7 @@ void ThreadMapPort2(void* parg) printf("ThreadMapPort started\n"); char port[6]; - sprintf(port, "%d", GetDefaultPort()); + sprintf(port, "%d", GetListenPort()); const char * rootdescurl = 0; const char * multicastif = 0; @@ -1435,14 +1439,11 @@ void ThreadMessageHandler2(void* parg) - - - bool BindListenPort(string& strError) { strError = ""; int nOne = 1; - addrLocalHost.port = htons(GetDefaultPort()); + addrLocalHost.port = htons(GetListenPort()); #ifdef __WXMSW__ // Initialize Windows Sockets @@ -1494,7 +1495,7 @@ bool BindListenPort(string& strError) memset(&sockaddr, 0, sizeof(sockaddr)); sockaddr.sin_family = AF_INET; sockaddr.sin_addr.s_addr = INADDR_ANY; // bind to all IPs on this computer - sockaddr.sin_port = htons(GetDefaultPort()); + sockaddr.sin_port = htons(GetListenPort()); if (::bind(hListenSocket, (struct sockaddr*)&sockaddr, sizeof(sockaddr)) == SOCKET_ERROR) { int nErr = WSAGetLastError(); @@ -1556,7 +1557,7 @@ void StartNode(void* parg) printf("ipv4 %s: %s\n", ifa->ifa_name, pszIP); // Take the first IP that isn't loopback 127.x.x.x - CAddress addr(*(unsigned int*)&s4->sin_addr, 0, nLocalServices); + CAddress addr(*(unsigned int*)&s4->sin_addr, GetListenPort(), nLocalServices); if (addr.IsValid() && addr.GetByte(3) != 127) { addrLocalHost = addr; |