Identifikationsinformationen im ConnectionManager speichern

6 files changed, 146 insertions, 8 deletions

diff --git a/src/Core/ConnectionManager.cpp b/src/Core/ConnectionManager.cpp
index 78497e7..72bf07f 100644
--- a/src/Core/ConnectionManager.cpp
+++ b/src/Core/ConnectionManager.cpp
@@ -22,10 +22,15 @@
 #include "RequestHandlers/CoreStatusRequestHandler.h"
 #include "RequestHandlers/DaemonStatusRequestHandler.h"
 #include "RequestHandlers/GSSAPIAuthRequestHandler.h"
+#include "RequestHandlers/IdentifyRequestHandler.h"
 #include <Net/ServerConnection.h>
 #include <Net/Packet.h>
 #include <Net/Listener.h>
+
 #include <unistd.h>
+#include <algorithm>
+
+#include <iostream>
 
 namespace Mad {
 namespace Core {
@@ -63,6 +68,7 @@ ConnectionManager::ConnectionManager() {
   Common::RequestManager::getRequestManager()->registerPacketType<RequestHandlers::CoreStatusRequestHandler>(Net::Packet::CORE_STATUS);
   Common::RequestManager::getRequestManager()->registerPacketType<RequestHandlers::DaemonStatusRequestHandler>(Net::Packet::DAEMON_STATUS);
   Common::RequestManager::getRequestManager()->registerPacketType<RequestHandlers::GSSAPIAuthRequestHandler>(Net::Packet::GSSAPI_AUTH);
+  Common::RequestManager::getRequestManager()->registerPacketType<RequestHandlers::IdentifyRequestHandler>(Net::Packet::IDENTIFY);
 
   ConfigManager *configManager = ConfigManager::getConfigManager();
 
@@ -120,6 +126,15 @@ void ConnectionManager::handleConnections(std::list<Net::ServerConnection*>& con
       ++con;
     }
     else {
+      if((*con)->isIdentified()) {
+        for(std::map<std::string,Net::ServerConnection*>::iterator idCon = identifiedDaemonConnections.begin(); idCon != identifiedDaemonConnections.end(); ++idCon) {
+          if(idCon->second == *con) {
+            idCon->second = 0;
+            break;
+          }
+        }
+      }
+
       Common::RequestManager::getRequestManager()->unregisterConnection(*con);
       delete *con;
       connections.erase(con++);
@@ -153,5 +168,36 @@ Net::Connection* ConnectionManager::getDaemonConnection(const std::string &name)
   return daemon->second;
 }
 
+void ConnectionManager::identifyDaemonConnection(Net::Connection *connection, const std::string &name) {
+  // TODO Error handling
+
+  if(connection->isIdentified()) {
+    std::cerr << "Already identified." << std::endl;
+    return;
+  }
+
+  std::list<Net::ServerConnection*>::iterator con = std::find(daemonConnections.begin(), daemonConnections.end(), connection);
+  if(con == daemonConnections.end()) {
+    std::cerr << "Connection not found." << std::endl;
+    return;
+  }
+
+  std::map<std::string,Net::ServerConnection*>::iterator idCon = identifiedDaemonConnections.find(name);
+  if(idCon == identifiedDaemonConnections.end()) {
+    std::cerr << "Name not found." << std::endl;
+    return;
+  }
+
+  if(idCon->second) {
+    idCon->second->disconnect();
+    std::cerr << "Disconnecting old connection" << std::endl;
+  }
+
+  idCon->second = *con;
+  connection->setIdentified();
+
+  std::cerr << "Identified as '" << name << "'." << std::endl;
+}
+
 }
 }
diff --git a/src/Core/ConnectionManager.h b/src/Core/ConnectionManager.h
index 4ca3d59..6e098b6 100644
--- a/src/Core/ConnectionManager.h
+++ b/src/Core/ConnectionManager.h
@@ -70,12 +70,12 @@ class ConnectionManager {
       return connectionManager.get();
     }
 
-    virtual ~ConnectionManager();
-
-    void init() {
+    static void init() {
       connectionManager = std::auto_ptr<ConnectionManager>(new ConnectionManager());
     }
 
+    virtual ~ConnectionManager();
+
     bool wait(int timeout) {
       return (poll(pollfds.data(), pollfds.size(), timeout) > 0);
     }
@@ -83,6 +83,7 @@ class ConnectionManager {
     void run();
 
     Net::Connection* getDaemonConnection(const std::string &name) const;
+    void identifyDaemonConnection(Net::Connection *connection, const std::string &name);
 };
 
 }
diff --git a/src/Core/RequestHandlers/IdentifyRequestHandler.cpp b/src/Core/RequestHandlers/IdentifyRequestHandler.cpp
new file mode 100644
index 0000000..9a80959
--- /dev/null
+++ b/src/Core/RequestHandlers/IdentifyRequestHandler.cpp
@@ -0,0 +1,49 @@
+/*
+ * IdentifyRequestHandler.cpp
+ *
+ * Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "IdentifyRequestHandler.h"
+#include "../ConnectionManager.h"
+#include <Net/Connection.h>
+
+namespace Mad {
+namespace Core {
+namespace RequestHandlers {
+
+bool IdentifyRequestHandler::handlePacket(Net::Connection *connection, const Net::Packet &packet) {
+  if(isFinished())
+    return false;
+
+  if(packet.getType() != Net::Packet::IDENTIFY)
+    return false; // TODO Logging
+
+  // TODO Require authentication
+
+  ConnectionManager::getConnectionManager()->identifyDaemonConnection(connection, std::string((const char*)packet.getData(), packet.getLength()));
+
+  if(!connection->send(Net::Packet(Net::Packet::OK, packet.getRequestId())))
+    return false;
+
+  setFinished();
+
+  return true;
+}
+
+}
+}
+}
diff --git a/src/Core/RequestHandlers/IdentifyRequestHandler.h b/src/Core/RequestHandlers/IdentifyRequestHandler.h
new file mode 100644
index 0000000..df03434
--- /dev/null
+++ b/src/Core/RequestHandlers/IdentifyRequestHandler.h
@@ -0,0 +1,40 @@
+/*
+ * IdentifyRequestHandler.h
+ *
+ * Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_COMMON_REQUESTHANDLERS_IDENTIFYREQUESTHANDLER_H_
+#define MAD_COMMON_REQUESTHANDLERS_IDENTIFYREQUESTHANDLER_H_
+
+#include <Common/RequestHandler.h>
+
+namespace Mad {
+namespace Core {
+namespace RequestHandlers {
+
+class IdentifyRequestHandler : public Common::RequestHandler {
+  public:
+    IdentifyRequestHandler() {}
+
+    virtual bool handlePacket(Net::Connection *connection, const Net::Packet &packet);
+};
+
+}
+}
+}
+
+#endif /* MAD_COMMON_REQUESTHANDLERS_IDENTIFYREQUESTHANDLER_H_ */
diff --git a/src/Core/RequestHandlers/Makefile.am b/src/Core/RequestHandlers/Makefile.am
index 3be5350..c13d0d7 100644
--- a/src/Core/RequestHandlers/Makefile.am
+++ b/src/Core/RequestHandlers/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LTLIBRARIES            = librequesthandlers.la
-librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp
+librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp IdentifyRequestHandler.cpp
 
-noinst_HEADERS                = CoreStatusRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h
+noinst_HEADERS                = CoreStatusRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h IdentifyRequestHandler.h
diff --git a/src/Core/RequestHandlers/Makefile.in b/src/Core/RequestHandlers/Makefile.in
index 6661e32..191fd28 100644
--- a/src/Core/RequestHandlers/Makefile.in
+++ b/src/Core/RequestHandlers/Makefile.in
@@ -46,7 +46,8 @@ CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 librequesthandlers_la_LIBADD =
 am_librequesthandlers_la_OBJECTS = CoreStatusRequestHandler.lo \
-	DaemonStatusRequestHandler.lo GSSAPIAuthRequestHandler.lo
+	DaemonStatusRequestHandler.lo GSSAPIAuthRequestHandler.lo \
+	IdentifyRequestHandler.lo
 librequesthandlers_la_OBJECTS = $(am_librequesthandlers_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -185,8 +186,8 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = librequesthandlers.la
-librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp
-noinst_HEADERS = CoreStatusRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h
+librequesthandlers_la_SOURCES = CoreStatusRequestHandler.cpp DaemonStatusRequestHandler.cpp GSSAPIAuthRequestHandler.cpp IdentifyRequestHandler.cpp
+noinst_HEADERS = CoreStatusRequestHandler.h DaemonStatusRequestHandler.h GSSAPIAuthRequestHandler.h IdentifyRequestHandler.h
 all: all-am
 
 .SUFFIXES:
@@ -241,6 +242,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoreStatusRequestHandler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DaemonStatusRequestHandler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GSSAPIAuthRequestHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IdentifyRequestHandler.Plo@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<