LogRequest ist jetzt ein XmlRequest

5 files changed, 6 insertions, 144 deletions

diff --git a/src/Net/Packet.h b/src/Net/Packet.h
index 37df13a..47d44c7 100644
--- a/src/Net/Packet.h
+++ b/src/Net/Packet.h
@@ -31,7 +31,7 @@ namespace Net {
 class Packet {
   public:
     enum Type {
-      OK = 0x0000, ERROR = 0x0001, DISCONNECT = 0x0002, LOG = 0x0003,
+      OK = 0x0000, ERROR = 0x0001, DISCONNECT = 0x0002,
       GSSAPI_AUTH = 0x0010, IDENTIFY = 0x0011,
       LIST_DAEMONS = 0x0020,
       FS_INFO = 0x0032, DAEMON_FS_INFO = 0x0033,
diff --git a/src/Net/Packets/LogPacket.cpp b/src/Net/Packets/LogPacket.cpp
deleted file mode 100644
index 1d6ee88..0000000
--- a/src/Net/Packets/LogPacket.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * LogPacket.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 "LogPacket.h"
-
-namespace Mad {
-namespace Net {
-namespace Packets {
-
-LogPacket::LogPacket(Type type, uint16_t requestId, Common::Logger::MessageCategory category, Common::Logger::MessageLevel level, time_t messageTimestamp, const std::string &message)
-: Packet(type, requestId)
-{
-  setLength(sizeof(LogData) + message.length());
-  logData = (LogData*)&rawData->data;
-
-  logData->category = htons(category);
-  logData->level = htons(level);
-  logData->messageTimestamp = htonl(messageTimestamp);
-
-  std::memcpy(logData->message, message.c_str(), message.length());
-}
-
-LogPacket& LogPacket::operator=(const Packet &p) {
-  Packet::operator=(p);
-
-  if(getLength() < sizeof(LogData))
-    setLength(sizeof(LogData));
-
-  logData = (LogData*)&rawData->data;
-
-  return *this;
-}
-
-}
-}
-}
diff --git a/src/Net/Packets/LogPacket.h b/src/Net/Packets/LogPacket.h
deleted file mode 100644
index 040f21a..0000000
--- a/src/Net/Packets/LogPacket.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * LogPacket.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_NET_PACKETS_LOGPACKET_H_
-#define MAD_NET_PACKETS_LOGPACKET_H_
-
-#include "../Packet.h"
-#include <Common/Logger.h>
-
-#include <string>
-#include <ctime>
-
-namespace Mad {
-namespace Net {
-namespace Packets {
-
-class LogPacket : public Packet {
-  protected:
-    struct LogData {
-      uint16_t category;
-      uint16_t level;
-      uint32_t messageTimestamp;
-      uint8_t message[0];
-    };
-
-    LogData *logData;
-
-  public:
-    LogPacket(Type type, uint16_t requestId, Common::Logger::MessageCategory category, Common::Logger::MessageLevel level, time_t messageTimestamp, const std::string &message);
-
-    LogPacket(const Packet &p) : Packet(p) {
-      if(getLength() < sizeof(LogData))
-        setLength(sizeof(LogData));
-
-      logData = (LogData*)&rawData->data;
-    }
-
-    LogPacket(const LogPacket &p) : Packet(p) {
-      logData = (LogData*)&rawData->data;
-    }
-
-    LogPacket& operator=(const Packet &p);
-
-    LogPacket& operator=(const LogPacket &p) {
-      return (*this = (Packet)p);
-    }
-
-    Common::Logger::MessageCategory getCategory() const {
-      return (Common::Logger::MessageCategory)ntohs(logData->category);
-    }
-
-    Common::Logger::MessageLevel getLevel() const {
-      return (Common::Logger::MessageLevel)ntohs(logData->level);
-    }
-
-    time_t getTimestamp() const {
-      return (time_t)ntohl(logData->messageTimestamp);
-    }
-
-    std::string getMessage() const {
-      return std::string((char*)logData->message, getLength()-sizeof(LogData));
-    }
-};
-
-}
-}
-}
-
-#endif /* MAD_NET_PACKETS_LOGPACKET_H_ */
diff --git a/src/Net/Packets/Makefile.am b/src/Net/Packets/Makefile.am
index 6f950c9..9ce8f9d 100644
--- a/src/Net/Packets/Makefile.am
+++ b/src/Net/Packets/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LTLIBRARIES    = libpackets.la
-libpackets_la_SOURCES = ErrorPacket.cpp FSInfoPacket.cpp HostListPacket.cpp HostStatePacket.cpp LogPacket.cpp
+libpackets_la_SOURCES = ErrorPacket.cpp FSInfoPacket.cpp HostListPacket.cpp HostStatePacket.cpp
 
-noinst_HEADERS        = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h LogPacket.h
+noinst_HEADERS        = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h
diff --git a/src/Net/Packets/Makefile.in b/src/Net/Packets/Makefile.in
index 2fb4fca..239e753 100644
--- a/src/Net/Packets/Makefile.in
+++ b/src/Net/Packets/Makefile.in
@@ -51,7 +51,7 @@ CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libpackets_la_LIBADD =
 am_libpackets_la_OBJECTS = ErrorPacket.lo FSInfoPacket.lo \
-	HostListPacket.lo HostStatePacket.lo LogPacket.lo
+	HostListPacket.lo HostStatePacket.lo
 libpackets_la_OBJECTS = $(am_libpackets_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -217,8 +217,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libpackets.la
-libpackets_la_SOURCES = ErrorPacket.cpp FSInfoPacket.cpp HostListPacket.cpp HostStatePacket.cpp LogPacket.cpp
-noinst_HEADERS = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h LogPacket.h
+libpackets_la_SOURCES = ErrorPacket.cpp FSInfoPacket.cpp HostListPacket.cpp HostStatePacket.cpp
+noinst_HEADERS = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h
 all: all-am
 
 .SUFFIXES:
@@ -274,7 +274,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FSInfoPacket.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HostListPacket.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HostStatePacket.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogPacket.Plo@am__quote@
 
 .cpp.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<