diff options
Diffstat (limited to 'src/Net')
-rw-r--r-- | src/Net/Packet.h | 2 | ||||
-rw-r--r-- | src/Net/Packets/HostStatusPacket.cpp (renamed from src/Net/Packets/CoreStatusPacket.cpp) | 8 | ||||
-rw-r--r-- | src/Net/Packets/HostStatusPacket.h (renamed from src/Net/Packets/CoreStatusPacket.h) | 20 | ||||
-rw-r--r-- | src/Net/Packets/Makefile.am | 4 | ||||
-rw-r--r-- | src/Net/Packets/Makefile.in | 8 |
5 files changed, 21 insertions, 21 deletions
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/HostStatusPacket.cpp index ad2a7fb..3e50cd6 100644 --- a/src/Net/Packets/CoreStatusPacket.cpp +++ b/src/Net/Packets/HostStatusPacket.cpp @@ -1,5 +1,5 @@ /* - * CoreStatusPacket.cpp + * HostStatusPacket.cpp * * Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de> * @@ -17,14 +17,14 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "CoreStatusPacket.h" +#include "HostStatusPacket.h" namespace Mad { namespace Net { namespace Packets { -CoreStatusPacket::CoreStatusPacket(Type type, uint16_t requestId, uint32_t uptime, uint32_t idleTime, +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) { @@ -40,7 +40,7 @@ CoreStatusPacket::CoreStatusPacket(Type type, uint16_t requestId, uint32_t uptim coreStatusData->freeSwap = htonl(freeSwap); } -CoreStatusPacket& CoreStatusPacket::operator=(const Packet &p) { +HostStatusPacket& HostStatusPacket::operator=(const Packet &p) { Packet::operator=(p); setLength(sizeof(CoreStatusData)); diff --git a/src/Net/Packets/CoreStatusPacket.h b/src/Net/Packets/HostStatusPacket.h index 6ec8338..f023917 100644 --- a/src/Net/Packets/CoreStatusPacket.h +++ b/src/Net/Packets/HostStatusPacket.h @@ -1,5 +1,5 @@ /* - * CoreStatusPacket.h + * HostStatusPacket.h * * Copyright (C) 2008 Matthias Schiffer <matthias@gamezock.de> * @@ -17,8 +17,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef MAD_NET_PACKETS_CORESTATUSPACKET_H_ -#define MAD_NET_PACKETS_CORESTATUSPACKET_H_ +#ifndef MAD_NET_PACKETS_HOSTSTATUSPACKET_H_ +#define MAD_NET_PACKETS_HOSTSTATUSPACKET_H_ #include "../Packet.h" @@ -26,7 +26,7 @@ namespace Mad { namespace Net { namespace Packets { -class CoreStatusPacket : public Packet { +class HostStatusPacket : public Packet { protected: struct CoreStatusData { uint32_t uptime; @@ -41,22 +41,22 @@ class CoreStatusPacket : public Packet { CoreStatusData *coreStatusData; public: - CoreStatusPacket(Type type, uint16_t requestId, uint32_t uptime = 0, uint32_t idleTime = 0, + 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); - CoreStatusPacket(const Packet &p) : Packet(p) { + HostStatusPacket(const Packet &p) : Packet(p) { setLength(sizeof(CoreStatusData)); coreStatusData = (CoreStatusData*)&rawData->data; } - CoreStatusPacket(const CoreStatusPacket &p) : Packet(p) { + HostStatusPacket(const HostStatusPacket &p) : Packet(p) { setLength(sizeof(CoreStatusData)); coreStatusData = (CoreStatusData*)&rawData->data; } - CoreStatusPacket& operator=(const Packet &p); + HostStatusPacket& operator=(const Packet &p); - CoreStatusPacket& operator=(const CoreStatusPacket &p) { + HostStatusPacket& operator=(const HostStatusPacket &p) { return (*this = (Packet)p); } @@ -89,4 +89,4 @@ class CoreStatusPacket : public Packet { } } -#endif /* MAD_NET_PACKETS_CORESTATUSPACKET_H_ */ +#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 $@ $< |