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

Commit 70ea4b84 authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Delete command objects in DnsProxyListener destructor" am: fef7c1a1 

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



Change-Id: Ia4ecdf469cc8d3c8b2cbdda7e17709322aa4a0fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 781461c7 fef7c1a1

DnsProxyListener.cpp

+14 −5
Original line number Diff line number Diff line
@@ -659,11 +659,20 @@ std::string makeThreadName(unsigned netId, uint32_t uid) { 
}  // namespace



DnsProxyListener::DnsProxyListener() : FrameworkListener(SOCKET_NAME) {

    registerCmd(new GetAddrInfoCmd());

    registerCmd(new GetHostByAddrCmd());

    registerCmd(new GetHostByNameCmd());

    registerCmd(new ResNSendCommand());

    registerCmd(new GetDnsNetIdCommand());

    mGetAddrInfoCmd = std::make_unique<GetAddrInfoCmd>();

    registerCmd(mGetAddrInfoCmd.get());



    mGetHostByAddrCmd = std::make_unique<GetHostByAddrCmd>();

    registerCmd(mGetHostByAddrCmd.get());



    mGetHostByNameCmd = std::make_unique<GetHostByNameCmd>();

    registerCmd(mGetHostByNameCmd.get());



    mResNSendCommand = std::make_unique<ResNSendCommand>();

    registerCmd(mResNSendCommand.get());



    mGetDnsNetIdCommand = std::make_unique<GetDnsNetIdCommand>();

    registerCmd(mGetDnsNetIdCommand.get());

}



void DnsProxyListener::Handler::spawn() {

DnsProxyListener.h

+6 −0
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ class DnsProxyListener : public FrameworkListener { 
        virtual ~GetDnsNetIdCommand() {}

        int runCommand(SocketClient* c, int argc, char** argv) override;

    };



    std::unique_ptr<GetAddrInfoCmd> mGetAddrInfoCmd;

    std::unique_ptr<GetHostByAddrCmd> mGetHostByAddrCmd;

    std::unique_ptr<GetHostByNameCmd> mGetHostByNameCmd;

    std::unique_ptr<ResNSendCommand> mResNSendCommand;

    std::unique_ptr<GetDnsNetIdCommand> mGetDnsNetIdCommand;

};



}  // namespace net