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

Commit a776d7b2 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Merge "Add toString() to android_net_context" am: a06edce4 am: 84d59ef2 

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



Change-Id: Ic54ed0019ee1003074213c27f474dfea935cc25d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44b7f66a 84d59ef2

DnsProxyListener.cpp

+4 −12
Original line number Diff line number Diff line
@@ -816,9 +816,7 @@ void DnsProxyListener::GetAddrInfoHandler::doDns64Synthesis(int32_t* rv, addrinf 
}



void DnsProxyListener::GetAddrInfoHandler::run() {

    LOG(INFO) << "GetAddrInfoHandler::run: {" << mNetContext.app_netid << " "

              << mNetContext.app_mark << " " << mNetContext.dns_netid << " " << mNetContext.dns_mark

              << " " << mNetContext.uid << " " << mNetContext.flags << "}";

    LOG(INFO) << "GetAddrInfoHandler::run: {" << mNetContext.toString() << "}";



    addrinfo* result = nullptr;

    Stopwatch s;
@@ -1000,9 +998,7 @@ DnsProxyListener::ResNSendHandler::ResNSendHandler(SocketClient* c, std::string 
    : Handler(c), mMsg(std::move(msg)), mFlags(flags), mNetContext(netcontext) {}



void DnsProxyListener::ResNSendHandler::run() {

    LOG(INFO) << "ResNSendHandler::run: " << mFlags << " / {" << mNetContext.app_netid << " "

              << mNetContext.app_mark << " " << mNetContext.dns_netid << " " << mNetContext.dns_mark

              << " " << mNetContext.uid << " " << mNetContext.flags << "}";

    LOG(INFO) << "ResNSendHandler::run: " << mFlags << " / {" << mNetContext.toString() << "}";



    Stopwatch s;

    maybeFixupNetContext(&mNetContext, mClient->getPid());
@@ -1235,9 +1231,7 @@ void DnsProxyListener::GetHostByNameHandler::doDns64Synthesis(int32_t* rv, hoste 
}



void DnsProxyListener::GetHostByNameHandler::run() {

    LOG(INFO) << "GetHostByNameHandler::run: {" << mNetContext.app_netid << " "

              << mNetContext.app_mark << " " << mNetContext.dns_netid << " " << mNetContext.dns_mark

              << " " << mNetContext.uid << " " << mNetContext.flags << "}";

    LOG(INFO) << "GetHostByNameHandler::run: {" << mNetContext.toString() << "}";

    Stopwatch s;

    maybeFixupNetContext(&mNetContext, mClient->getPid());

    const uid_t uid = mClient->getUid();
@@ -1399,9 +1393,7 @@ void DnsProxyListener::GetHostByAddrHandler::doDns64ReverseLookup(hostent* hbuf, 
}



void DnsProxyListener::GetHostByAddrHandler::run() {

    LOG(INFO) << "GetHostByAddrHandler::run: {" << mNetContext.app_netid << " "

              << mNetContext.app_mark << " " << mNetContext.dns_netid << " " << mNetContext.dns_mark

              << " " << mNetContext.uid << " " << mNetContext.flags << "}";

    LOG(INFO) << "GetHostByAddrHandler::run: {" << mNetContext.toString() << "}";

    Stopwatch s;

    maybeFixupNetContext(&mNetContext, mClient->getPid());

    const uid_t uid = mClient->getUid();

include/netd_resolv/resolv.h

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#pragma once



#include <android-base/format.h>

#include <arpa/nameser.h>

#include <netinet/in.h>
@@ -65,6 +66,11 @@ struct android_net_context { 
    unsigned flags;

    // Variable to store the pid of the application sending DNS query.

    pid_t pid = NET_CONTEXT_INVALID_PID;



    std::string toString() const {

        return fmt::format("{} {} {} {} {} {}", app_netid, app_mark, dns_netid, dns_mark, uid,

                           flags);

    }

};



#define NET_CONTEXT_FLAG_USE_LOCAL_NAMESERVERS 0x00000001