Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e5f2d16 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix warnings in preparation for Rust 1.54.0" am: de030247 am: 42f0d965 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1780627

Change-Id: I655a8088978ba92153c089a24018fa95ecca4d77
parents 70895565 42f0d965

doh.rs

+7 −8
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ impl DohConnection { 
            return Err(anyhow!("quic connection is not ready"));

        }

        let h3_conn = self.h3_conn.as_mut().ok_or_else(|| anyhow!("h3 conn isn't available"))?;

        let stream_id = h3_conn.send_request(&mut self.quic_conn, &req, false /*fin*/)?;

        let stream_id = h3_conn.send_request(&mut self.quic_conn, req, false /*fin*/)?;

        self.flush_tx().await?;

        Ok(stream_id)

    }
@@ -278,7 +278,7 @@ impl DohConnection { 
    fn resume_connection(&mut self, quic_conn: Pin<Box<quiche::Connection>>) {

        self.quic_conn = quic_conn;

        if let Some(session) = &self.cached_session {

            if self.quic_conn.set_session(&session).is_err() {

            if self.quic_conn.set_session(session).is_err() {

                warn!("can't restore session for network {}", self.net_id);

            }

        }
@@ -534,16 +534,15 @@ fn make_connection_if_needed( 
        // The cert path is not either empty or SYSTEM_CERT_PATH, which means it's used by tests,

        // it's not necessary to cache the config.

        Some(cert_path) if cert_path != SYSTEM_CERT_PATH => {

            let mut config = create_quiche_config(Some(&cert_path))?;

            let doh = DohConnection::new(&info, &mut config)?;

            let mut config = create_quiche_config(Some(cert_path))?;

            let doh = DohConnection::new(info, &mut config)?;

            doh_conn_map.insert(info.net_id, (info.clone(), None));

            Ok(Some(doh))

        }

        // The normal cases, get the config from config cache.

        cert_path => {

            let config =

                config_cache.get(&cert_path)?.ok_or_else(|| anyhow!("no quiche config"))?;

            let doh = DohConnection::new(&info, config)?;

            let config = config_cache.get(cert_path)?.ok_or_else(|| anyhow!("no quiche config"))?;

            let doh = DohConnection::new(info, config)?;

            doh_conn_map.insert(info.net_id, (info.clone(), None));

            Ok(Some(doh))

        }
@@ -693,7 +692,7 @@ async fn doh_handler( 
fn make_dns_request(base64_query: &str, url: &url::Url) -> Result<DnsRequest> {

    let mut path = String::from(url.path());

    path.push_str("?dns=");

    path.push_str(&base64_query);

    path.push_str(base64_query);

    let req = vec![

        quiche::h3::Header::new(b":method", b"GET"),

        quiche::h3::Header::new(b":scheme", b"https"),