diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-01-03 23:33:31 +0100 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-01-06 18:55:37 +0100 |
commit | 67a42f929b1434f647c63922fd02dc2b93b28060 (patch) | |
tree | 9c4313e815bd77e817f2dc5b796347d343458d0e /src/qt | |
parent | 7486c64dd8436febbe59e82dbb875e83ad6b5194 (diff) |
Network stack refactor
This introduces CNetAddr and CService, respectively wrapping an
(IPv6) IP address and an IP+port combination. This functionality used
to be part of CAddress, which also contains network flags and
connection attempt information. These extra fields are however not
always necessary.
These classes, along with logic for creating connections and doing
name lookups, are moved to netbase.{h,cpp}, which does not depend on
headers.h.
Furthermore, CNetAddr is mostly IPv6-ready, though IPv6
functionality is not yet enabled for the application itself.
Diffstat (limited to 'src/qt')
-rw-r--r-- | src/qt/optionsmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index a68c84c957..3237845c2c 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -88,9 +88,9 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in { // Use CAddress to parse and check IP CAddress addr(value.toString().toStdString() + ":1"); - if (addr.ip != INADDR_NONE) + if (addr.IsValid()) { - addrProxy.ip = addr.ip; + addrProxy.SetIP(addr); walletdb.WriteSetting("addrProxy", addrProxy); } else @@ -104,7 +104,7 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in int nPort = atoi(value.toString().toAscii().data()); if (nPort > 0 && nPort < std::numeric_limits<unsigned short>::max()) { - addrProxy.port = htons(nPort); + addrProxy.SetPort(nPort); walletdb.WriteSetting("addrProxy", addrProxy); } else |