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

Commit d570c4be authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge "Style fixes in the external pref64 support."

parents 47a9e310 511b6d4f

Dns64Configuration.cpp

+5 −4
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ void Dns64Configuration::dump(DumpWriter& dw, unsigned netId) { 
    if (cfg.prefix64.length() == 0) {

        dw.println("%s: no prefix yet discovered", kLabel);

    } else {

        dw.println("%s: discovered prefix %s", kLabel, cfg.prefix64.toString().c_str());

        dw.println("%s: %s prefix %s", kLabel, cfg.isFromPrefixDiscovery() ? "discovered" : "set",

                   cfg.prefix64.toString().c_str());

    }

}
@@ -238,8 +239,8 @@ void Dns64Configuration::recordDns64Config(const Dns64Config& cfg) { 
    reportNat64PrefixStatus(cfg.netId, PREFIX_ADDED, cfg.prefix64);

}



int Dns64Configuration::setPrefix64(unsigned netId, const IPPrefix* pfx) {

    if (pfx->isUninitialized() || pfx->family() != AF_INET6 || pfx->length() != 96) {

int Dns64Configuration::setPrefix64(unsigned netId, const IPPrefix& pfx) {

    if (pfx.isUninitialized() || pfx.family() != AF_INET6 || pfx.length() != 96) {

        return -EINVAL;

    }
@@ -256,7 +257,7 @@ int Dns64Configuration::setPrefix64(unsigned netId, const IPPrefix* pfx) { 
    }



    Dns64Config cfg(kNoDiscoveryId, netId);

    cfg.prefix64 = *pfx;

    cfg.prefix64 = pfx;

    mDns64Configs.emplace(std::make_pair(netId, cfg));



    return 0;

Dns64Configuration.h

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ class Dns64Configuration { 
    void stopPrefixDiscovery(unsigned netId);

    netdutils::IPPrefix getPrefix64(unsigned netId) const;



    int setPrefix64(unsigned netId, const netdutils::IPPrefix* pfx);

    int clearPrefix64(unsigned netId);

    int setPrefix64(unsigned netId, const netdutils::IPPrefix& pfx) EXCLUDES(mMutex);

    int clearPrefix64(unsigned netId) EXCLUDES(mMutex);



    void dump(netdutils::DumpWriter& dw, unsigned netId);

DnsResolverService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ binder_status_t DnsResolverService::dump(int fd, const char** args, uint32_t num 
        return statusFromErrcode(-EINVAL);

    }



    return statusFromErrcode(gDnsResolv->resolverCtrl.setPrefix64(netId, &prefix));

    return statusFromErrcode(gDnsResolv->resolverCtrl.setPrefix64(netId, prefix));

}



::ndk::ScopedAStatus DnsResolverService::setLogSeverity(int32_t logSeverity) {

ResolverController.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class ResolverController { 
    void stopPrefix64Discovery(int32_t netId);



    // Set or clear a NAT64 prefix discovered by other sources (e.g., RA).

    int setPrefix64(unsigned netId, const netdutils::IPPrefix* prefix) {

    int setPrefix64(unsigned netId, const netdutils::IPPrefix& prefix) {

        return mDns64Configuration.setPrefix64(netId, prefix);

    }