From 83c885f9702bb02206ad8dfa95b78333401e5154 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 17 Jul 2008 20:17:19 +0200 Subject: Identify-Pakete implementiert --- Konzept/Netzwerk.txt | 9 +++- src/Common/Request/DisconnectRequest.h | 4 +- src/Common/Request/IdentifyRequest.h | 81 ++++++++++++++++++++++++++++++++++ src/Common/Request/Makefile.am | 2 +- src/Common/Request/Makefile.in | 2 +- src/Common/Request/PingRequest.h | 79 --------------------------------- src/Common/RequestManager.cpp | 15 +++---- src/Net/Packet.h | 4 +- src/madc.cpp | 4 +- 9 files changed, 104 insertions(+), 96 deletions(-) create mode 100644 src/Common/Request/IdentifyRequest.h delete mode 100644 src/Common/Request/PingRequest.h diff --git a/Konzept/Netzwerk.txt b/Konzept/Netzwerk.txt index 39ea274..6aee849 100644 --- a/Konzept/Netzwerk.txt +++ b/Konzept/Netzwerk.txt @@ -33,6 +33,14 @@ Jeder Client/Dämon und der Kern verwalten ihre eigenen Request-IDs, und insgesa Damit es nicht zu Konflikten zwischen vom Kern und von Clients/Dämonen generierten IDs kommt, ist bei Client/Dämon-IDs das letzte Bit gesetzt, bei Kern-IDs nicht. +Implementierte Pakettypen: + +0000: OK (leeres Paket) +0001: Error (Fehlerinformationen) +0002: Disconnect (leeres Paket) +0010: Identify request (bisher: enthält den Namen des identifizierenden Dämons) +0011: Identify reply (bisher: leer) + Mögliche Pakettypen: * Login-Anfrage -> Übertragung von Kerberos-Daten @@ -42,7 +50,6 @@ Mögliche Pakettypen: * Status-Antwort * Kommando (Shutdown, etc.) * Kommando-Antwort -* Error * Verbindung trennen - Anfrage und Antwort (implementiert) + weitere Anfragen und Antworten... diff --git a/src/Common/Request/DisconnectRequest.h b/src/Common/Request/DisconnectRequest.h index 9023c13..77509a0 100644 --- a/src/Common/Request/DisconnectRequest.h +++ b/src/Common/Request/DisconnectRequest.h @@ -48,7 +48,7 @@ class DisconnectRequest: public Request { if(isSent()) return false; - if(!connection->send(Net::Packet(Net::Packet::TYPE_DISCONNECT_REQ, requestId))) + if(!connection->send(Net::Packet(Net::Packet::TYPE_DISCONNECT, requestId))) return false; setSent(); @@ -59,7 +59,7 @@ class DisconnectRequest: public Request { if(isFinished()) return false; - if(packet.getType() != Net::Packet::TYPE_DISCONNECT_REP) + if(packet.getType() != Net::Packet::TYPE_OK) return false; // TODO Logging connection->disconnect(); diff --git a/src/Common/Request/IdentifyRequest.h b/src/Common/Request/IdentifyRequest.h new file mode 100644 index 0000000..9df1548 --- /dev/null +++ b/src/Common/Request/IdentifyRequest.h @@ -0,0 +1,81 @@ +/* + * IdentifyRequest.h + * + * Copyright (C) 2008 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef IDENTIFYREQUEST_H_ +#define IDENTIFYREQUEST_H_ + +#include "Request.h" +#include "../RequestManager.h" +#include +#include +#include + +#include + +namespace Mad { +namespace Common { +namespace Request { + +class IdentifyRequest: public Request { + private: + IdentifyRequest(const std::string &hostname0) : hostname(hostname0) {} + + std::string hostname; + + public: + static bool send(Net::Connection *connection, RequestManager &requestManager, const std::string &hostname0) { + Request *request = new IdentifyRequest(hostname0); + + if(requestManager.sendRequest(connection, request)) + return true; + + delete request; + return false; + } + + virtual bool sendRequest(Net::Connection *connection, unsigned short requestId) { + if(isSent()) + return false; + + if(!connection->send(Net::Packet(Net::Packet::TYPE_IDENTIFY_REQ, requestId, hostname.c_str(), hostname.length()))) + return false; + + setSent(); + return true; + } + + virtual bool handlePacket(Net::Connection*, const Net::Packet &packet) { + if(isFinished()) + return false; + + if(packet.getType() != Net::Packet::TYPE_IDENTIFY_REP) + return false; // TODO Logging + + std::cout << "Identified as '" << hostname << "'." << std::endl; + + setFinished(); + return true; + } +}; + +} +} +} + +#endif /* IDENTIFYREQUEST_H_ */ diff --git a/src/Common/Request/Makefile.am b/src/Common/Request/Makefile.am index 17e47fe..a7de050 100644 --- a/src/Common/Request/Makefile.am +++ b/src/Common/Request/Makefile.am @@ -1 +1 @@ -noinst_HEADERS = DisconnectRequest.h PingRequest.h Request.h +noinst_HEADERS = DisconnectRequest.h IdentifyRequest.h Request.h diff --git a/src/Common/Request/Makefile.in b/src/Common/Request/Makefile.in index d96c0a7..9c48118 100644 --- a/src/Common/Request/Makefile.in +++ b/src/Common/Request/Makefile.in @@ -162,7 +162,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -noinst_HEADERS = DisconnectRequest.h PingRequest.h Request.h +noinst_HEADERS = DisconnectRequest.h IdentifyRequest.h Request.h all: all-am .SUFFIXES: diff --git a/src/Common/Request/PingRequest.h b/src/Common/Request/PingRequest.h deleted file mode 100644 index 92e3c1a..0000000 --- a/src/Common/Request/PingRequest.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * PingRequest.h - * - * Copyright (C) 2008 Matthias Schiffer - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef MAD_COMMON_REQUEST_PINGREQUEST_H_ -#define MAD_COMMON_REQUEST_PINGREQUEST_H_ - -#include "Request.h" -#include "../RequestManager.h" -#include -#include - -#include - -namespace Mad { -namespace Common { -namespace Request { - -class PingRequest : public Request { - private: - PingRequest() {} - - public: - static bool send(Net::Connection *connection, RequestManager &requestManager) { - Request *request = new PingRequest(); - - if(requestManager.sendRequest(connection, request)) - return true; - - delete request; - return false; - } - - virtual bool sendRequest(Net::Connection *connection, unsigned short requestId) { - if(isSent()) - return false; - - if(!connection->send(Net::Packet(Net::Packet::TYPE_PING, requestId))) - return false; - - setSent(); - return true; - } - - virtual bool handlePacket(Net::Connection*, const Net::Packet &packet) { - if(isFinished()) - return false; - - if(packet.getType() != Net::Packet::TYPE_PONG) - return false; // TODO Logging - - std::cout << "Received ping reply." << std::endl; - std::cout << " Request ID: " << packet.getRequestId() << std::endl; - - setFinished(); - return true; - } -}; - -} -} -} - -#endif /* MAD_COMMON_REQUEST_PINGREQUEST_H_ */ diff --git a/src/Common/RequestManager.cpp b/src/Common/RequestManager.cpp index 86d3529..755f59b 100644 --- a/src/Common/RequestManager.cpp +++ b/src/Common/RequestManager.cpp @@ -47,16 +47,15 @@ void RequestManager::receiveHandler(Net::Connection *connection, const Net::Pack } switch(packet.getType()) { - case Net::Packet::TYPE_PING: - std::cout << "Received ping request." << std::endl; - std::cout << " Request ID: " << packet.getRequestId() << std::endl; - - connection->send(Net::Packet(Net::Packet::TYPE_PONG, packet.getRequestId(), packet.getData(), packet.getLength())); - break; - case Net::Packet::TYPE_DISCONNECT_REQ: - connection->send(Net::Packet(Net::Packet::TYPE_DISCONNECT_REP, packet.getRequestId())); + case Net::Packet::TYPE_DISCONNECT: + connection->send(Net::Packet(Net::Packet::TYPE_OK, packet.getRequestId())); connection->disconnect(); break; + case Net::Packet::TYPE_IDENTIFY_REQ: + std::cout << "Received identify request from '" << std::string((char*)packet.getData(), packet.getLength()) << "'." << std::endl; + + connection->send(Net::Packet(Net::Packet::TYPE_IDENTIFY_REP, packet.getRequestId(), packet.getData(), packet.getLength())); + break; default: std::cerr << "Received an unexpected packet." << std::endl; } diff --git a/src/Net/Packet.h b/src/Net/Packet.h index c867ffa..2d2fb77 100644 --- a/src/Net/Packet.h +++ b/src/Net/Packet.h @@ -29,8 +29,8 @@ namespace Net { class Packet { public: enum Type { - TYPE_PING = 0x0000, TYPE_PONG = 0x0001, - TYPE_DISCONNECT_REQ = 0x0010, TYPE_DISCONNECT_REP = 0x0011 + TYPE_OK = 0x0000, TYPE_ERROR = 0x0001, TYPE_DISCONNECT = 0x0002, + TYPE_IDENTIFY_REQ = 0x0010, TYPE_IDENTIFY_REP = 0x0011 }; struct Data { diff --git a/src/madc.cpp b/src/madc.cpp index f987a9d..9609e56 100644 --- a/src/madc.cpp +++ b/src/madc.cpp @@ -22,7 +22,7 @@ #include "Net/Packet.h" #include "Common/RequestManager.h" #include "Common/Request/DisconnectRequest.h" -#include "Common/Request/PingRequest.h" +#include "Common/Request/IdentifyRequest.h" #include int main() { @@ -43,7 +43,7 @@ int main() { requestManager.registerConnection(connection); - Mad::Common::Request::PingRequest::send(connection, requestManager); + Mad::Common::Request::IdentifyRequest::send(connection, requestManager, "test"); Mad::Common::Request::DisconnectRequest::send(connection, requestManager); while(connection->isConnected()) { -- cgit v1.2.3