Fix addrProxy setting #899

pull sipa wants to merge 1 commits into bitcoin:master from sipa:fixproxysetting changing 2 files +17 −3

sipa commented at 8:15 PM on February 25, 2012: member

Before 0.6 addrProxy was a CAddress, but netbase changed it to CService. Retain compatibility by wrapping/unwrapping with a CAddress when saving or loading.

This commit retains compatibility with 0.6.0rc1 (which wrote the setting as a CService) by trying to parse twice.

Fixes #814

Fix addrProxy setting

Before 0.6 addrProxy was a CAddress, but netbase changed it to CService.
Retain compatibility by wrapping/unwrapping with a CAddress when saving
or loading.

This commit retains compatibility with 0.6.0rc1 (which wrote the setting
as a CService) by trying to parse twice.

4a10d4c6dc

sipa commented at 8:16 PM on February 25, 2012: member

In case compatibility with 0.6.0rc1 is not required, this code suffices:

if (strKey == "addrProxy") { CAddress addr; ssValue >> addr; addrProxy = addr; }
gavinandresen commented at 9:47 PM on February 25, 2012: contributor

ACK.
gavinandresen merged this on Feb 27, 2012
gavinandresen closed this on Feb 27, 2012
suprnurd referenced this in commit 3c29252469 on Dec 5, 2017
lateminer referenced this in commit 4b22a09024 on Oct 30, 2019
DrahtBot locked this on Sep 8, 2021

Contributors

sipa

gavinandresen

Linked (view graph)

#814 IPv6 address in proxy field?#904 No options in wallet + fix proxy settings