?berarbeitung der Request-Klasse begonnen

1 files changed, 18 insertions, 18 deletions

diff --git a/src/Client/CommandParser.cpp b/src/Client/CommandParser.cpp
index 1c0403d..4c395b7 100644
--- a/src/Client/CommandParser.cpp
+++ b/src/Client/CommandParser.cpp
@@ -118,9 +118,9 @@ std::map<std::string, Common::HostInfo> CommandParser::parseHostList(const std::
 
 void CommandParser::fsinfoCommand(const std::vector<std::string> &args) {
   if(args.size() == 1)
-    Common::RequestManager::get()->sendRequest<Common::Requests::FSInfoRequest>(connection, boost::bind(&CommandManager::fsInfoRequestFinished, CommandManager::get(), _1));
+    Common::RequestManager::get()->sendRequest0<Common::Requests::FSInfoRequest>(connection, boost::bind(&CommandManager::fsInfoRequestFinished, CommandManager::get(), _1));
   else if(args.size() == 2)
-    Common::RequestManager::get()->sendRequest<Requests::DaemonFSInfoRequest>(connection, boost::bind(&CommandManager::daemonFSInfoRequestFinished, CommandManager::get(), _1), args[1]);
+    Common::RequestManager::get()->sendRequest1<Requests::DaemonFSInfoRequest>(connection, args[1], boost::bind(&CommandManager::daemonFSInfoRequestFinished, CommandManager::get(), _1));
   else {
     Common::Logger::logf(Common::Logger::ERROR, "%s: Too many arguments.", args[0].c_str());
     printUsage("fsinfo");
@@ -221,8 +221,8 @@ void CommandParser::rebootCommand(const std::vector<std::string> &args) {
   std::map<std::string, Common::HostInfo> hosts = parseHostList(std::vector<std::string>(args.begin()+1, args.end()), true);
 
   for(std::map<std::string, Common::HostInfo>::iterator host = hosts.begin(); host != hosts.end(); ++host) {
-    Common::RequestManager::get()->sendRequest<Requests::DaemonCommandRequest>(connection,
-        boost::bind(&CommandManager::daemonCommandRequestFinished, CommandManager::get(), _1), host->first, true
+    Common::RequestManager::get()->sendRequest2<Requests::DaemonCommandRequest>(connection,
+        host->first, true, boost::bind(&CommandManager::daemonCommandRequestFinished, CommandManager::get(), _1)
     );
 
     ++CommandManager::get()->activeRequests;
@@ -239,8 +239,8 @@ void CommandParser::shutdownCommand(const std::vector<std::string> &args) {
   std::map<std::string, Common::HostInfo> hosts = parseHostList(std::vector<std::string>(args.begin()+1, args.end()), true);
 
   for(std::map<std::string, Common::HostInfo>::iterator host = hosts.begin(); host != hosts.end(); ++host) {
-    Common::RequestManager::get()->sendRequest<Requests::DaemonCommandRequest>(connection,
-        boost::bind(&CommandManager::daemonCommandRequestFinished, CommandManager::get(), _1), host->first, false
+    Common::RequestManager::get()->sendRequest2<Requests::DaemonCommandRequest>(connection,
+        host->first, false, boost::bind(&CommandManager::daemonCommandRequestFinished, CommandManager::get(), _1)
     );
 
     ++CommandManager::get()->activeRequests;
@@ -249,11 +249,11 @@ void CommandParser::shutdownCommand(const std::vector<std::string> &args) {
 
 void CommandParser::statusCommand(const std::vector<std::string> &args) {
   if(args.size() == 1)
-    Common::RequestManager::get()->sendRequest<Common::Requests::StatusRequest>(connection,
+    Common::RequestManager::get()->sendRequest0<Common::Requests::StatusRequest>(connection,
         boost::bind(&CommandManager::statusRequestFinished, CommandManager::get(), _1));
   else if(args.size() == 2)
-    Common::RequestManager::get()->sendRequest<Requests::DaemonStatusRequest>(connection,
-        boost::bind(&CommandManager::daemonStatusRequestFinished, CommandManager::get(), _1), args[1]);
+    Common::RequestManager::get()->sendRequest1<Requests::DaemonStatusRequest>(connection,
+        args[1], boost::bind(&CommandManager::daemonStatusRequestFinished, CommandManager::get(), _1));
   else {
     Common::Logger::logf(Common::Logger::ERROR, "%s: Too many arguments.", args[0].c_str());
     printUsage("status");
@@ -285,14 +285,14 @@ void CommandParser::userInfoCommand(const std::vector<std::string> &args) {
 
   ++CommandManager::get()->activeRequests;
 
-  Common::RequestManager::get()->sendRequest<Common::Requests::UserInfoRequest>(connection,
-      boost::bind(&CommandManager::userInfoRequestFinished, CommandManager::get(), _1), uid);
+  Common::RequestManager::get()->sendRequest1<Common::Requests::UserInfoRequest>(connection,
+      uid, boost::bind(&CommandManager::userInfoRequestFinished, CommandManager::get(), _1));
 }
 
 void CommandParser::listUsersCommand(const std::vector<std::string>&) {
   ++CommandManager::get()->activeRequests;
 
-  Common::RequestManager::get()->sendRequest<Common::Requests::UserListRequest>(connection,
+  Common::RequestManager::get()->sendRequest0<Common::Requests::UserListRequest>(connection,
       boost::bind(&CommandManager::userListRequestFinished, CommandManager::get(), _1));
 }
 
@@ -318,14 +318,14 @@ void CommandParser::listUserGroupsCommand(const std::vector<std::string> &args)
 
   ++CommandManager::get()->activeRequests;
 
-  Common::RequestManager::get()->sendRequest<Common::Requests::UserGroupListRequest>(connection,
-      boost::bind(&CommandManager::userGroupListRequestFinished, CommandManager::get(), _1), uid);
+  Common::RequestManager::get()->sendRequest1<Common::Requests::UserGroupListRequest>(connection,
+      uid, boost::bind(&CommandManager::userGroupListRequestFinished, CommandManager::get(), _1));
 }
 
 void CommandParser::listGroupsCommand(const std::vector<std::string>&) {
   ++CommandManager::get()->activeRequests;
 
-  Common::RequestManager::get()->sendRequest<Common::Requests::GroupListRequest>(connection,
+  Common::RequestManager::get()->sendRequest0<Common::Requests::GroupListRequest>(connection,
       boost::bind(&CommandManager::groupListRequestFinished, CommandManager::get(), _1));
 }
 
@@ -351,14 +351,14 @@ void CommandParser::listGroupUsersCommand(const std::vector<std::string> &args)
 
   ++CommandManager::get()->activeRequests;
 
-  Common::RequestManager::get()->sendRequest<Common::Requests::GroupUserListRequest>(connection,
-      boost::bind(&CommandManager::groupUserListRequestFinished, CommandManager::get(), _1), gid);
+  Common::RequestManager::get()->sendRequest1<Common::Requests::GroupUserListRequest>(connection,
+      gid, boost::bind(&CommandManager::groupUserListRequestFinished, CommandManager::get(), _1));
 }
 
 void CommandParser::exitCommand(const std::vector<std::string>&) {
   ++CommandManager::get()->activeRequests;
 
-  Common::RequestManager::get()->sendRequest<Common::Requests::DisconnectRequest>(connection,
+  Common::RequestManager::get()->sendRequest0<Common::Requests::DisconnectRequest>(connection,
       boost::bind(&CommandManager::disconnectRequestFinished, CommandManager::get(), _1));
 }