Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile (revision 422862) +++ head/devel/android-tools-adb/Makefile (revision 422863) @@ -1,97 +1,97 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- DISTVERSION?= 7.0.0_r1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel .ifndef EXTRA_PATCHES PATCH_SITES= https://github.com/android/platform_system_core/commit/ PATCHFILES= b4cff495a1f9.patch:-p1 .endif MAINTAINER= jbeich@FreeBSD.org COMMENT= Android debug bridge command line tool LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= android GH_PROJECT= platform_system_core # Emulate GH_COMMIT without causing desync .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else GH_REVISION= 88f64719d756 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++11-lib pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" ALL_TARGET= all TEST_TARGET= test PLIST_FILES= bin/adb PORTDOCS= * OPTIONS_DEFINE+=BASH DOCS TEST OPTIONS_SUB= yes .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif BASH_GH_ACCOUNT= mbrubeck:bashcomp BASH_GH_PROJECT= android-completion:bashcomp BASH_GH_TAGNAME= c1b0656:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/adb BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test pre-install-TEST-on: do-test post-patch: # XXX C++ exception with description "regex_error" thrown in the test body. @if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \ ${REINPLACE_CMD} -Ee '/^TEST/\ s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \ ${WRKSRC}/base/logging_test.cpp; \ fi # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0 @if [ ! -e /dev/full ]; then \ ${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ ${WRKSRC}/adb/adb_io_test.cpp; \ fi post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} update-revision: # https://developer.github.com/v3/repos/commits/#get-a-single-commit # Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1) @${REINPLACE_CMD} -i '' -e "/^GH_REVISION.*$@/s/=.*/= $$(\ ${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \ https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \ ${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \ ) # generated by: make $@/" \ ${.CURDIR}/Makefile .include # XXX Work around !target(makesum) .ifndef DISTVERSIONSUFFIX makesum: update-revision .endif Index: head/devel/android-tools-adb/files/usb_libusb.cpp =================================================================== --- head/devel/android-tools-adb/files/usb_libusb.cpp (revision 422862) +++ head/devel/android-tools-adb/files/usb_libusb.cpp (revision 422863) @@ -1,653 +1,615 @@ /* * Copyright (C) 2009 bsdroid project * Alexey Tarasov * * Copyright (C) 2007 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. */ #define TRACE_TAG USB #include "sysdeps.h" #include #include #include #include #include #include #include "adb.h" #include "transport.h" ADB_MUTEX_DEFINE( usb_lock ); static libusb_context *ctx = NULL; struct usb_handle { usb_handle *prev; usb_handle *next; libusb_device *dev; libusb_device_handle *devh; int interface; uint8_t dev_bus; uint8_t dev_addr; int zero_mask; unsigned char end_point_address[2]; char serial[128]; adb_cond_t notify; adb_mutex_t lock; }; static usb_handle handle_list = { .prev = &handle_list, .next = &handle_list, }; static void usb_cleanup() { libusb_exit(ctx); } static void report_bulk_libusb_error(int r) { switch (r) { case LIBUSB_ERROR_TIMEOUT: D("Transfer timeout"); break; case LIBUSB_ERROR_PIPE: D("Control request is not supported"); break; case LIBUSB_ERROR_OVERFLOW: D("Device offered more data"); break; case LIBUSB_ERROR_NO_DEVICE : D("Device was disconnected"); break; default: D("Error %d during transfer", r); break; }; } static int usb_bulk_write(usb_handle *uh, const void *data, int len) { int r = 0; int transferred = 0; r = libusb_bulk_transfer(uh->devh, uh->end_point_address[1], (unsigned char *)data, len, &transferred, 0); if (r != 0) { D("usb_bulk_write(): "); report_bulk_libusb_error(r); return r; } return (transferred); } static int usb_bulk_read(usb_handle *uh, void *data, int len) { int r = 0; int transferred = 0; r = libusb_bulk_transfer(uh->devh, uh->end_point_address[0], (unsigned char *)data, len, &transferred, 0); if (r != 0) { D("usb_bulk_read(): "); report_bulk_libusb_error(r); return r; } return (transferred); } int usb_write(usb_handle *uh, const void *_data, int len) { unsigned char *data = (unsigned char*) _data; int n; int need_zero = 0; if (uh->zero_mask == 1) { if (!(len & uh->zero_mask)) { need_zero = 1; } } D("usb_write(): %p:%d -> transport %p", _data, len, uh); while (len > 0) { int xfer = (len > 4096) ? 4096 : len; n = usb_bulk_write(uh, data, xfer); if (n != xfer) { D("usb_write(): failed for transport %p (%d bytes left)", uh, len); return -1; } len -= xfer; data += xfer; } if (need_zero){ n = usb_bulk_write(uh, _data, 0); if (n < 0) { D("usb_write(): failed to finish operation for transport %p", uh); } return n; } return 0; } int usb_read(usb_handle *uh, void *_data, int len) { unsigned char *data = (unsigned char*)_data; int n; D("usb_read(): %p:%d <- transport %p", _data, len, uh); while (len > 0) { int xfer = (len > 4096) ? 4096 : len; n = usb_bulk_read(uh, data, xfer); if (n != xfer) { if (n > 0) { data += n; len -= n; continue; } D("usb_read(): failed for transport %p (%d bytes left)", uh, len); return -1; } len -= xfer; data += xfer; } return 0; } int usb_close(usb_handle *h) { D("usb_close(): closing transport %p", h); adb_mutex_lock(&usb_lock); h->next->prev = h->prev; h->prev->next = h->next; h->prev = NULL; h->next = NULL; libusb_release_interface(h->devh, h->interface); libusb_close(h->devh); libusb_unref_device(h->dev); adb_mutex_unlock(&usb_lock); free(h); return (0); } void usb_kick(usb_handle *h) { D("usb_kick(): kicking transport %p", h); adb_mutex_lock(&h->lock); unregister_usb_transport(h); adb_mutex_unlock(&h->lock); h->next->prev = h->prev; h->prev->next = h->next; h->prev = NULL; h->next = NULL; libusb_release_interface(h->devh, h->interface); libusb_close(h->devh); libusb_unref_device(h->dev); free(h); } static int check_usb_interface(libusb_interface const *interface, libusb_device_descriptor const *desc, usb_handle *uh) { int e; if (interface->num_altsetting == 0) { D("check_usb_interface(): No interface settings"); return -1; } libusb_interface_descriptor const *idesc = &interface->altsetting[0]; if (idesc->bNumEndpoints != 2) { D("check_usb_interface(): Interface have not 2 endpoints, ignoring"); return -1; } for (e = 0; e < idesc->bNumEndpoints; e++) { libusb_endpoint_descriptor const *edesc = &idesc->endpoint[e]; if (edesc->bmAttributes != LIBUSB_TRANSFER_TYPE_BULK) { D("check_usb_interface(): Endpoint (%u) is not bulk (%u), ignoring", edesc->bmAttributes, LIBUSB_TRANSFER_TYPE_BULK); return -1; } if (edesc->bEndpointAddress & LIBUSB_ENDPOINT_IN) uh->end_point_address[0] = edesc->bEndpointAddress; else uh->end_point_address[1] = edesc->bEndpointAddress; /* aproto 01 needs 0 termination */ if (idesc->bInterfaceProtocol == 0x01) { uh->zero_mask = edesc->wMaxPacketSize - 1; D("check_usb_interface(): Forced Android interface protocol v.1"); } } D("check_usb_interface(): Device: %04x:%04x " "iclass: %x, isclass: %x, iproto: %x ep: %x/%x-> ", desc->idVendor, desc->idProduct, idesc->bInterfaceClass, idesc->bInterfaceSubClass, idesc->bInterfaceProtocol, uh->end_point_address[0], uh->end_point_address[1]); if (!is_adb_interface(desc->idVendor, desc->idProduct, idesc->bInterfaceClass, idesc->bInterfaceSubClass, idesc->bInterfaceProtocol)) { D("not matches"); return -1; } D("matches"); return 1; } static int check_usb_interfaces(libusb_config_descriptor *config, libusb_device_descriptor *desc, usb_handle *uh) { int i; for (i = 0; i < config->bNumInterfaces; ++i) { if (check_usb_interface(&config->interface[i], desc, uh) != -1) { /* found some interface and saved information about it */ D("check_usb_interfaces(): Interface %d of %04x:%04x " "matches Android device", i, desc->idVendor, desc->idProduct); return i; } } return -1; } static int register_device(usb_handle *uh, const char *serial) { D("register_device(): Registering %p [%s] as USB transport", uh, serial); usb_handle* usb = reinterpret_cast(calloc(1, sizeof(usb_handle))); if (usb == nullptr) fatal("couldn't allocate usb_handle"); memcpy(usb, uh, sizeof(usb_handle)); strcpy(usb->serial, uh->serial); adb_cond_init(&usb->notify, 0); adb_mutex_init(&usb->lock, 0); adb_mutex_lock(&usb_lock); usb->next = &handle_list; usb->prev = handle_list.prev; usb->prev->next = usb; usb->next->prev = usb; adb_mutex_unlock(&usb_lock); char devpath[64]; snprintf(devpath, sizeof(devpath), "ugen%d.%d", uh->dev_bus, uh->dev_addr); register_usb_transport(usb, serial, devpath, 1); return (1); } static int already_registered(usb_handle *uh) { usb_handle *usb = NULL; int exists = 0; adb_mutex_lock(&usb_lock); for (usb = handle_list.next; usb != &handle_list; usb = usb->next) { if ((usb->dev_bus == uh->dev_bus) && (usb->dev_addr == uh->dev_addr)) { exists = 1; break; } } adb_mutex_unlock(&usb_lock); return exists; } static void check_device(libusb_device *dev) { usb_handle uh; int i = 0; int found = -1; char serial[256] = {0}; libusb_device_descriptor desc; libusb_config_descriptor *config = NULL; int r = libusb_get_device_descriptor(dev, &desc); if (r != LIBUSB_SUCCESS) { D("check_device(): Failed to get device descriptor"); return; } if ((desc.idVendor == 0) && (desc.idProduct == 0)) return; D("check_device(): Probing usb device %04x:%04x", desc.idVendor, desc.idProduct); if (!is_adb_interface(desc.idVendor, desc.idProduct, ADB_CLASS, ADB_SUBCLASS, ADB_PROTOCOL)) { D("check_device(): Ignored due unknown vendor id"); return; } uh.dev_bus = libusb_get_bus_number(dev); uh.dev_addr = libusb_get_device_address(dev); if (already_registered(&uh)) { D("check_device(): Device (bus: %d, address: %d) " "is already registered", uh.dev_bus, uh.dev_addr); return; } D("check_device(): Device bus: %d, address: %d", uh.dev_bus, uh.dev_addr); r = libusb_get_active_config_descriptor(dev, &config); if (r != 0) { if (r == LIBUSB_ERROR_NOT_FOUND) { D("check_device(): Device %4x:%4x is unconfigured", desc.idVendor, desc.idProduct); return; } D("check_device(): Failed to get configuration for %4x:%4x", desc.idVendor, desc.idProduct); return; } if (config == NULL) { D("check_device(): Sanity check failed after " "getting active config"); return; } if (config->interface != NULL) { found = check_usb_interfaces(config, &desc, &uh); } /* not needed anymore */ libusb_free_config_descriptor(config); r = libusb_open(dev, &uh.devh); uh.dev = dev; if (r != 0) { switch (r) { case LIBUSB_ERROR_NO_MEM: D("check_device(): Memory allocation problem"); break; case LIBUSB_ERROR_ACCESS: D("check_device(): Permissions problem, " "current user priveleges are messed up?"); break; case LIBUSB_ERROR_NO_DEVICE: D("check_device(): Device disconected, bad cable?"); break; default: D("check_device(): libusb triggered error %d", r); } // skip rest found = -1; } if (found >= 0) { D("check_device(): Device matches Android interface"); // read the device's serial number memset(serial, 0, sizeof(serial)); uh.interface = found; r = libusb_claim_interface(uh.devh, uh.interface); if (r < 0) { D("check_device(): Failed to claim interface %d", uh.interface); goto fail; } - if (desc.iSerialNumber) { - // reading serial - uint16_t buffer[128] = {0}; - uint16_t languages[128] = {0}; - int languageCount = 0; - - memset(languages, 0, sizeof(languages)); - r = libusb_control_transfer(uh.devh, - LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, - LIBUSB_REQUEST_GET_DESCRIPTOR, LIBUSB_DT_STRING << 8, - 0, (uint8_t *)languages, sizeof(languages), 0); - - if (r <= 0) { - D("check_device(): Failed to get languages count"); - goto fail; - } - - languageCount = (r - 2) / 2; - - for (i = 1; i <= languageCount; ++i) { - memset(buffer, 0, sizeof(buffer)); - - r = libusb_control_transfer(uh.devh, - LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, - LIBUSB_REQUEST_GET_DESCRIPTOR, (LIBUSB_DT_STRING << 8) | desc.iSerialNumber, - languages[i], (uint8_t *)buffer, sizeof(buffer), 0); - - if (r > 0) { /* converting serial */ - int j = 0; - r /= 2; - - for (j = 1; j < r; ++j) - serial[j - 1] = buffer[j]; - - serial[j - 1] = '\0'; - break; /* languagesCount cycle */ - } - } - - if (register_device(&uh, serial) == 0) { - D("check_device(): Failed to register device"); - goto fail_interface; - } - - libusb_ref_device(dev); + if (desc.iSerialNumber != 0) { + libusb_get_string_descriptor_ascii(uh.devh, desc.iSerialNumber, + (unsigned char *)uh.serial, sizeof(uh.serial)); + } + if (register_device(&uh, uh.serial) == 0) { + D("check_device(): Failed to register device\n"); + goto fail_interface; } } return; fail_interface: libusb_release_interface(uh.devh, uh.interface); fail: libusb_close(uh.devh); uh.devh = NULL; } static int check_device_connected(usb_handle *uh) { int r = libusb_kernel_driver_active(uh->devh, uh->interface); if (r == LIBUSB_ERROR_NO_DEVICE) return 0; if (r < 0) return -1; return 1; } static void kick_disconnected() { usb_handle *usb = NULL; adb_mutex_lock(&usb_lock); for (usb = handle_list.next; usb != &handle_list; usb = usb->next) { if (check_device_connected(usb) == 0) { D("kick_disconnected(): Transport %p is not online anymore", usb); usb_kick(usb); } } adb_mutex_unlock(&usb_lock); } static void scan_usb_devices() { D("scan_usb_devices(): started"); libusb_device **devs= NULL; libusb_device *dev= NULL; ssize_t cnt = libusb_get_device_list(ctx, &devs); if (cnt < 0) { D("scan_usb_devices(): Failed to get device list (error: %zd)", cnt); return; } int i = 0; while ((dev = devs[i++]) != NULL) { check_device(dev); } libusb_free_device_list(devs, 1); } static void device_poll_thread(void*) { adb_thread_setname("USB scan"); D("device_poll_thread(): Created USB scan thread"); for (;;) { sleep(5); kick_disconnected(); scan_usb_devices(); } } static void sigalrm_handler(int signo) { /* nothing */ } void usb_init() { D("usb_init(): started"); struct sigaction actions; atexit(usb_cleanup); int r = libusb_init(&ctx); if (r != LIBUSB_SUCCESS) { fatal_errno("Failed to init libusb"); } memset(&actions, 0, sizeof(actions)); sigemptyset(&actions.sa_mask); actions.sa_flags = 0; actions.sa_handler = sigalrm_handler; sigaction(SIGALRM, &actions, NULL); /* initial device scan */ scan_usb_devices(); /* starting USB event polling thread */ if (!adb_thread_create(device_poll_thread, nullptr)) { fatal_errno("cannot create USB scan thread"); } D("usb_init(): finished"); } Index: head/devel/android-tools-adb-devel/Makefile =================================================================== --- head/devel/android-tools-adb-devel/Makefile (revision 422862) +++ head/devel/android-tools-adb-devel/Makefile (revision 422863) @@ -1,34 +1,34 @@ # $FreeBSD$ # Hint: git describe --abbrev=12 --match android-n-preview-5 DISTVERSION= n-preview-5-126 DISTVERSIONSUFFIX= -g2f21b7cecda2 -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -devel CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-adb DISTINFO_FILE= ${.CURDIR}/distinfo FILESDIR= ${.CURDIR}/files EXTRA_PATCHES= ${.CURDIR}/files/patch-* GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} OPTIONS_DEFINE= TEST_PYTHON TEST_BROKEN= logging.* tests always fail after 4e5fd111d84d TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-14-g735aab1:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock TEST_PYTHON_USES= python:2.7,build pre-install-TEST_PYTHON-on: # XXX python tests may leave behind running adb server ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ PYTHONPATH=${WRKSRC_development}/python-packages \ ${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC} .include "${MASTERDIR}/Makefile" Index: head/devel/android-tools-adb-devel/files/usb_libusb.cpp =================================================================== --- head/devel/android-tools-adb-devel/files/usb_libusb.cpp (revision 422862) +++ head/devel/android-tools-adb-devel/files/usb_libusb.cpp (revision 422863) @@ -1,653 +1,615 @@ /* * Copyright (C) 2009 bsdroid project * Alexey Tarasov * * Copyright (C) 2007 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. */ #define TRACE_TAG USB #include "sysdeps.h" #include #include #include #include #include #include #include "adb.h" #include "transport.h" ADB_MUTEX_DEFINE( usb_lock ); static libusb_context *ctx = NULL; struct usb_handle { usb_handle *prev; usb_handle *next; libusb_device *dev; libusb_device_handle *devh; int interface; uint8_t dev_bus; uint8_t dev_addr; int zero_mask; unsigned char end_point_address[2]; char serial[128]; adb_cond_t notify; adb_mutex_t lock; }; static usb_handle handle_list = { .prev = &handle_list, .next = &handle_list, }; static void usb_cleanup() { libusb_exit(ctx); } static void report_bulk_libusb_error(int r) { switch (r) { case LIBUSB_ERROR_TIMEOUT: D("Transfer timeout"); break; case LIBUSB_ERROR_PIPE: D("Control request is not supported"); break; case LIBUSB_ERROR_OVERFLOW: D("Device offered more data"); break; case LIBUSB_ERROR_NO_DEVICE : D("Device was disconnected"); break; default: D("Error %d during transfer", r); break; }; } static int usb_bulk_write(usb_handle *uh, const void *data, int len) { int r = 0; int transferred = 0; r = libusb_bulk_transfer(uh->devh, uh->end_point_address[1], (unsigned char *)data, len, &transferred, 0); if (r != 0) { D("usb_bulk_write(): "); report_bulk_libusb_error(r); return r; } return (transferred); } static int usb_bulk_read(usb_handle *uh, void *data, int len) { int r = 0; int transferred = 0; r = libusb_bulk_transfer(uh->devh, uh->end_point_address[0], (unsigned char *)data, len, &transferred, 0); if (r != 0) { D("usb_bulk_read(): "); report_bulk_libusb_error(r); return r; } return (transferred); } int usb_write(usb_handle *uh, const void *_data, int len) { unsigned char *data = (unsigned char*) _data; int n; int need_zero = 0; if (uh->zero_mask == 1) { if (!(len & uh->zero_mask)) { need_zero = 1; } } D("usb_write(): %p:%d -> transport %p", _data, len, uh); while (len > 0) { int xfer = (len > 4096) ? 4096 : len; n = usb_bulk_write(uh, data, xfer); if (n != xfer) { D("usb_write(): failed for transport %p (%d bytes left)", uh, len); return -1; } len -= xfer; data += xfer; } if (need_zero){ n = usb_bulk_write(uh, _data, 0); if (n < 0) { D("usb_write(): failed to finish operation for transport %p", uh); } return n; } return 0; } int usb_read(usb_handle *uh, void *_data, int len) { unsigned char *data = (unsigned char*)_data; int n; D("usb_read(): %p:%d <- transport %p", _data, len, uh); while (len > 0) { int xfer = (len > 4096) ? 4096 : len; n = usb_bulk_read(uh, data, xfer); if (n != xfer) { if (n > 0) { data += n; len -= n; continue; } D("usb_read(): failed for transport %p (%d bytes left)", uh, len); return -1; } len -= xfer; data += xfer; } return 0; } int usb_close(usb_handle *h) { D("usb_close(): closing transport %p", h); adb_mutex_lock(&usb_lock); h->next->prev = h->prev; h->prev->next = h->next; h->prev = NULL; h->next = NULL; libusb_release_interface(h->devh, h->interface); libusb_close(h->devh); libusb_unref_device(h->dev); adb_mutex_unlock(&usb_lock); free(h); return (0); } void usb_kick(usb_handle *h) { D("usb_kick(): kicking transport %p", h); adb_mutex_lock(&h->lock); unregister_usb_transport(h); adb_mutex_unlock(&h->lock); h->next->prev = h->prev; h->prev->next = h->next; h->prev = NULL; h->next = NULL; libusb_release_interface(h->devh, h->interface); libusb_close(h->devh); libusb_unref_device(h->dev); free(h); } static int check_usb_interface(libusb_interface const *interface, libusb_device_descriptor const *desc, usb_handle *uh) { int e; if (interface->num_altsetting == 0) { D("check_usb_interface(): No interface settings"); return -1; } libusb_interface_descriptor const *idesc = &interface->altsetting[0]; if (idesc->bNumEndpoints != 2) { D("check_usb_interface(): Interface have not 2 endpoints, ignoring"); return -1; } for (e = 0; e < idesc->bNumEndpoints; e++) { libusb_endpoint_descriptor const *edesc = &idesc->endpoint[e]; if (edesc->bmAttributes != LIBUSB_TRANSFER_TYPE_BULK) { D("check_usb_interface(): Endpoint (%u) is not bulk (%u), ignoring", edesc->bmAttributes, LIBUSB_TRANSFER_TYPE_BULK); return -1; } if (edesc->bEndpointAddress & LIBUSB_ENDPOINT_IN) uh->end_point_address[0] = edesc->bEndpointAddress; else uh->end_point_address[1] = edesc->bEndpointAddress; /* aproto 01 needs 0 termination */ if (idesc->bInterfaceProtocol == 0x01) { uh->zero_mask = edesc->wMaxPacketSize - 1; D("check_usb_interface(): Forced Android interface protocol v.1"); } } D("check_usb_interface(): Device: %04x:%04x " "iclass: %x, isclass: %x, iproto: %x ep: %x/%x-> ", desc->idVendor, desc->idProduct, idesc->bInterfaceClass, idesc->bInterfaceSubClass, idesc->bInterfaceProtocol, uh->end_point_address[0], uh->end_point_address[1]); if (!is_adb_interface(desc->idVendor, desc->idProduct, idesc->bInterfaceClass, idesc->bInterfaceSubClass, idesc->bInterfaceProtocol)) { D("not matches"); return -1; } D("matches"); return 1; } static int check_usb_interfaces(libusb_config_descriptor *config, libusb_device_descriptor *desc, usb_handle *uh) { int i; for (i = 0; i < config->bNumInterfaces; ++i) { if (check_usb_interface(&config->interface[i], desc, uh) != -1) { /* found some interface and saved information about it */ D("check_usb_interfaces(): Interface %d of %04x:%04x " "matches Android device", i, desc->idVendor, desc->idProduct); return i; } } return -1; } static int register_device(usb_handle *uh, const char *serial) { D("register_device(): Registering %p [%s] as USB transport", uh, serial); usb_handle* usb = reinterpret_cast(calloc(1, sizeof(usb_handle))); if (usb == nullptr) fatal("couldn't allocate usb_handle"); memcpy(usb, uh, sizeof(usb_handle)); strcpy(usb->serial, uh->serial); adb_cond_init(&usb->notify, 0); adb_mutex_init(&usb->lock, 0); adb_mutex_lock(&usb_lock); usb->next = &handle_list; usb->prev = handle_list.prev; usb->prev->next = usb; usb->next->prev = usb; adb_mutex_unlock(&usb_lock); char devpath[64]; snprintf(devpath, sizeof(devpath), "ugen%d.%d", uh->dev_bus, uh->dev_addr); register_usb_transport(usb, serial, devpath, 1); return (1); } static int already_registered(usb_handle *uh) { usb_handle *usb = NULL; int exists = 0; adb_mutex_lock(&usb_lock); for (usb = handle_list.next; usb != &handle_list; usb = usb->next) { if ((usb->dev_bus == uh->dev_bus) && (usb->dev_addr == uh->dev_addr)) { exists = 1; break; } } adb_mutex_unlock(&usb_lock); return exists; } static void check_device(libusb_device *dev) { usb_handle uh; int i = 0; int found = -1; char serial[256] = {0}; libusb_device_descriptor desc; libusb_config_descriptor *config = NULL; int r = libusb_get_device_descriptor(dev, &desc); if (r != LIBUSB_SUCCESS) { D("check_device(): Failed to get device descriptor"); return; } if ((desc.idVendor == 0) && (desc.idProduct == 0)) return; D("check_device(): Probing usb device %04x:%04x", desc.idVendor, desc.idProduct); if (!is_adb_interface(desc.idVendor, desc.idProduct, ADB_CLASS, ADB_SUBCLASS, ADB_PROTOCOL)) { D("check_device(): Ignored due unknown vendor id"); return; } uh.dev_bus = libusb_get_bus_number(dev); uh.dev_addr = libusb_get_device_address(dev); if (already_registered(&uh)) { D("check_device(): Device (bus: %d, address: %d) " "is already registered", uh.dev_bus, uh.dev_addr); return; } D("check_device(): Device bus: %d, address: %d", uh.dev_bus, uh.dev_addr); r = libusb_get_active_config_descriptor(dev, &config); if (r != 0) { if (r == LIBUSB_ERROR_NOT_FOUND) { D("check_device(): Device %4x:%4x is unconfigured", desc.idVendor, desc.idProduct); return; } D("check_device(): Failed to get configuration for %4x:%4x", desc.idVendor, desc.idProduct); return; } if (config == NULL) { D("check_device(): Sanity check failed after " "getting active config"); return; } if (config->interface != NULL) { found = check_usb_interfaces(config, &desc, &uh); } /* not needed anymore */ libusb_free_config_descriptor(config); r = libusb_open(dev, &uh.devh); uh.dev = dev; if (r != 0) { switch (r) { case LIBUSB_ERROR_NO_MEM: D("check_device(): Memory allocation problem"); break; case LIBUSB_ERROR_ACCESS: D("check_device(): Permissions problem, " "current user priveleges are messed up?"); break; case LIBUSB_ERROR_NO_DEVICE: D("check_device(): Device disconected, bad cable?"); break; default: D("check_device(): libusb triggered error %d", r); } // skip rest found = -1; } if (found >= 0) { D("check_device(): Device matches Android interface"); // read the device's serial number memset(serial, 0, sizeof(serial)); uh.interface = found; r = libusb_claim_interface(uh.devh, uh.interface); if (r < 0) { D("check_device(): Failed to claim interface %d", uh.interface); goto fail; } - if (desc.iSerialNumber) { - // reading serial - uint16_t buffer[128] = {0}; - uint16_t languages[128] = {0}; - int languageCount = 0; - - memset(languages, 0, sizeof(languages)); - r = libusb_control_transfer(uh.devh, - LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, - LIBUSB_REQUEST_GET_DESCRIPTOR, LIBUSB_DT_STRING << 8, - 0, (uint8_t *)languages, sizeof(languages), 0); - - if (r <= 0) { - D("check_device(): Failed to get languages count"); - goto fail; - } - - languageCount = (r - 2) / 2; - - for (i = 1; i <= languageCount; ++i) { - memset(buffer, 0, sizeof(buffer)); - - r = libusb_control_transfer(uh.devh, - LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, - LIBUSB_REQUEST_GET_DESCRIPTOR, (LIBUSB_DT_STRING << 8) | desc.iSerialNumber, - languages[i], (uint8_t *)buffer, sizeof(buffer), 0); - - if (r > 0) { /* converting serial */ - int j = 0; - r /= 2; - - for (j = 1; j < r; ++j) - serial[j - 1] = buffer[j]; - - serial[j - 1] = '\0'; - break; /* languagesCount cycle */ - } - } - - if (register_device(&uh, serial) == 0) { - D("check_device(): Failed to register device"); - goto fail_interface; - } - - libusb_ref_device(dev); + if (desc.iSerialNumber != 0) { + libusb_get_string_descriptor_ascii(uh.devh, desc.iSerialNumber, + (unsigned char *)uh.serial, sizeof(uh.serial)); + } + if (register_device(&uh, uh.serial) == 0) { + D("check_device(): Failed to register device\n"); + goto fail_interface; } } return; fail_interface: libusb_release_interface(uh.devh, uh.interface); fail: libusb_close(uh.devh); uh.devh = NULL; } static int check_device_connected(usb_handle *uh) { int r = libusb_kernel_driver_active(uh->devh, uh->interface); if (r == LIBUSB_ERROR_NO_DEVICE) return 0; if (r < 0) return -1; return 1; } static void kick_disconnected() { usb_handle *usb = NULL; adb_mutex_lock(&usb_lock); for (usb = handle_list.next; usb != &handle_list; usb = usb->next) { if (check_device_connected(usb) == 0) { D("kick_disconnected(): Transport %p is not online anymore", usb); usb_kick(usb); } } adb_mutex_unlock(&usb_lock); } static void scan_usb_devices() { D("scan_usb_devices(): started"); libusb_device **devs= NULL; libusb_device *dev= NULL; ssize_t cnt = libusb_get_device_list(ctx, &devs); if (cnt < 0) { D("scan_usb_devices(): Failed to get device list (error: %zd)", cnt); return; } int i = 0; while ((dev = devs[i++]) != NULL) { check_device(dev); } libusb_free_device_list(devs, 1); } static void device_poll_thread(void*) { adb_thread_setname("USB scan"); D("device_poll_thread(): Created USB scan thread"); for (;;) { sleep(5); kick_disconnected(); scan_usb_devices(); } } static void sigalrm_handler(int signo) { /* nothing */ } void usb_init() { D("usb_init(): started"); struct sigaction actions; atexit(usb_cleanup); int r = libusb_init(&ctx); if (r != LIBUSB_SUCCESS) { fatal_errno("Failed to init libusb"); } memset(&actions, 0, sizeof(actions)); sigemptyset(&actions.sa_mask); actions.sa_flags = 0; actions.sa_handler = sigalrm_handler; sigaction(SIGALRM, &actions, NULL); /* initial device scan */ scan_usb_devices(); /* starting USB event polling thread */ if (!adb_thread_create(device_poll_thread, nullptr)) { fatal_errno("cannot create USB scan thread"); } D("usb_init(): finished"); }