summaryrefslogtreecommitdiffstats
path: root/src/Client/Requests/DaemonListRequest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Client/Requests/DaemonListRequest.cpp')
-rw-r--r--src/Client/Requests/DaemonListRequest.cpp27
1 files changed, 5 insertions, 22 deletions
diff --git a/src/Client/Requests/DaemonListRequest.cpp b/src/Client/Requests/DaemonListRequest.cpp
index cc6d353..2c2e195 100644
--- a/src/Client/Requests/DaemonListRequest.cpp
+++ b/src/Client/Requests/DaemonListRequest.cpp
@@ -18,41 +18,24 @@
*/
#include "DaemonListRequest.h"
-#include <Common/RequestManager.h>
+#include <Net/Connection.h>
#include <Net/Packets/NameListPacket.h>
namespace Mad {
namespace Client {
namespace Requests {
-bool DaemonListRequest::send(Net::Connection *connection, const sigc::slot<void,const Net::Packets::NameListPacket&> &callback) {
- DaemonListRequest *request = new DaemonListRequest();
-
- request->finished.connect(callback);
-
- if(Mad::Common::RequestManager::getRequestManager()->sendRequest(connection, request))
- return true;
-
- delete request;
- return false;
-}
-
-bool DaemonListRequest::sendRequest(Net::Connection *connection, uint16_t requestId) {
- if(!connection->send(Net::Packet(Net::Packet::LIST_DAEMONS, requestId)))
- return false;
-
- return true;
+void DaemonListRequest::sendRequest(Net::Connection *connection, uint16_t requestId) {
+ connection->send(Net::Packet(Net::Packet::LIST_DAEMONS, requestId));
}
void DaemonListRequest::handlePacket(Net::Connection*, const Net::Packet &packet) {
if(packet.getType() != Net::Packet::OK) {
- signalFinished().emit();
+ finishWithError(Common::Exception(Common::Exception::UNEXPECTED_PACKET));
return; // TODO Logging
}
- finished(Net::Packets::NameListPacket(packet));
-
- signalFinished().emit();
+ finish(Net::Packets::NameListPacket(packet));
}
}