Einzelne Request-Klassen hinzugef?gt

1 files changed, 13 insertions, 13 deletions

diff --git a/src/Common/RequestManager.cpp b/src/Common/RequestManager.cpp
index 9cc4c71..34a9141 100644
--- a/src/Common/RequestManager.cpp
+++ b/src/Common/RequestManager.cpp
@@ -25,7 +25,7 @@ namespace Mad {
 namespace Common {
 
 void RequestManager::receiveHandler(Net::Connection *connection, const Net::Packet &packet) {
-  std::map<Net::Connection*,RequestInfo>::iterator it = requestMap.find(connection);
+  std::map<Net::Connection*,RequestMap>::iterator it = requestMap.find(connection);
 
   if(it == requestMap.end()) {
     // TODO: Error
@@ -34,8 +34,8 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
     return;
   }
 
-  RequestInfo &requestInfo = it->second;
-  RequestInfo::iterator it2;
+  RequestMap &requestInfo = it->second;
+  RequestMap::iterator it2;
 
   switch(packet.getType()) {
     case Net::Packet::TYPE_PING:
@@ -46,7 +46,7 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
       break;
     case Net::Packet::TYPE_PONG:
       it2 = requestInfo.find(packet.getRequestId());
-      if(it2 == requestInfo.end() || it2->second.getType() != Request::TYPE_PING) {
+      if(it2 == requestInfo.end() || it2->second.getType() != RequestInfo::TYPE_PING) {
         // TODO: Error
         std::cerr << "Received an unexpected ping reply." << std::endl;
 
@@ -64,7 +64,7 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
       break;
     case Net::Packet::TYPE_DISCONNECT_REP:
       it2 = requestInfo.find(packet.getRequestId());
-      if(it2 == requestInfo.end() || it2->second.getType() != Request::TYPE_DISCONNECT) {
+      if(it2 == requestInfo.end() || it2->second.getType() != RequestInfo::TYPE_DISCONNECT) {
         // TODO: Error
         std::cerr << "Received an unexpected disconnect reply." << std::endl;
 
@@ -77,31 +77,31 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack
   }
 }
 
-bool RequestManager::sendRequest(Net::Connection *connection, Request::Type type) {
-  std::map<Net::Connection*,RequestInfo>::iterator it = requestMap.find(connection);
+bool RequestManager::sendRequest(Net::Connection *connection, RequestInfo requestData) {
+  std::map<Net::Connection*,RequestMap>::iterator it = requestMap.find(connection);
 
   if(it == requestMap.end())
     return false;
 
-  RequestInfo &requestInfo = it->second;
+  RequestMap &requestInfo = it->second;
 
   unsigned short request;
   do {
     request = getRequestId();
   } while(requestInfo.find(request) != requestInfo.end());
 
-  switch(type) {
-    case Request::TYPE_PING:
+  switch(requestData.getType()) {
+    case RequestInfo::TYPE_PING:
       if(!connection->send(Net::Packet(Net::Packet::TYPE_PING, request)))
         return false;
 
-      requestInfo.insert(std::make_pair(request, Request(type)));
+      requestInfo.insert(std::make_pair(request, requestData));
       break;
-    case Request::TYPE_DISCONNECT:
+    case RequestInfo::TYPE_DISCONNECT:
       if(!connection->send(Net::Packet(Net::Packet::TYPE_DISCONNECT_REQ, request)))
         return false;
 
-      requestInfo.insert(std::make_pair(request, Request(type)));
+      requestInfo.insert(std::make_pair(request, requestData));
   }
 
   return true;