diff options
Diffstat (limited to 'framework-t/src')
4 files changed, 215 insertions, 7 deletions
diff --git a/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java b/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java index 61b34d0bcf..d9c9d74032 100644 --- a/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java +++ b/framework-t/src/android/net/ConnectivityFrameworkInitializerTiramisu.java @@ -20,7 +20,9 @@ import android.annotation.SystemApi; import android.app.SystemServiceRegistry; import android.app.usage.NetworkStatsManager; import android.content.Context; +import android.net.mdns.aidl.IMDns; import android.net.nsd.INsdManager; +import android.net.nsd.MDnsManager; import android.net.nsd.NsdManager; /** @@ -78,5 +80,14 @@ public final class ConnectivityFrameworkInitializerTiramisu { return new EthernetManager(context, service); } ); + + SystemServiceRegistry.registerStaticService( + MDnsManager.MDNS_SERVICE, + MDnsManager.class, + (serviceBinder) -> { + IMDns service = IMDns.Stub.asInterface(serviceBinder); + return new MDnsManager(service); + } + ); } } diff --git a/framework-t/src/android/net/nsd/MDnsManager.java b/framework-t/src/android/net/nsd/MDnsManager.java new file mode 100644 index 0000000000..c11e60c49d --- /dev/null +++ b/framework-t/src/android/net/nsd/MDnsManager.java @@ -0,0 +1,200 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.net.nsd; + +import android.annotation.NonNull; +import android.net.mdns.aidl.DiscoveryInfo; +import android.net.mdns.aidl.GetAddressInfo; +import android.net.mdns.aidl.IMDns; +import android.net.mdns.aidl.IMDnsEventListener; +import android.net.mdns.aidl.RegistrationInfo; +import android.net.mdns.aidl.ResolutionInfo; +import android.os.RemoteException; +import android.os.ServiceSpecificException; +import android.util.Log; + +/** + * A manager class for mdns service. + * + * @hide + */ +public class MDnsManager { + private static final String TAG = MDnsManager.class.getSimpleName(); + private final IMDns mMdns; + + /** Service name for this. */ + public static final String MDNS_SERVICE = "mdns"; + + private static final int NO_RESULT = -1; + private static final int NETID_UNSET = 0; + + public MDnsManager(IMDns mdns) { + mMdns = mdns; + } + + /** + * Start the MDNSResponder daemon. + */ + public void startDaemon() { + try { + mMdns.startDaemon(); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Start mdns failed.", e); + } + } + + /** + * Stop the MDNSResponder daemon. + */ + public void stopDaemon() { + try { + mMdns.stopDaemon(); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Stop mdns failed.", e); + } + } + + /** + * Start registering a service. + * + * @param id The operation ID. + * @param serviceName The service name to be registered. + * @param registrationType The service type to be registered. + * @param port The port on which the service accepts connections. + * @param txtRecord The txt record. Refer to {@code NsdServiceInfo#setTxtRecords} for details. + * @param interfaceIdx The interface index on which to register the service. + * @return {@code true} if registration is successful, else {@code false}. + */ + public boolean registerService(int id, @NonNull String serviceName, + @NonNull String registrationType, int port, @NonNull byte[] txtRecord, + int interfaceIdx) { + final RegistrationInfo info = new RegistrationInfo(id, NO_RESULT, serviceName, + registrationType, port, txtRecord, interfaceIdx); + try { + mMdns.registerService(info); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Register service failed.", e); + return false; + } + return true; + } + + /** + * Start discovering services. + * + * @param id The operation ID. + * @param registrationType The service type to be discovered. + * @param interfaceIdx The interface index on which to discover for services. + * @return {@code true} if discovery is started successfully, else {@code false}. + */ + public boolean discover(int id, @NonNull String registrationType, int interfaceIdx) { + final DiscoveryInfo info = new DiscoveryInfo(id, NO_RESULT, "" /* serviceName */, + registrationType, "" /* domainName */, interfaceIdx, NETID_UNSET); + try { + mMdns.discover(info); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Discover service failed.", e); + return false; + } + return true; + } + + /** + * Start resolving the target service. + * + * @param id The operation ID. + * @param serviceName The service name to be resolved. + * @param registrationType The service type to be resolved. + * @param domain The service domain to be resolved. + * @param interfaceIdx The interface index on which to resolve the service. + * @return {@code true} if resolution is started successfully, else {@code false}. + */ + public boolean resolve(int id, @NonNull String serviceName, @NonNull String registrationType, + @NonNull String domain, int interfaceIdx) { + final ResolutionInfo info = new ResolutionInfo(id, NO_RESULT, serviceName, + registrationType, domain, "" /* serviceFullName */, "" /* hostname */, 0 /* port */, + new byte[0] /* txtRecord */, interfaceIdx); + try { + mMdns.resolve(info); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Resolve service failed.", e); + return false; + } + return true; + } + + /** + * Start getting the target service address. + * + * @param id The operation ID. + * @param hostname The fully qualified domain name of the host to be queried for. + * @param interfaceIdx The interface index on which to issue the query. + * @return {@code true} if getting address is started successful, else {@code false}. + */ + public boolean getServiceAddress(int id, @NonNull String hostname, int interfaceIdx) { + final GetAddressInfo info = new GetAddressInfo(id, NO_RESULT, hostname, + "" /* address */, interfaceIdx, NETID_UNSET); + try { + mMdns.getServiceAddress(info); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Get service address failed.", e); + return false; + } + return true; + } + + /** + * Stop an operation which was requested before. + * + * @param id the operation id to be stopped. + * @return {@code true} if operation is stopped successfully, else {@code false}. + */ + public boolean stopOperation(int id) { + try { + mMdns.stopOperation(id); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Stop operation failed.", e); + return false; + } + return true; + } + + /** + * Register an event listener. + * + * @param listener The listener to be registered. + */ + public void registerEventListener(@NonNull IMDnsEventListener listener) { + try { + mMdns.registerEventListener(listener); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Register listener failed.", e); + } + } + + /** + * Unregister an event listener. + * + * @param listener The listener to be unregistered. + */ + public void unregisterEventListener(@NonNull IMDnsEventListener listener) { + try { + mMdns.unregisterEventListener(listener); + } catch (RemoteException | ServiceSpecificException e) { + Log.e(TAG, "Unregister listener failed.", e); + } + } +} diff --git a/framework-t/src/android/net/nsd/NsdManager.java b/framework-t/src/android/net/nsd/NsdManager.java index 209f372fd3..33b44c8210 100644 --- a/framework-t/src/android/net/nsd/NsdManager.java +++ b/framework-t/src/android/net/nsd/NsdManager.java @@ -235,7 +235,7 @@ public final class NsdManager { public static final int DISABLE = 21; /** @hide */ - public static final int NATIVE_DAEMON_EVENT = 22; + public static final int MDNS_SERVICE_EVENT = 22; /** @hide */ public static final int REGISTER_CLIENT = 23; @@ -268,7 +268,7 @@ public final class NsdManager { EVENT_NAMES.put(DAEMON_STARTUP, "DAEMON_STARTUP"); EVENT_NAMES.put(ENABLE, "ENABLE"); EVENT_NAMES.put(DISABLE, "DISABLE"); - EVENT_NAMES.put(NATIVE_DAEMON_EVENT, "NATIVE_DAEMON_EVENT"); + EVENT_NAMES.put(MDNS_SERVICE_EVENT, "MDNS_SERVICE_EVENT"); } /** @hide */ diff --git a/framework-t/src/android/net/nsd/NsdServiceInfo.java b/framework-t/src/android/net/nsd/NsdServiceInfo.java index 8506db1fbe..2621594e98 100644 --- a/framework-t/src/android/net/nsd/NsdServiceInfo.java +++ b/framework-t/src/android/net/nsd/NsdServiceInfo.java @@ -24,7 +24,6 @@ import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; import android.util.ArrayMap; -import android.util.Base64; import android.util.Log; import java.io.UnsupportedEncodingException; @@ -106,13 +105,11 @@ public final class NsdServiceInfo implements Parcelable { /** * Unpack txt information from a base-64 encoded byte array. * - * @param rawRecords The raw base64 encoded records string read from netd. + * @param txtRecordsRawBytes The raw base64 encoded byte array. * * @hide */ - public void setTxtRecords(@NonNull String rawRecords) { - byte[] txtRecordsRawBytes = Base64.decode(rawRecords, Base64.DEFAULT); - + public void setTxtRecords(@NonNull byte[] txtRecordsRawBytes) { // There can be multiple TXT records after each other. Each record has to following format: // // byte type required meaning |