mirror of
https://github.com/google/cdc-file-transfer.git
synced 2026-09-13 01:10:44 +03:00
Remove port manager and range parser
That code is no longer needed since both cdc_stream and cdc_rsync use ephemeral ports assigned by the OS now.
This commit is contained in:
@@ -24,7 +24,6 @@ cc_library(
|
||||
hdrs = ["base_command.h"],
|
||||
deps = [
|
||||
"//absl_helper:jedec_size_flag",
|
||||
"//common:port_range_parser",
|
||||
"@com_github_lyra//:lyra",
|
||||
"@com_google_absl//absl/status",
|
||||
"@com_google_absl//absl/strings:str_format",
|
||||
@@ -210,7 +209,6 @@ cc_library(
|
||||
"//common:log",
|
||||
"//common:path",
|
||||
"//common:path_filter",
|
||||
"//common:port_manager",
|
||||
"//common:process",
|
||||
"//common:remote_util",
|
||||
"//common:sdk_util",
|
||||
|
||||
@@ -50,11 +50,7 @@ void AssetStreamConfig::RegisterCommandLineFlags(lyra::command& cmd,
|
||||
"asset stream service, default: " +
|
||||
std::to_string(service_port_)));
|
||||
|
||||
cmd.add_argument(lyra::opt(base_command.PortRangeParser(
|
||||
"--forward-port",
|
||||
&session_cfg_.deprecated_forward_port_first,
|
||||
&session_cfg_.deprecated_forward_port_last),
|
||||
"port")
|
||||
cmd.add_argument(lyra::opt(session_cfg_.deprecated_forward_port_range, "port")
|
||||
.name("--forward-port")
|
||||
.help("[Deprecated, ignored] TCP port or range used for "
|
||||
"SSH port forwarding"));
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
#include "absl/strings/str_format.h"
|
||||
#include "absl/strings/str_split.h"
|
||||
#include "absl_helper/jedec_size_flag.h"
|
||||
#include "common/port_range_parser.h"
|
||||
#include "lyra/lyra.hpp"
|
||||
|
||||
namespace cdc_ft {
|
||||
@@ -57,18 +56,6 @@ std::function<void(const std::string&)> BaseCommand::JedecParser(
|
||||
};
|
||||
}
|
||||
|
||||
std::function<void(const std::string&)> BaseCommand::PortRangeParser(
|
||||
const char* flag_name, uint16_t* first, uint16_t* last) {
|
||||
return [flag_name, first, last,
|
||||
error = &parse_error_](const std::string& value) {
|
||||
if (!port_range::Parse(value.c_str(), first, last)) {
|
||||
*error = absl::StrFormat(
|
||||
"Failed to parse %s=%s, expected <port> or <port1>-<port2>",
|
||||
flag_name, value);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
std::function<void(const std::string&)> BaseCommand::PosArgValidator(
|
||||
std::string* str) {
|
||||
return [str, invalid_arg = &invalid_arg_](const std::string& value) {
|
||||
|
||||
@@ -48,13 +48,6 @@ class BaseCommand {
|
||||
std::function<void(const std::string&)> JedecParser(const char* flag_name,
|
||||
uint64_t* bytes);
|
||||
|
||||
// Parser for single ports "123" or port ranges "123-234". Usage:
|
||||
// lyra::opt(PortRangeParser("port-flag", &first, &last), "port"))
|
||||
// Automatically reports a parse failure on error.
|
||||
std::function<void(const std::string&)> PortRangeParser(const char* flag_name,
|
||||
uint16_t* first,
|
||||
uint16_t* last);
|
||||
|
||||
// Validator that should be used for all positional arguments. Lyra interprets
|
||||
// -u, --unknown_flag as positional argument. This validator makes sure that
|
||||
// a positional argument starting with - is reported as an error. Otherwise,
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
#include "common/path.h"
|
||||
#include "common/path_filter.h"
|
||||
#include "common/platform.h"
|
||||
#include "common/port_manager.h"
|
||||
#include "common/process.h"
|
||||
#include "common/server_socket.h"
|
||||
#include "common/util.h"
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
#include "cdc_stream/cdc_fuse_manager.h"
|
||||
#include "common/log.h"
|
||||
#include "common/port_manager.h"
|
||||
#include "common/status.h"
|
||||
#include "common/status_macros.h"
|
||||
#include "metrics/enums.h"
|
||||
|
||||
@@ -59,8 +59,7 @@ struct SessionConfig {
|
||||
|
||||
// Ports used for local port forwarding. Deprecated as forward ports are
|
||||
// determined automatically now using ephemeral ports.
|
||||
uint16_t deprecated_forward_port_first = 0;
|
||||
uint16_t deprecated_forward_port_last = 0;
|
||||
std::string deprecated_forward_port_range;
|
||||
};
|
||||
|
||||
} // namespace cdc_ft
|
||||
|
||||
Reference in New Issue
Block a user