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

Commit d786ed82 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8069058 from bbeeb6a0 to tm-d1-release 

Change-Id: Ibbcaf6252433db0440677e469ab26531eeff9cd3
parents 75106377 bbeeb6a0

ResolverController.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ int getDnsInfo(unsigned netId, std::vector<std::string>* servers, std::vector<st 
        return 0;

        return 0;

    }

    }





    // Verify that the returned data is sane.

    // Verify that the returned data is valid.

    if (nscount < 0 || nscount > MAXNS || dcount < 0 || dcount > MAXDNSRCH) {

    if (nscount < 0 || nscount > MAXNS || dcount < 0 || dcount > MAXDNSRCH) {

        LOG(ERROR) << __func__ << ": nscount = " << nscount << ", dcount = " << dcount;

        LOG(ERROR) << __func__ << ": nscount = " << nscount << ", dcount = " << dcount;

        return -ENOTRECOVERABLE;

        return -ENOTRECOVERABLE;

doh/dispatcher/mod.rs

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ pub struct Dispatcher { 
}

}





impl Dispatcher {

impl Dispatcher {

    const DOH_THREADS: usize = 2;

    const DOH_THREADS: usize = 1;





    pub fn new(validation: ValidationReporter, tagger: SocketTagger) -> Result<Dispatcher> {

    pub fn new(validation: ValidationReporter, tagger: SocketTagger) -> Result<Dispatcher> {

        let (cmd_sender, cmd_receiver) = mpsc::channel::<Command>(MAX_BUFFERED_CMD_COUNT);

        let (cmd_sender, cmd_receiver) = mpsc::channel::<Command>(MAX_BUFFERED_CMD_COUNT);