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

Commit f4f95496 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic 'adb-mdnsd' 

* changes:
  Make ADB over mDNS work on Windows
  Enable mDNS on Darwin
  Don't include mDNS support on platforms other than Linux
  Add mDNS device discovery for adb client
  adb: Set a hostname for mDNS
  Make ADBD announce its presence over mDNS
parents f58280e7 2fe9b604

adb/Android.mk

+8 −3
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ LOCAL_CFLAGS_darwin := $(LIBADB_darwin_CFLAGS) 
LOCAL_SRC_FILES := \

    $(LIBADB_SRC_FILES) \

    adb_auth_host.cpp \

    transport_mdns.cpp \



LOCAL_SRC_FILES_darwin := $(LIBADB_darwin_SRC_FILES)

LOCAL_SRC_FILES_linux := $(LIBADB_linux_SRC_FILES)
@@ -154,7 +155,7 @@ LOCAL_SANITIZE := $(adb_host_sanitize) 


# Even though we're building a static library (and thus there's no link step for

# this to take effect), this adds the includes to our path.

LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase

LOCAL_STATIC_LIBRARIES := libcrypto_utils libcrypto libbase libmdnssd

LOCAL_STATIC_LIBRARIES_linux := libusb

LOCAL_STATIC_LIBRARIES_darwin := libusb
@@ -176,7 +177,7 @@ LOCAL_SRC_FILES := \ 
    shell_service_test.cpp \



LOCAL_SANITIZE := $(adb_target_sanitize)

LOCAL_STATIC_LIBRARIES := libadbd libcrypto_utils libcrypto libusb

LOCAL_STATIC_LIBRARIES := libadbd libcrypto_utils libcrypto libusb libmdnssd

LOCAL_SHARED_LIBRARIES := liblog libbase libcutils

include $(BUILD_NATIVE_TEST)
@@ -224,7 +225,8 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcrypto \

    libcutils \

    libdiagnose_usb \

    libgmock_host \

    libmdnssd \

    libgmock_host



LOCAL_STATIC_LIBRARIES_linux := libusb

LOCAL_STATIC_LIBRARIES_darwin := libusb
@@ -292,6 +294,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcrypto \

    libdiagnose_usb \

    liblog \

    libmdnssd



# Don't use libcutils on Windows.

LOCAL_STATIC_LIBRARIES_darwin := libcutils
@@ -325,6 +328,7 @@ LOCAL_CLANG := true 


LOCAL_SRC_FILES := \

    daemon/main.cpp \

    daemon/mdns.cpp \

    services.cpp \

    file_sync_service.cpp \

    framebuffer_service.cpp \
@@ -372,6 +376,7 @@ LOCAL_STATIC_LIBRARIES := \ 
    libcrypto_utils \

    libcrypto \

    libminijail \

    libmdnssd \

    libdebuggerd_handler \



include $(BUILD_EXECUTABLE)

adb/adb_mdns.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



#ifndef _ADB_MDNS_H_

#define _ADB_MDNS_H_



const char* kADBServiceType = "_adb._tcp";



#endif

adb/client/main.cpp

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply 


    init_transport_registration();



    init_mdns_transport_discovery();



    usb_init();

    local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);

adb/daemon/main.cpp

+9 −2
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#include "adb_utils.h"

#include "transport.h"



#include "mdns.h"



static const char* root_seclabel = nullptr;



static void drop_capabilities_bounding_set_if_needed(struct minijail *j) {
@@ -140,6 +142,11 @@ static void drop_privileges(int server_port) { 
    }

}



static void setup_port(int port) {

    local_init(port);

    setup_mdns(port);

}



int adbd_main(int server_port) {

    umask(0);
@@ -188,10 +195,10 @@ int adbd_main(int server_port) { 
    if (sscanf(prop_port.c_str(), "%d", &port) == 1 && port > 0) {

        D("using port=%d", port);

        // Listen on TCP port specified by service.adb.tcp.port property.

        local_init(port);

        setup_port(port);

    } else if (!is_usb) {

        // Listen on default port.

        local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);

        setup_port(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);

    }



    D("adbd_main(): pre init_jdwp()");

adb/daemon/mdns.cpp

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



#include "adb_mdns.h"

#include "sysdeps.h"



#include <chrono>

#include <dns_sd.h>

#include <endian.h>

#include <mutex>

#include <unistd.h>



#include <android-base/logging.h>

#include <android-base/properties.h>



using namespace std::chrono_literals;



static std::mutex& mdns_lock = *new std::mutex();

static int port;

static DNSServiceRef mdns_ref;

static bool mdns_registered = false;



static void start_mdns() {

    if (android::base::GetProperty("init.svc.mdnsd", "") == "running") {

        return;

    }



    android::base::SetProperty("ctl.start", "mdnsd");



    if (! android::base::WaitForProperty("init.svc.mdnsd", "running", 5s)) {

        LOG(ERROR) << "Could not start mdnsd.";

    }

}



static void mdns_callback(DNSServiceRef /*ref*/,

                          DNSServiceFlags /*flags*/,

                          DNSServiceErrorType errorCode,

                          const char* /*name*/,

                          const char* /*regtype*/,

                          const char* /*domain*/,

                          void* /*context*/) {

    if (errorCode != kDNSServiceErr_NoError) {

        LOG(ERROR) << "Encountered mDNS registration error ("

            << errorCode << ").";

    }

}



static void setup_mdns_thread(void* /* unused */) {

    start_mdns();

    std::lock_guard<std::mutex> lock(mdns_lock);



    std::string hostname = "adb-";

    hostname += android::base::GetProperty("ro.serialno", "unidentified");



    auto error = DNSServiceRegister(&mdns_ref, 0, 0, hostname.c_str(),

                                    kADBServiceType, nullptr, nullptr,

                                    htobe16((uint16_t)port), 0, nullptr,

                                    mdns_callback, nullptr);



    if (error != kDNSServiceErr_NoError) {

        LOG(ERROR) << "Could not register mDNS service (" << error << ").";

        mdns_registered = false;

    }



    mdns_registered = true;

}



static void teardown_mdns() {

    std::lock_guard<std::mutex> lock(mdns_lock);



    if (mdns_registered) {

        DNSServiceRefDeallocate(mdns_ref);

    }

}



void setup_mdns(int port_in) {

    port = port_in;

    adb_thread_create(setup_mdns_thread, nullptr, nullptr);



    // TODO: Make this more robust against a hard kill.

    atexit(teardown_mdns);

}