From e0a00eda958375aed3268afcba6cebb9c2a9908b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 13 Sep 2008 00:56:59 +0200 Subject: Daemon hinzugef?gt; CoreStatusPacket hei?t jetzt HostStatusPacket --- src/Net/Packet.h | 2 +- src/Net/Packets/CoreStatusPacket.cpp | 54 --------------------- src/Net/Packets/CoreStatusPacket.h | 92 ------------------------------------ src/Net/Packets/HostStatusPacket.cpp | 54 +++++++++++++++++++++ src/Net/Packets/HostStatusPacket.h | 92 ++++++++++++++++++++++++++++++++++++ src/Net/Packets/Makefile.am | 4 +- src/Net/Packets/Makefile.in | 8 ++-- 7 files changed, 153 insertions(+), 153 deletions(-) delete mode 100644 src/Net/Packets/CoreStatusPacket.cpp delete mode 100644 src/Net/Packets/CoreStatusPacket.h create mode 100644 src/Net/Packets/HostStatusPacket.cpp create mode 100644 src/Net/Packets/HostStatusPacket.h (limited to 'src/Net') diff --git a/src/Net/Packet.h b/src/Net/Packet.h index 7823e01..e94f2ff 100644 --- a/src/Net/Packet.h +++ b/src/Net/Packet.h @@ -33,7 +33,7 @@ class Packet { enum Type { OK = 0x0000, ERROR = 0x0001, DISCONNECT = 0x0002, GSSAPI_AUTH = 0x0010, IDENTIFY = 0x0011, - CORE_STATUS = 0x0020 + CORE_STATUS = 0x0020, DAEMON_STATUS = 0x0021 }; struct Data { diff --git a/src/Net/Packets/CoreStatusPacket.cpp b/src/Net/Packets/CoreStatusPacket.cpp deleted file mode 100644 index ad2a7fb..0000000 --- a/src/Net/Packets/CoreStatusPacket.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * CoreStatusPacket.cpp - * - * 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 . - */ - -#include "CoreStatusPacket.h" - - -namespace Mad { -namespace Net { -namespace Packets { - -CoreStatusPacket::CoreStatusPacket(Type type, uint16_t requestId, uint32_t uptime, uint32_t idleTime, - uint32_t totalMem, uint32_t freeMem, uint32_t totalSwap, uint32_t freeSwap) -: Packet(type, requestId) -{ - setLength(sizeof(CoreStatusData)); - coreStatusData = (CoreStatusData*)&rawData->data; - - coreStatusData->uptime = htonl(uptime); - coreStatusData->idleTime = htonl(idleTime); - - coreStatusData->totalMem = htonl(totalMem); - coreStatusData->freeMem = htonl(freeMem); - coreStatusData->totalSwap = htonl(totalSwap); - coreStatusData->freeSwap = htonl(freeSwap); -} - -CoreStatusPacket& CoreStatusPacket::operator=(const Packet &p) { - Packet::operator=(p); - - setLength(sizeof(CoreStatusData)); - coreStatusData = (CoreStatusData*)&rawData->data; - - return *this; -} - -} -} -} diff --git a/src/Net/Packets/CoreStatusPacket.h b/src/Net/Packets/CoreStatusPacket.h deleted file mode 100644 index 6ec8338..0000000 --- a/src/Net/Packets/CoreStatusPacket.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * CoreStatusPacket.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_NET_PACKETS_CORESTATUSPACKET_H_ -#define MAD_NET_PACKETS_CORESTATUSPACKET_H_ - -#include "../Packet.h" - -namespace Mad { -namespace Net { -namespace Packets { - -class CoreStatusPacket : public Packet { - protected: - struct CoreStatusData { - uint32_t uptime; - uint32_t idleTime; - - uint32_t totalMem; - uint32_t freeMem; - uint32_t totalSwap; - uint32_t freeSwap; - }; - - CoreStatusData *coreStatusData; - - public: - CoreStatusPacket(Type type, uint16_t requestId, uint32_t uptime = 0, uint32_t idleTime = 0, - uint32_t totalMem = 0, uint32_t freeMem = 0, uint32_t totalSwap = 0, uint32_t freeSwap = 0); - - CoreStatusPacket(const Packet &p) : Packet(p) { - setLength(sizeof(CoreStatusData)); - coreStatusData = (CoreStatusData*)&rawData->data; - } - - CoreStatusPacket(const CoreStatusPacket &p) : Packet(p) { - setLength(sizeof(CoreStatusData)); - coreStatusData = (CoreStatusData*)&rawData->data; - } - - CoreStatusPacket& operator=(const Packet &p); - - CoreStatusPacket& operator=(const CoreStatusPacket &p) { - return (*this = (Packet)p); - } - - uint32_t getUptime() const { - return ntohl(coreStatusData->uptime); - } - - uint32_t getIdleTime() const { - return ntohl(coreStatusData->idleTime); - } - - uint32_t getTotalMem() const { - return ntohl(coreStatusData->totalMem); - } - - uint32_t getFreeMem() const { - return ntohl(coreStatusData->freeMem); - } - - uint32_t getTotalSwap() const { - return ntohl(coreStatusData->totalSwap); - } - - uint32_t getFreeSwap() const { - return ntohl(coreStatusData->freeSwap); - } -}; - -} -} -} - -#endif /* MAD_NET_PACKETS_CORESTATUSPACKET_H_ */ diff --git a/src/Net/Packets/HostStatusPacket.cpp b/src/Net/Packets/HostStatusPacket.cpp new file mode 100644 index 0000000..3e50cd6 --- /dev/null +++ b/src/Net/Packets/HostStatusPacket.cpp @@ -0,0 +1,54 @@ +/* + * HostStatusPacket.cpp + * + * 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 . + */ + +#include "HostStatusPacket.h" + + +namespace Mad { +namespace Net { +namespace Packets { + +HostStatusPacket::HostStatusPacket(Type type, uint16_t requestId, uint32_t uptime, uint32_t idleTime, + uint32_t totalMem, uint32_t freeMem, uint32_t totalSwap, uint32_t freeSwap) +: Packet(type, requestId) +{ + setLength(sizeof(CoreStatusData)); + coreStatusData = (CoreStatusData*)&rawData->data; + + coreStatusData->uptime = htonl(uptime); + coreStatusData->idleTime = htonl(idleTime); + + coreStatusData->totalMem = htonl(totalMem); + coreStatusData->freeMem = htonl(freeMem); + coreStatusData->totalSwap = htonl(totalSwap); + coreStatusData->freeSwap = htonl(freeSwap); +} + +HostStatusPacket& HostStatusPacket::operator=(const Packet &p) { + Packet::operator=(p); + + setLength(sizeof(CoreStatusData)); + coreStatusData = (CoreStatusData*)&rawData->data; + + return *this; +} + +} +} +} diff --git a/src/Net/Packets/HostStatusPacket.h b/src/Net/Packets/HostStatusPacket.h new file mode 100644 index 0000000..f023917 --- /dev/null +++ b/src/Net/Packets/HostStatusPacket.h @@ -0,0 +1,92 @@ +/* + * HostStatusPacket.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_NET_PACKETS_HOSTSTATUSPACKET_H_ +#define MAD_NET_PACKETS_HOSTSTATUSPACKET_H_ + +#include "../Packet.h" + +namespace Mad { +namespace Net { +namespace Packets { + +class HostStatusPacket : public Packet { + protected: + struct CoreStatusData { + uint32_t uptime; + uint32_t idleTime; + + uint32_t totalMem; + uint32_t freeMem; + uint32_t totalSwap; + uint32_t freeSwap; + }; + + CoreStatusData *coreStatusData; + + public: + HostStatusPacket(Type type, uint16_t requestId, uint32_t uptime = 0, uint32_t idleTime = 0, + uint32_t totalMem = 0, uint32_t freeMem = 0, uint32_t totalSwap = 0, uint32_t freeSwap = 0); + + HostStatusPacket(const Packet &p) : Packet(p) { + setLength(sizeof(CoreStatusData)); + coreStatusData = (CoreStatusData*)&rawData->data; + } + + HostStatusPacket(const HostStatusPacket &p) : Packet(p) { + setLength(sizeof(CoreStatusData)); + coreStatusData = (CoreStatusData*)&rawData->data; + } + + HostStatusPacket& operator=(const Packet &p); + + HostStatusPacket& operator=(const HostStatusPacket &p) { + return (*this = (Packet)p); + } + + uint32_t getUptime() const { + return ntohl(coreStatusData->uptime); + } + + uint32_t getIdleTime() const { + return ntohl(coreStatusData->idleTime); + } + + uint32_t getTotalMem() const { + return ntohl(coreStatusData->totalMem); + } + + uint32_t getFreeMem() const { + return ntohl(coreStatusData->freeMem); + } + + uint32_t getTotalSwap() const { + return ntohl(coreStatusData->totalSwap); + } + + uint32_t getFreeSwap() const { + return ntohl(coreStatusData->freeSwap); + } +}; + +} +} +} + +#endif /* MAD_NET_PACKETS_HOSTSTATUSPACKET_H_ */ diff --git a/src/Net/Packets/Makefile.am b/src/Net/Packets/Makefile.am index 344a764..e65e543 100644 --- a/src/Net/Packets/Makefile.am +++ b/src/Net/Packets/Makefile.am @@ -1,4 +1,4 @@ noinst_LTLIBRARIES = libpackets.la -libpackets_la_SOURCES = CoreStatusPacket.cpp +libpackets_la_SOURCES = HostStatusPacket.cpp -noinst_HEADERS = CoreStatusPacket.h +noinst_HEADERS = HostStatusPacket.h diff --git a/src/Net/Packets/Makefile.in b/src/Net/Packets/Makefile.in index 3af3051..702ec45 100644 --- a/src/Net/Packets/Makefile.in +++ b/src/Net/Packets/Makefile.in @@ -45,7 +45,7 @@ CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libpackets_la_LIBADD = -am_libpackets_la_OBJECTS = CoreStatusPacket.lo +am_libpackets_la_OBJECTS = HostStatusPacket.lo libpackets_la_OBJECTS = $(am_libpackets_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -182,8 +182,8 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libpackets.la -libpackets_la_SOURCES = CoreStatusPacket.cpp -noinst_HEADERS = CoreStatusPacket.h +libpackets_la_SOURCES = HostStatusPacket.cpp +noinst_HEADERS = HostStatusPacket.h all: all-am .SUFFIXES: @@ -235,7 +235,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CoreStatusPacket.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HostStatusPacket.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -- cgit v1.2.3