AddAddress (net.cpp) doesn't update mapAddresses #642

After https://github.com/bitcoin/bitcoin/commit/940669657837e4a247a4d0746c12f52e8662f325

AddAddress doesn't update the nServices and the nTime in the mapAddresses when the address is already present.

The new code:

        addrFound = (*it).second;
        if ((addrFound.nServices | addr.nServices) != addrFound.nServices)
        {
            // Services have been added
            addrFound.nServices |= addr.nServices;
            fUpdated = true;
        }

The old code

        CAddress& addrFound = (*it).second;
        if ((addrFound.nServices | addr.nServices) != addrFound.nServices)
        {
            // Services have been added
            addrFound.nServices |= addr.nServices;
            fUpdated = true;
        }

where (*it) is an iterator on the mapAddresses (there is a second if block after this one that modifies addrFound.nTime, but to show the problem it isn't important)

The difference is in the & of addrFound. Before when we modified addrFound we modified the "live" version of the mapAddresses, now we modify a copy that will be discarded at the end of the function.

My mistake; this issue still exists, though it is fixed in addrman (#787).

Fixed now, now that addrman is pulled?

Yes, see https://github.com/bitcoin/bitcoin/blob/399ff1fe05aba8bdde092144eb524198a810f3ac/src/addrman.cpp#L312