diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2009-03-21 13:31:03 +0100 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2009-03-21 13:31:03 +0100 |
commit | c07b837dbad1ac176a6c18062dab9184e7080309 (patch) | |
tree | 277d5f7c06e2e71b25a9b9619917f04158b789e8 /src/Common/RequestManager.h | |
parent | 8f098fc3070f791302ec1f497588fab6ed409980 (diff) | |
download | mad-c07b837dbad1ac176a6c18062dab9184e7080309.tar mad-c07b837dbad1ac176a6c18062dab9184e7080309.zip |
Net::Connection-Klasse zur besseren Strukturierung gekapselt
Diffstat (limited to 'src/Common/RequestManager.h')
-rw-r--r-- | src/Common/RequestManager.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/Common/RequestManager.h b/src/Common/RequestManager.h index c38435b..82a00f6 100644 --- a/src/Common/RequestManager.h +++ b/src/Common/RequestManager.h @@ -31,7 +31,6 @@ namespace Mad { namespace Net { -class Connection; class Packet; } @@ -59,20 +58,20 @@ class RequestManager { RequestHandlerFactory() {} public: - virtual RequestHandler* createRequestHandler(Net::Connection *connection, int16_t requestId) = 0; + virtual RequestHandler* createRequestHandler(Connection *connection, int16_t requestId) = 0; virtual ~RequestHandlerFactory() {} }; template<class T> class SpecificRequestHandlerFactory : public RequestHandlerFactory { public: - virtual RequestHandler* createRequestHandler(Net::Connection *connection, int16_t requestId) { + virtual RequestHandler* createRequestHandler(Connection *connection, int16_t requestId) { return new T(connection, requestId); } }; static RequestManager requestManager; - std::map<Net::Connection*,RequestMap*> requestMaps; + std::map<Connection*,RequestMap*> requestMaps; bool core; uint16_t lastRequestId; @@ -86,9 +85,9 @@ class RequestManager { RequestManager(const RequestManager &o); RequestManager& operator=(const RequestManager &o); - void receiveHandler(Net::Connection *connection, const Net::Packet &packet); + void receiveHandler(Connection *connection, const XmlPacket &packet, uint16_t requestId); - RequestMap* getUnusedRequestId(Net::Connection *connection, uint16_t *requestId); + RequestMap* getUnusedRequestId(Connection *connection, uint16_t *requestId); bool send(Request *request); @@ -109,8 +108,8 @@ class RequestManager { lastRequestId |= 0x01; } - void registerConnection(Net::Connection *connection); - void unregisterConnection(Net::Connection *connection); + void registerConnection(Connection *connection); + void unregisterConnection(Connection *connection); template <class T> void registerPacketType(const std::string &type) { requestHandlerFactories.insert(std::make_pair(type, new SpecificRequestHandlerFactory<T>())); @@ -119,7 +118,7 @@ class RequestManager { void unregisterPacketType(const std::string &type); template <class T> - bool sendRequest(Net::Connection *connection, Request::slot_type slot) { + bool sendRequest(Connection *connection, Request::slot_type slot) { RequestMap *requestMap; uint16_t requestId; @@ -136,7 +135,7 @@ class RequestManager { } template <class T, typename T1> - bool sendRequest(Net::Connection *connection, Request::slot_type slot, T1 t1) { + bool sendRequest(Connection *connection, Request::slot_type slot, T1 t1) { RequestMap *requestMap; uint16_t requestId; @@ -153,7 +152,7 @@ class RequestManager { } template <class T, typename T1, typename T2> - bool sendRequest(Net::Connection *connection, Request::slot_type slot, T1 t1, T2 t2) { + bool sendRequest(Connection *connection, Request::slot_type slot, T1 t1, T2 t2) { RequestMap *requestMap; uint16_t requestId; @@ -170,7 +169,7 @@ class RequestManager { } template <class T, typename T1, typename T2, typename T3> - bool sendRequest(Net::Connection *connection, Request::slot_type slot, T1 t1, T2 t2, T3 t3) { + bool sendRequest(Connection *connection, Request::slot_type slot, T1 t1, T2 t2, T3 t3) { RequestMap *requestMap; uint16_t requestId; @@ -187,7 +186,7 @@ class RequestManager { } template <class T, typename T1, typename T2, typename T3, typename T4> - bool sendRequest(Net::Connection *connection, Request::slot_type slot, T1 t1, T2 t2, T3 t3, T4 t4) { + bool sendRequest(Connection *connection, Request::slot_type slot, T1 t1, T2 t2, T3 t3, T4 t4) { RequestMap *requestMap; uint16_t requestId; |