mirror of
https://github.com/nestriness/cdc-file-transfer.git
synced 2026-01-30 14:15:36 +02:00
9fdccb3548
* Remove dependencies of cdc_sync from GGP Allows overriding the SSH and SCP commands via command line flags. Hence, strict host checking, SSH config etc. can be removed since it is passed in by command line flags for GGP. Also deploys cdc_rsync_server to ~/.cache/cdc_file_transfer/ and creates that dir if it does not exist. * Tweak RemoteUtil Replaces localhost: by //./ in the workaround for scp since localhost: had two disadvantages: 1) It required 2 gnubby touches for gLinux and 2) it didn't work for ggp. //./ works for both. Also tweaks quoting, which didn't quite work for ggp. * Don't check remote ports in cdc_rsync Turns off checking remote ports in PortManager. In the future, the server should return available ports after failing to connect to the provided port. Since now the first remote connection is running cdc_rsync_server, the timeout check has to be done when running that process. * Remove now-unused kInstancePickerNotAvailableInQuietMode enum * Add more details to the readme * [cdc_rsync] Accept [user@]host:destination Removes the --ip command line argument and assumes user/host are passed in along with the destination, so it works in the same way as other popular tools. * [ggp_rsync] Combine server deploy commands Combines two chmod and one mv command into one ssh command. This makes deploy a bit quicker, especially if each ssh command involves touching your gnubby. * Remove GGP specific stuff from VS build commands * [cdc_rsync] Get rid of cdc_rsync.dll Compile the CDC RSync client as a static library instead. This removes quite a bit of boiler plate and makes string handling easier since we can now pass std::strings instead of const chars. Also fixes an issue where we were sometimes trying to assign nullptr to std::strings, which is forbidden. * Allow specifying ssh/scp commands with env vars * Rename GgpRsync* to CdcRsync* * Merge ggp_rsync_cli into ggp_rsync * [cdc_rsync] Refactor cdc_rsync.cc/h Merges cdc_rsync.cc/h with main.cc and CdcRsyncClient since code is closer to where it's being used and should be more readable.
122 lines
3.4 KiB
C++
122 lines
3.4 KiB
C++
/*
|
|
* Copyright 2022 Google LLC
|
|
*
|
|
* 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 CDC_RSYNC_SERVER_CDC_RSYNC_SERVER_H_
|
|
#define CDC_RSYNC_SERVER_CDC_RSYNC_SERVER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "absl/status/status.h"
|
|
#include "cdc_rsync/base/message_pump.h"
|
|
#include "cdc_rsync_server/file_diff_generator.h"
|
|
#include "cdc_rsync_server/file_info.h"
|
|
#include "common/gamelet_component.h"
|
|
#include "common/path_filter.h"
|
|
|
|
namespace cdc_ft {
|
|
|
|
class MessagePump;
|
|
class ServerSocket;
|
|
|
|
class CdcRsyncServer {
|
|
public:
|
|
CdcRsyncServer();
|
|
~CdcRsyncServer();
|
|
|
|
// Checks that the gamelet components (cdc_rsync_server binary etc.) are
|
|
// up-to-date by checking their sizes and timestamps.
|
|
bool CheckComponents(const std::vector<GameletComponent>& components);
|
|
|
|
// Listens to |port|, accepts a connection from the client and runs the rsync
|
|
// procedure.
|
|
absl::Status Run(int port);
|
|
|
|
// Returns the verbosity sent from the client. 0 by default.
|
|
int GetVerbosity() const { return verbosity_; }
|
|
|
|
private:
|
|
// Runs the rsync procedure.
|
|
absl::Status Sync();
|
|
|
|
// Receives options from the client.
|
|
absl::Status HandleSetOptions();
|
|
|
|
// Finds all server-side files in the |destination_| folder.
|
|
absl::Status FindFiles();
|
|
|
|
// Receives all client-side files.
|
|
absl::Status HandleSendAllFiles();
|
|
|
|
// Diffs client- and server-side files.
|
|
absl::Status DiffFiles();
|
|
|
|
// Deletes files and directories present on the server, but not on the client.
|
|
absl::Status RemoveExtraneousFilesAndDirs();
|
|
|
|
// Creates missing directories.
|
|
absl::Status CreateMissingDirs();
|
|
|
|
// Sends file indices to the client. Used for missing and changed files.
|
|
template <typename T>
|
|
absl::Status SendFileIndices(const char* file_type,
|
|
const std::vector<T>& files);
|
|
|
|
// Receives missing files from the client.
|
|
absl::Status HandleSendMissingFileData();
|
|
|
|
// Core rsync algorithm. Sends signatures of changed files to the client,
|
|
// receives diffs and applies them.
|
|
absl::Status SyncChangedFiles();
|
|
|
|
// Waits for the shutdown message and send an ack.
|
|
absl::Status HandleShutdown();
|
|
|
|
// Called on |message_pump_|'s receiver thread whenever a package is received.
|
|
// Used to toggle decompression.
|
|
void Thread_OnPackageReceived(PacketType type);
|
|
|
|
std::unique_ptr<ServerSocket> socket_;
|
|
std::unique_ptr<MessagePump> message_pump_;
|
|
|
|
std::string destination_;
|
|
|
|
// Options.
|
|
bool delete_ = false;
|
|
bool recursive_ = false;
|
|
int verbosity_ = 0;
|
|
bool whole_file_ = false;
|
|
bool compress_ = false;
|
|
bool checksum_ = false;
|
|
bool relative_ = false;
|
|
bool dry_run_ = false;
|
|
bool existing_ = false;
|
|
std::string copy_dest_;
|
|
|
|
PathFilter path_filter_;
|
|
|
|
std::vector<FileInfo> client_files_;
|
|
std::vector<DirInfo> client_dirs_;
|
|
std::vector<FileInfo> server_files_;
|
|
std::vector<DirInfo> server_dirs_;
|
|
file_diff::Result diff_;
|
|
};
|
|
|
|
} // namespace cdc_ft
|
|
|
|
#endif // CDC_RSYNC_SERVER_CDC_RSYNC_SERVER_H_
|