diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-10-02 16:48:01 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-10-02 16:48:05 +0200 |
| commit | 1cf22b27a6b95e1e44c35157f5c5ccb73efec9da (patch) | |
| tree | 770a470c84cd8c7c7ef816dd2c34078d5aebbc7a /src/wallet/wallet2.cpp | |
| parent | simplewallet ignoring testnet port in RPC mode (diff) | |
| parent | Daemon should now exit on conflicting checkpoints (diff) | |
| download | monero-1cf22b27a6b95e1e44c35157f5c5ccb73efec9da.tar.xz | |
Merge pull request #165
c0bdd51 Daemon should now exit on conflicting checkpoints (Thomas Winget)
f0b4138 various changes to runtime checkpoint updating (Thomas Winget)
7568f89 Fixed segfault with checkpoints loading (Thomas Winget)
b261d92 DNS checkpoint updating added, and daemon flag to enforce them (Thomas Winget)
30caebf reload checkpoints file every ~hr and print if any fail (Thomas Winget)
0e14491 updated DNSResolver/things that use it for DNSSEC (Thomas Winget)
6f2c2e1 Adding an identical existing checkpoint should not error (Thomas Winget)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 3161f3b16..6fb672798 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -833,12 +833,17 @@ std::vector<std::vector<cryptonote::tx_destination_entry>> split_amounts( */ std::vector<std::string> wallet2::addresses_from_url(const std::string& url, bool& dnssec_valid) { - // TODO: update this correctly once DNSResolver::get_txt_record() supports it. - dnssec_valid = false; - std::vector<std::string> addresses; // get txt records - auto records = tools::DNSResolver::instance().get_txt_record(url); + bool dnssec_available, dnssec_isvalid; + auto records = tools::DNSResolver::instance().get_txt_record(url, dnssec_available, dnssec_isvalid); + + // TODO: update this to allow for conveying that dnssec was not available + if (dnssec_available && dnssec_isvalid) + { + dnssec_valid = true; + } + else dnssec_valid = false; // for each txt record, try to find a monero address in it. for (auto& rec : records) |