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

Commit 02e528be authored by Luke Huang's avatar Luke Huang Committed by Gerrit Code Review
Browse files

Merge changes Iaeff2072,Ibe1dc22a,Idfe5e25e 

* changes:
  Use header_libs instead of include_dirs for resolv
  Move SHA256_SIZE define to libnetdutils and stop including netd header
  Move ScopedAddrinfo to libnetdutils
parents 3f1b552d f4c98f27

Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -80,9 +80,8 @@ cc_library { 
    shared_libs: [

        "libbinder_ndk",

    ],

    include_dirs: [

        "system/netd/include",

        "system/netd/server",

    header_libs: [

        "libnetd_client_headers",

    ],

    export_include_dirs: ["include"],

    // TODO: pie in the sky: make this code clang-tidy clean
@@ -152,7 +151,6 @@ cc_test { 
    ],

    include_dirs: [

        "system/netd/resolv/include",

        "system/netd/server",

    ],

    shared_libs: [

        "libbase",

Dns64Configuration.cpp

+5 −4
Original line number Diff line number Diff line
@@ -21,24 +21,25 @@ 


#include <android-base/logging.h>

#include <netdb.h>

#include <netdutils/BackoffSequence.h>

#include <netdutils/DumpWriter.h>

#include <netdutils/InternetAddresses.h>

#include <netid_client.h>

#include <thread>

#include <utility>



#include <arpa/inet.h>



#include "DnsResolver.h"

#include "NetdConstants.h"  // ScopedAddrinfo

#include "getaddrinfo.h"

#include "netd_resolv/resolv.h"

#include "netdutils/BackoffSequence.h"

#include "netdutils/DumpWriter.h"

#include "netid_client.h"



namespace android {



using netdutils::DumpWriter;

using netdutils::IPAddress;

using netdutils::IPPrefix;

using netdutils::ScopedAddrinfo;



namespace net {

Dns64Configuration.h

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include <unordered_map>



#include <android-base/thread_annotations.h>

#include "netdutils/DumpWriter.h"

#include "netdutils/InternetAddresses.h"

#include <netdutils/DumpWriter.h>

#include <netdutils/InternetAddresses.h>



struct android_net_context;

DnsProxyListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <list>

#include <vector>



#include <NetdClient.h>  // NETID_USE_LOCAL_NAMESERVERS

#include <android-base/stringprintf.h>

#include <android/multinetwork.h>  // ResNsendFlags

#include <cutils/misc.h>           // FIRST_APPLICATION_UID
@@ -49,7 +50,6 @@ 
#include <sysutils/SocketClient.h>



#include "DnsResolver.h"

#include "NetdClient.h"  // NETID_USE_LOCAL_NAMESERVERS

#include "NetdPermissions.h"

#include "PrivateDnsConfiguration.h"

#include "ResolverEventReporter.h"

DnsResolverService.cpp

+3 −5
Original line number Diff line number Diff line
@@ -21,20 +21,18 @@ 
#include <set>

#include <vector>



#include <BinderUtil.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <android/binder_manager.h>

#include <android/binder_process.h>

#include <json/value.h>

#include <json/writer.h>

#include <log/log.h>

#include <netdutils/DumpWriter.h>

#include <netdutils/NetworkConstants.h>  // SHA256_SIZE

#include <openssl/base64.h>

#include <private/android_filesystem_config.h>  // AID_SYSTEM



#include "BinderUtil.h"

#include "DnsResolver.h"

#include "NetdConstants.h"    // SHA256_SIZE

#include "NetdPermissions.h"  // PERM_*

#include "ResolverEventReporter.h"

#include "resolv_cache.h"
@@ -186,7 +184,7 @@ static std::vector<uint8_t> parseBase64(const std::string& input) { 
    } else {

        decoded.clear();

    }

    if (out_len != SHA256_SIZE) {

    if (out_len != android::netdutils::SHA256_SIZE) {

        decoded.clear();

    }

    return decoded;