X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-block-sync%2Fsrc%2Fhttp.rs;h=a3935edf5cb6e9880217196112d8f4ead5bacd57;hb=1af705579ba5b19ffcbd5ee95f8841cf5236e2b9;hp=89eb95dcff84a5165b5dcfdf27f54d71d69f57a4;hpb=61648fc804dbb22147a239223c2483967c4c8e62;p=rust-lightning

diff --git a/lightning-block-sync/src/http.rs b/lightning-block-sync/src/http.rs
index 89eb95dc..a3935edf 100644
--- a/lightning-block-sync/src/http.rs
+++ b/lightning-block-sync/src/http.rs
@@ -8,7 +8,7 @@ use std::convert::TryFrom;
 use std::fmt;
 #[cfg(not(feature = "tokio"))]
 use std::io::Write;
-use std::net::ToSocketAddrs;
+use std::net::{SocketAddr, ToSocketAddrs};
 use std::time::Duration;
 
 #[cfg(feature = "tokio")]
@@ -27,9 +27,10 @@ const TCP_STREAM_TIMEOUT: Duration = Duration::from_secs(5);
 
 /// Timeout for reading the first byte of a response. This is separate from the general read
 /// timeout as it is not uncommon for Bitcoin Core to be blocked waiting on UTXO cache flushes for
-/// upwards of a minute or more. Note that we always retry once when we time out, so the maximum
-/// time we allow Bitcoin Core to block for is twice this value.
-const TCP_STREAM_RESPONSE_TIMEOUT: Duration = Duration::from_secs(120);
+/// upwards of 10 minutes on slow devices (e.g. RPis with SSDs over USB). Note that we always retry
+/// once when we time out, so the maximum time we allow Bitcoin Core to block for is twice this
+/// value.
+const TCP_STREAM_RESPONSE_TIMEOUT: Duration = Duration::from_secs(300);
 
 /// Maximum HTTP message header size in bytes.
 const MAX_HTTP_MESSAGE_HEADER_SIZE: usize = 8192;
@@ -97,6 +98,7 @@ impl<'a> std::net::ToSocketAddrs for &'a HttpEndpoint {
 
 /// Client for making HTTP requests.
 pub(crate) struct HttpClient {
+	address: SocketAddr,
 	stream: TcpStream,
 }
 
@@ -119,7 +121,7 @@ impl HttpClient {
 			TcpStream::from_std(stream)?
 		};
 
-		Ok(Self { stream })
+		Ok(Self { address, stream })
 	}
 
 	/// Sends a `GET` request for a resource identified by `uri` at the `host`.
@@ -162,7 +164,6 @@ impl HttpClient {
 	/// Sends an HTTP request message and reads the response, returning its body. Attempts to
 	/// reconnect and retry if the connection has been closed.
 	async fn send_request_with_retry(&mut self, request: &str) -> std::io::Result<Vec<u8>> {
-		let endpoint = self.stream.peer_addr().unwrap();
 		match self.send_request(request).await {
 			Ok(bytes) => Ok(bytes),
 			Err(_) => {
@@ -176,7 +177,7 @@ impl HttpClient {
 				tokio::time::sleep(Duration::from_millis(100)).await;
 				#[cfg(not(feature = "tokio"))]
 				std::thread::sleep(Duration::from_millis(100));
-				*self = Self::connect(endpoint)?;
+				*self = Self::connect(self.address)?;
 				self.send_request(request).await
 			},
 		}
@@ -636,7 +637,10 @@ pub(crate) mod client_tests {
 	#[test]
 	fn connect_to_unresolvable_host() {
 		match HttpClient::connect(("example.invalid", 80)) {
-			Err(e) => assert_eq!(e.kind(), std::io::ErrorKind::Other),
+			Err(e) => {
+				assert!(e.to_string().contains("failed to lookup address information") ||
+					e.to_string().contains("No such host"), "{:?}", e);
+			},
 			Ok(_) => panic!("Expected error"),
 		}
 	}