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

Commit 9d2d25bc authored by Luke Huang's avatar Luke Huang
Browse files

Move ScopedAddrinfo to libnetdutils 

This is a preparation step for stopping include system/netd/include.

Bug: 135235267
Test: m
      cd system/netd && atest
Change-Id: Idfe5e25e8016881987c322b333ea37c502e5d7ca
parent ef1fcb6f

Dns64Configuration.cpp

+4 −3
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ 


#include <android-base/logging.h>

#include <netdb.h>

#include <netdutils/BackoffSequence.h>

#include <netdutils/DumpWriter.h>

#include <netdutils/InternetAddresses.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 {
@@ -39,6 +39,7 @@ 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;

dns_responder/dns_responder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ 
#define LOG_TAG "DNSResponder"

#include <android-base/logging.h>

#include <android-base/strings.h>

#include <netdutils/InternetAddresses.h>

#include <netdutils/SocketOption.h>



#include "NetdConstants.h"



using android::netdutils::enableSockopt;

using android::netdutils::ScopedAddrinfo;



namespace test {

dns_responder/dns_tls_frontend.cpp

+2 −0
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ 


#define LOG_TAG "DnsTlsFrontend"

#include <android-base/logging.h>

#include <netdutils/InternetAddresses.h>

#include <netdutils/SocketOption.h>



#include "NetdConstants.h"  // SHA256_SIZE



using android::netdutils::enableSockopt;

using android::netdutils::ScopedAddrinfo;



namespace {

resolver_test.cpp

+4 −2
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#include <gmock/gmock-matchers.h>

#include <gtest/gtest.h>

#include <netdb.h>

#include <netdutils/InternetAddresses.h>

#include <netdutils/ResponseCode.h>

#include <netdutils/SocketOption.h>

#include <netinet/in.h>

#include <openssl/base64.h>

#include <poll.h> /* poll */
@@ -55,8 +58,6 @@ 
#include "dns_responder/dns_responder_client.h"

#include "dns_responder/dns_tls_frontend.h"

#include "netd_resolv/params.h"  // MAXNS

#include "netdutils/ResponseCode.h"

#include "netdutils/SocketOption.h"

#include "netid_client.h"  // NETID_UNSET

#include "tests/dns_metrics_listener/dns_metrics_listener.h"

#include "tests/resolv_test_utils.h"
@@ -78,6 +79,7 @@ using android::net::ResolverStats; 
using android::net::metrics::DnsMetricsListener;

using android::netdutils::enableSockopt;

using android::netdutils::ResponseCode;

using android::netdutils::ScopedAddrinfo;



// TODO: move into libnetdutils?

namespace {