From 2611b354ab5e1d1484f2550a3aa4708407ce0e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Fri, 6 Mar 2020 19:13:17 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@919 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/cloud_dispatcher/CMakeLists.txt | 4 +++- utils/cloud_dispatcher/main.cpp | 34 ++++++++++++--------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/utils/cloud_dispatcher/CMakeLists.txt b/utils/cloud_dispatcher/CMakeLists.txt index 74e17a22..80d86378 100644 --- a/utils/cloud_dispatcher/CMakeLists.txt +++ b/utils/cloud_dispatcher/CMakeLists.txt @@ -1,5 +1,7 @@ message(STATUS "Building picloud") -add_executable(picloud "main.cpp") +file(GLOB CPPS "*.cpp") +file(GLOB HDRS "*.h") +add_executable(picloud ${CPPS} ${HDRS}) target_link_libraries(picloud pip pip_cloud) if (DEFINED LIB) install(TARGETS picloud DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) diff --git a/utils/cloud_dispatcher/main.cpp b/utils/cloud_dispatcher/main.cpp index 952bd592..388cf14b 100644 --- a/utils/cloud_dispatcher/main.cpp +++ b/utils/cloud_dispatcher/main.cpp @@ -3,39 +3,35 @@ using namespace PICoutManipulators; +PIString ip = "0.0.0.0"; +int port = 10101; void usage() { - piCout << Bold << "PIP Cloud dispatcher"; + piCout << Bold << "PIP Cloud Dispatcher"; piCout << Cyan << "Version" << Bold << PIPVersion() << NewLine; - piCout << Green << Bold << "Usage:" << Default << "\"picloud\"" << NewLine; + piCout << Green << Bold << "Usage:" << Default << "\"picloud [-h] [-i ] [-p ]\"" << NewLine; piCout << Green << Bold << "Details:"; - piCout << "-h --help " << Green << "- display this message and exit"; - //piCout << "-g --genhash " << Green << "- generate hash from string"; - //piCout << "-t --text " << Green << "- output in text base64"; - //piCout << "-o --out " << Green << "- write out to file "; - //piCout << "-c --crypt " << Green << "- crypt file using secret or or "; - //piCout << "-d --decrypt " << Green << "- decrypt file using secret or or "; - //piCout << "-p --pass " << Green << "- use secret from passphrase "; - //piCout << "-s --secret " << Green << "- use secret from hash "; - //piCout << "-k --key " << Green << "- use secret from binary key_file "; - //piCout << "-x --hex [] " << Green << "- use secret from hex hash or output in text hex"; - //piCout << "-r --random " << Green << "- generate random secret key"; + piCout << "-h --help " << Green << "- display this message and exit"; + piCout << "-i --ip " << Green << "- listen address, default \"0.0.0.0\""; + piCout << "-p --port " << Green << "- listen port, default 10101"; } int main (int argc, char * argv[]) { PICrypt::hash(""); PICLI cli(argc, argv); - cli.addArgument("genhash", true); + cli.addArgument("help"); + cli.addArgument("ip", true); + cli.addArgument("port", true); - if (!(cli.hasArgument("genhash") || - cli.hasArgument("crypt") || - cli.hasArgument("decrypt") || - cli.hasArgument("random")) || - cli.hasArgument("help")) { + if (cli.hasArgument("help")) { usage(); return 0; } + if (cli.hasArgument("ip")) + ip = cli.argumentValue("ip"); + if (cli.hasArgument("port")) + port = cli.argumentValue("port").toInt(); return 0; }