github-mirrors/netris-cdc-file-transfer
1
0
Fork 0
mirror of https://github.com/nestriness/cdc-file-transfer.git synced 2026-01-30 12:25:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

[cdc_rsync] Use ephemeral port on client (#96)

Browse Source 
Instead of calling netstat locally to find out available ports in a
tight range, call bind() with port zero to find an available ephemeral
port. This is faster and much simpler, and will eventually help
getting rid of PortManager.

Also fixes issues with running SSH commands on Windows when the remote
shell is Powershell (aka Backslash Bingo).
This commit is contained in:
Lutz Justen
2023-04-08 20:19:01 +02:00
committed by GitHub
parent 09cee120b2
commit 26ff93489e
10 changed files with 39 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cdc_rsync_server/cdc_rsync_server.cc
View File

@@ -289,10 +289,7 @@ bool CdcRsyncServer::CheckComponents(
}
absl::Status CdcRsyncServer::Run() {
absl::Status status = Socket::Initialize();
if (!status.ok()) {
return WrapStatus(status, "Failed to initialize sockets");
}
RETURN_IF_ERROR(Socket::Initialize(), "Failed to initialize sockets");
socket_finalizer_ = std::make_unique<SocketFinalizer>();
socket_ = std::make_unique<ServerSocket>();
@@ -307,10 +304,8 @@ absl::Status CdcRsyncServer::Run() {
printf("Port %i: Server is listening\n", port);
fflush(stdout);
status = socket_->WaitForConnection();
if (!status.ok()) {
return WrapStatus(status, "Failed to establish a connection");
}
RETURN_IF_ERROR(socket_->WaitForConnection(),
"Failed to establish a connection");
message_pump_ = std::make_unique<MessagePump>(
socket_.get(),
@@ -318,7 +313,7 @@ absl::Status CdcRsyncServer::Run() {
message_pump_->StartMessagePump();
LOG_INFO("Client connected. Starting to sync.");
status = Sync();
absl::Status status = Sync();
if (!status.ok()) {
socket_->ShutdownSendingEnd().IgnoreError();
return status;