Merge pull request #1287 from sipa/noirc6

Only encode IPv4 addresses in IRC nicks
2012-05-13 11:48:27 -07:00 · 2012-05-13 11:48:27 -07:00 · 28d257da11
parent 5e794a9ab7 8f737d28a6
commit 28d257da11
1 changed files with 3 additions and 2 deletions
--- 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());