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

Commit 3e5c35f3 authored by chenbruce's avatar chenbruce
Browse files

Add transport types to a given network 

- Resolver doesn't know what the transport types are when having a given
  network. Set tranport types by SetResolverConfiguration.

Bug: 143732914
Test: atest

Change-Id: I337d4204afd9fbb790fd42cc191759b22dd66bca
parent 1ba6afa3

DnsProxyListener.cpp

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ void reportDnsEvent(int eventType, const android_net_context& netContext, int la 
        const std::string& dnsQueryStats = event.dns_query_events().SerializeAsString();

        stats::BytesField dnsQueryBytesField{dnsQueryStats.c_str(), dnsQueryStats.size()};

        event.set_return_code(static_cast<ReturnCode>(returnCode));

        event.set_network_type(resolv_get_network_types_for_net(netContext.dns_netid));

        android::net::stats::stats_write(android::net::stats::NETWORK_DNS_EVENT_REPORTED,

                                         event.event_type(), event.return_code(),

                                         event.latency_micros(), event.hints_ai_flags(),

ResolverController.cpp

+4 −5
Original line number Diff line number Diff line
@@ -231,9 +231,9 @@ int ResolverController::setResolverConfiguration(const ResolverParamsParcel& res 
    res_params.base_timeout_msec = resolverParams.baseTimeoutMsec;

    res_params.retry_count = resolverParams.retryCount;



    return resolv_set_nameservers(resolverParams.netId, resolverParams.servers,

                                  resolverParams.domains, res_params,

                                  resolverParams.experimentalOptions);

    return resolv_set_nameservers(

            resolverParams.netId, resolverParams.servers, resolverParams.domains, res_params,

            resolverParams.experimentalOptions, resolverParams.transportTypes);

}



int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>* servers,
@@ -362,8 +362,7 @@ void ResolverController::dump(DumpWriter& dw, unsigned netId) { 
            dw.decIndent();

        }

        dw.println("Concurrent DNS query timeout: %d", wait_for_pending_req_timeout_count[0]);

        resolv_stats_dump(dw, netId);

        resolv_oem_options_dump(dw, netId);

        resolv_netconfig_dump(dw, netId);

    }

    dw.decIndent();

}

aidl_api/dnsresolver_aidl_interface/current/android/net/IDnsResolver.aidl

+9 −0
Original line number Diff line number Diff line
@@ -52,4 +52,13 @@ interface IDnsResolver { 
  const int TC_MODE_DEFAULT = 0;

  const int TC_MODE_UDP_TCP = 1;

  const int TC_MODE_MAX = 2;

  const int TRANSPORT_UNKNOWN = -1;

  const int TRANSPORT_CELLULAR = 0;

  const int TRANSPORT_WIFI = 1;

  const int TRANSPORT_BLUETOOTH = 2;

  const int TRANSPORT_ETHERNET = 3;

  const int TRANSPORT_VPN = 4;

  const int TRANSPORT_WIFI_AWARE = 5;

  const int TRANSPORT_LOWPAN = 6;

  const int TRANSPORT_TEST = 7;

}

aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverParamsParcel.aidl

+1 −0
Original line number Diff line number Diff line
@@ -33,4 +33,5 @@ parcelable ResolverParamsParcel { 
  @utf8InCpp String caCertificate = "";

  int tlsConnectTimeoutMs = 0;

  android.net.ResolverExperimentalOptionsParcel experimentalOptions;

  int[] transportTypes = {};

}

binder/android/net/IDnsResolver.aidl

+15 −0
Original line number Diff line number Diff line
@@ -182,4 +182,19 @@ interface IDnsResolver { 
    const int TC_MODE_DEFAULT = 0;

    const int TC_MODE_UDP_TCP = 1;

    const int TC_MODE_MAX = 2;



    /**

     * Values for {@code transportTypes} of {@code ResolverParamsParcel}. These values are

     * always the same as the TRANSPORT_* API definations of NetworkCapabilities except for

     * TRANSPORT_UNKNOWN. It controls the transport types for a given network.

     */

    const int TRANSPORT_UNKNOWN = -1;

    const int TRANSPORT_CELLULAR = 0;

    const int TRANSPORT_WIFI = 1;

    const int TRANSPORT_BLUETOOTH = 2;

    const int TRANSPORT_ETHERNET = 3;

    const int TRANSPORT_VPN = 4;

    const int TRANSPORT_WIFI_AWARE = 5;

    const int TRANSPORT_LOWPAN = 6;

    const int TRANSPORT_TEST = 7;

}