Mercurial > hg > bitcoin
changeset 2547:cf79ecb22152 draft
Merge pull request #1284 from laanwj/2012_05_helpmessage
Move help message out of AppInit2
| author | Wladimir J. van der Laan <laanwj@gmail.com> |
|---|---|
| date | Sun, 13 May 2012 12:39:35 -0700 |
| parents | 7b5d66ba66bd (diff) fb589632c674 (current diff) |
| children | c7049fd91250 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/irc.cpp +++ b/src/irc.cpp @@ -246,11 +246,12 @@ return; } + CNetAddr addrIPv4("1.2.3.4"); // arbitrary IPv4 address to make GetLocal prefer IPv4 addresses CService addrLocal; string strMyName; - if (GetLocal(addrLocal, &addrConnect)) + if (GetLocal(addrLocal, &addrIPv4)) strMyName = EncodeAddress(GetLocalAddress(&addrConnect)); - else + if (strMyName == "") strMyName = strprintf("x%u", GetRand(1000000000)); Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str());