diff options
| author | Jeff Garzik <jgarzik@exmulti.com> | 2012-05-13 11:48:27 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-05-13 11:48:27 -0700 |
| commit | 28d257da11cde2e9ff1ccf5fbec0b23cfecb2a49 (patch) | |
| tree | 37bca19ef253b053d63dd85f3f7b6378769d4311 /src | |
| parent | 5e794a9ab7449cee8ea9f2d2e23ff764f71a91c9 (diff) | |
| parent | 8f737d28a6a48070b5d3049fc183cf47c474fb0a (diff) | |
| download | bitcoin-28d257da11cde2e9ff1ccf5fbec0b23cfecb2a49.tar.xz | |
Merge pull request #1287 from sipa/noirc6
Only encode IPv4 addresses in IRC nicks
Diffstat (limited to 'src')
| -rw-r--r-- | src/irc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/irc.cpp b/src/irc.cpp index 525bd7a8da..4baffedb54 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -246,11 +246,12 @@ void ThreadIRCSeed2(void* parg) 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()); |