mirror of
https://github.com/nestriness/cdc-file-transfer.git
synced 2026-01-30 20:05:37 +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.
99 lines
2.8 KiB
C++
99 lines
2.8 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 COMMON_STATUS_H_
|
|
#define COMMON_STATUS_H_
|
|
|
|
#include "absl/status/status.h"
|
|
#include "absl/strings/str_cat.h"
|
|
#include "absl/strings/str_format.h"
|
|
#include "common/platform.h"
|
|
|
|
namespace cdc_ft {
|
|
|
|
//
|
|
// Convenience helper functions for status creation.
|
|
//
|
|
|
|
inline absl::Status MakeStatus(const char* message) {
|
|
return absl::InternalError(message);
|
|
}
|
|
|
|
template <typename... Args>
|
|
absl::Status MakeStatus(const absl::FormatSpec<Args...>& format, Args... args) {
|
|
return absl::InternalError(absl::StrFormat(format, args...));
|
|
}
|
|
|
|
// Convenience helper for cases that may or may not have a message to wrap.
|
|
template <typename... Args>
|
|
absl::Status WrapStatus(absl::Status inner_status) {
|
|
return inner_status;
|
|
}
|
|
|
|
// Returns OK if |inner_status| is OK and a copy of |inner_status| with given
|
|
// message + |inner_status|'s message otherwise.
|
|
template <typename... Args>
|
|
absl::Status WrapStatus(absl::Status inner_status,
|
|
const absl::FormatSpec<Args...>& format, Args... args) {
|
|
if (inner_status.ok()) {
|
|
return inner_status;
|
|
}
|
|
|
|
std::string message = absl::StrFormat(format, args...);
|
|
absl::Status wrapped_status(
|
|
inner_status.code(), absl::StrCat(inner_status.message(), "; ", message));
|
|
inner_status.ForEachPayload(
|
|
[&wrapped_status](absl::string_view key, const absl::Cord& value) {
|
|
wrapped_status.SetPayload(key, value);
|
|
});
|
|
return wrapped_status;
|
|
}
|
|
|
|
//
|
|
// Tags attached to absl::Status to allow more fine-grained error handling.
|
|
//
|
|
|
|
enum class Tag : uint8_t {
|
|
// Sending end of the socket was closed, so receiving end can no longer read.
|
|
kSocketEof = 0,
|
|
|
|
// Bind failed, probably because there's another instance of cdc_rsync
|
|
// running.
|
|
kAddressInUse = 1,
|
|
|
|
// The gamelet components need to be re-deployed.
|
|
kDeployServer = 2,
|
|
|
|
// Timeout while trying to connect to the gamelet component.
|
|
kConnectionTimeout = 3,
|
|
|
|
// MUST BE LAST.
|
|
kCount = 4,
|
|
};
|
|
|
|
// Tags a status. No-op if |status| is OK. Overwrites existing tags.
|
|
absl::Status SetTag(absl::Status status, Tag tag);
|
|
|
|
// Returns the associated tag. Empty if none.
|
|
absl::optional<Tag> GetTag(const absl::Status& status);
|
|
|
|
// Checks whether the status has a certain tag.
|
|
bool HasTag(const absl::Status& status, Tag tag);
|
|
|
|
} // namespace cdc_ft
|
|
|
|
#endif // COMMON_STATUS_H_
|