summaryrefslogtreecommitdiff
path: root/light-client/src/network.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2024-07-15 18:20:40 +0200
committermetamuffin <metamuffin@disroot.org>2024-07-15 18:20:40 +0200
commit1aa4f358bc22bda63c062683fd0749541e9fad61 (patch)
tree409eeaba95794e19974fb1597fd54649e4f7c0ce /light-client/src/network.rs
parentb66e12ccd8823ffeaff23e2b4e5426cb15f59c99 (diff)
downloadhurrycurry-1aa4f358bc22bda63c062683fd0749541e9fad61.tar
hurrycurry-1aa4f358bc22bda63c062683fd0749541e9fad61.tar.bz2
hurrycurry-1aa4f358bc22bda63c062683fd0749541e9fad61.tar.zst
fix rendering again
Diffstat (limited to 'light-client/src/network.rs')
-rw-r--r--light-client/src/network.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/light-client/src/network.rs b/light-client/src/network.rs
index 3eb3f50a..997a3344 100644
--- a/light-client/src/network.rs
+++ b/light-client/src/network.rs
@@ -36,27 +36,26 @@ pub struct Network {
impl Network {
pub fn connect(addr: &str) -> Result<Self> {
let (parts, _) = addr.into_client_request().unwrap().into_parts();
- let uri = parts.uri.clone();
-
let mut builder = Request::builder()
- .uri(uri.clone())
+ .uri(parts.uri.clone().clone())
.method(parts.method.clone())
.version(parts.version);
*builder.headers_mut().unwrap() = parts.headers.clone();
let request = builder.body(()).unwrap();
- let uri = request.uri();
- let mode = uri_mode(uri)?;
let host = request.uri().host().unwrap();
let host = if host.starts_with('[') {
&host[1..host.len() - 1]
} else {
host
};
- let port = uri.port_u16().unwrap_or(match mode {
- Mode::Plain => 27032,
- Mode::Tls => 443,
- });
+ let port = request
+ .uri()
+ .port_u16()
+ .unwrap_or(match uri_mode(request.uri())? {
+ Mode::Plain => 27032,
+ Mode::Tls => 443,
+ });
let stream = TcpStream::connect((host, port))?;
stream.set_nodelay(true).unwrap();