Merge pull request #336

6eddd9c AddressBook + HTTP: remove unnecessary else statements (anonimal) 418edac AddressBook + HTTP: resolve #336 comments and more (anonimal) 1ac2d80 AddressBook: use std::thread::join when downloading (anonimal) 37f0508 AddressBook: add bounds checking + resolve TODO's (anonimal) 216a2a1 AddressBook: fix writing new subscription to disk only if subscription doesn't exist (anonimal) 03019c0 Package: add monero{price,nodes,world}.i2p to hosts.txt (anonimal) d186de6 Package: add common CA certs for manas.ca and getmonero.org (anonimal) 7ffb5b6 AddressBook: refactor defaults into AddressBookDefaults (anonimal) add429b HTTP/AddressBook: major refactoring + download impl (anonimal) 7458653 Package: add downloads.getmonero.org SSL cert (anonimal) c93407a Package: create publishers.txt for address book (anonimal) bf141be AddressBook: sanity tests + narrative + refactor (anonimal) 0498624 AddressBook: refactoring, documentation, and more (anonimal) 2f9839d AddresBook: datatype refactor. Refs #305 (anonimal) f943ffc AddressBook: documenting + refactoring. Refs #305 (anonimal)
monero-project · Sep 8, 2016 · 4a7c6a3 · 4a7c6a3
2 parents 99666cf + 6eddd9c
commit 4a7c6a3
Show file tree

Hide file tree

Showing 25 changed files with 5,776 additions and 785 deletions.
diff --git a/pkg/certificates/ssl/2e5ac55d.0 b/pkg/certificates/ssl/2e5ac55d.0
diff --git a/pkg/certificates/ssl/ca-certificates.crt b/pkg/certificates/ssl/ca-certificates.crt
diff --git a/pkg/certificates/ssl/downloads.getmonero.org.crt b/pkg/certificates/ssl/downloads.getmonero.org.crt
@@ -0,0 +1 @@
+ca-certificates.crt
diff --git a/pkg/certificates/ssl/i2p-0.manas.ca.crt b/pkg/certificates/ssl/i2p-0.manas.ca.crt
@@ -1 +1 @@
-2e5ac55d.0
+ca-certificates.crt
diff --git a/pkg/certificates/ssl/i2p.manas.ca.crt b/pkg/certificates/ssl/i2p.manas.ca.crt
@@ -1 +1 @@
-2e5ac55d.0
+ca-certificates.crt
diff --git a/pkg/hosts.txt b/pkg/hosts.txt
diff --git a/pkg/publishers.txt b/pkg/publishers.txt
@@ -0,0 +1 @@
+https://downloads.getmonero.org/kovri/hosts.txt
diff --git a/src/app/daemon.cc b/src/app/daemon.cc
@@ -264,7 +264,7 @@ void Daemon_Singleton::SetupTunnels() {
         else
           LogPrint(eLogError,
               "Daemon_Singleton: I2P server tunnel for destination ",
-              i2p::client::context.GetAddressBook().ToAddress(
+              i2p::client::context.GetAddressBook().GetB32AddressFromIdentHash(
                   local_destination->GetIdentHash()),
               " already exists");
       } else {

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -7,6 +7,7 @@ set(CLIENT_SRC
   "i2p_tunnel/socks.cc"
   "streaming.cc"
   "address_book.cc"
+  "address_book_storage.cc"
   "destination.cc"
   "client_context.cc"
   "i2p_service.cc")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		https://downloads.getmonero.org/kovri/hosts.txt