diff options
author | Riccardo Spagni <ric@spagni.net> | 2016-09-18 21:38:46 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2016-09-18 21:38:46 +0200 |
commit | 53e18cafdfb2bf24e8e0f8dd7355733eb31dc1c4 (patch) | |
tree | 55e6ece4dbd5865b373ddbfedaa669bbdbbd25b1 /src/common | |
parent | Merge pull request #1101 (diff) | |
parent | epee: optionally restrict HTTP service to a configurable user agent (diff) | |
download | monero-53e18cafdfb2bf24e8e0f8dd7355733eb31dc1c4.tar.xz |
Merge pull request #1102v0.10.0
eeb2bbc epee: optionally restrict HTTP service to a configurable user agent (moneromooo-monero)
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/command_line.cpp | 1 | ||||
-rw-r--r-- | src/common/command_line.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp index 90db3b04d..fc096abe5 100644 --- a/src/common/command_line.cpp +++ b/src/common/command_line.cpp @@ -48,6 +48,7 @@ namespace command_line const arg_descriptor<bool> arg_version = {"version", "Output version information"}; const arg_descriptor<std::string> arg_data_dir = {"data-dir", "Specify data directory"}; const arg_descriptor<std::string> arg_testnet_data_dir = {"testnet-data-dir", "Specify testnet data directory"}; + const arg_descriptor<std::string> arg_user_agent = {"user-agent", "Restrict RPC use to clients using this user agent"}; const arg_descriptor<bool> arg_test_drop_download = {"test-drop-download", "For net tests: in download, discard ALL blocks instead checking/saving them (very fast)"}; const arg_descriptor<uint64_t> arg_test_drop_download_height = {"test-drop-download-height", "Like test-drop-download but disards only after around certain height", 0}; const arg_descriptor<int> arg_test_dbg_lock_sleep = {"test-dbg-lock-sleep", "Sleep time in ms, defaults to 0 (off), used to debug before/after locking mutex. Values 100 to 1000 are good for tests."}; diff --git a/src/common/command_line.h b/src/common/command_line.h index 75dc4b9fd..731b8b0bb 100644 --- a/src/common/command_line.h +++ b/src/common/command_line.h @@ -204,6 +204,7 @@ namespace command_line extern const arg_descriptor<bool> arg_version; extern const arg_descriptor<std::string> arg_data_dir; extern const arg_descriptor<std::string> arg_testnet_data_dir; + extern const arg_descriptor<std::string> arg_user_agent; extern const arg_descriptor<bool> arg_test_drop_download; extern const arg_descriptor<uint64_t> arg_test_drop_download_height; extern const arg_descriptor<int> arg_test_dbg_lock_sleep; |