5de19e2e02
The caller of daemon_service_to_fd() in core adb has switched to std::string_view in [1]. The mismatch breaks the sideload service, as it picks up the wrong daemon_service_to_fd() when serving sideload. [1] https://android-review.googlesource.com/c/platform/system/core/+/850392 Bug: 122171762 Test: `adb sideload` on taimen. Change-Id: Ie828400768523c35c5576e2c029e38fc0ad0aff9
64 lines
2 KiB
C++
64 lines
2 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <inttypes.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <thread>
|
|
|
|
#include "adb.h"
|
|
#include "adb_unique_fd.h"
|
|
#include "fdevent.h"
|
|
#include "fuse_adb_provider.h"
|
|
#include "services.h"
|
|
#include "sysdeps.h"
|
|
|
|
static void sideload_host_service(unique_fd sfd, const std::string& args) {
|
|
int64_t file_size;
|
|
int block_size;
|
|
if ((sscanf(args.c_str(), "%" SCNd64 ":%d", &file_size, &block_size) != 2) || file_size <= 0 ||
|
|
block_size <= 0) {
|
|
printf("bad sideload-host arguments: %s\n", args.c_str());
|
|
exit(1);
|
|
}
|
|
|
|
printf("sideload-host file size %" PRId64 " block size %d\n", file_size, block_size);
|
|
|
|
int result = run_adb_fuse(sfd, file_size, block_size);
|
|
|
|
printf("sideload_host finished\n");
|
|
exit(result == 0 ? 0 : 1);
|
|
}
|
|
|
|
unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) {
|
|
if (name.starts_with("sideload:")) {
|
|
// This exit status causes recovery to print a special error message saying to use a newer adb
|
|
// (that supports sideload-host).
|
|
exit(3);
|
|
} else if (name.starts_with("sideload-host:")) {
|
|
std::string arg(name.substr(strlen("sideload-host:")));
|
|
return create_service_thread("sideload-host",
|
|
std::bind(sideload_host_service, std::placeholders::_1, arg));
|
|
}
|
|
return unique_fd{};
|
|
}
|