From 04363ca342914ba75e693edb876cbe535839fa79 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 13 Feb 2009 00:00:05 +0100 Subject: Einfache Abfrage der Benutzerdatenbank implementiert --- src/Net/FdManager.cpp | 2 +- src/Net/Makefile.in | 9 ++-- src/Net/Packet.h | 3 +- src/Net/Packets/Makefile.am | 4 +- src/Net/Packets/Makefile.in | 16 +++---- src/Net/Packets/UserListPacket.cpp | 85 ++++++++++++++++++++++++++++++++++++++ src/Net/Packets/UserListPacket.h | 79 +++++++++++++++++++++++++++++++++++ 7 files changed, 183 insertions(+), 15 deletions(-) create mode 100644 src/Net/Packets/UserListPacket.cpp create mode 100644 src/Net/Packets/UserListPacket.h (limited to 'src/Net') diff --git a/src/Net/FdManager.cpp b/src/Net/FdManager.cpp index 5ff6647..ffa4d8b 100644 --- a/src/Net/FdManager.cpp +++ b/src/Net/FdManager.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include namespace Mad { diff --git a/src/Net/Makefile.in b/src/Net/Makefile.in index 8247f32..1fad631 100644 --- a/src/Net/Makefile.in +++ b/src/Net/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -221,6 +221,7 @@ srcdir = @srcdir@ sys_symbol_underscore = @sys_symbol_underscore@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = Packets @@ -236,8 +237,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -389,7 +390,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/src/Net/Packet.h b/src/Net/Packet.h index 2ec1634..daab921 100644 --- a/src/Net/Packet.h +++ b/src/Net/Packet.h @@ -37,7 +37,8 @@ class Packet { STATUS = 0x0030, DAEMON_STATUS = 0x0031, FS_INFO = 0x0032, DAEMON_FS_INFO = 0x0033, COMMAND_SHUTDOWN = 0x0040, COMMAND_REBOOT = 0x0041, DAEMON_COMMAND_SHUTDOWN = 0x0050, DAEMON_COMMAND_REBOOT = 0x0051, - DAEMON_STATE_UPDATE = 0x0060 + DAEMON_STATE_UPDATE = 0x0060, + USERS_LIST = 0x0070 }; struct Data { diff --git a/src/Net/Packets/Makefile.am b/src/Net/Packets/Makefile.am index 311d9da..b8ebfc0 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 HostStatusPacket.cpp LogPacket.cpp +libpackets_la_SOURCES = ErrorPacket.cpp FSInfoPacket.cpp HostListPacket.cpp HostStatePacket.cpp HostStatusPacket.cpp LogPacket.cpp UserListPacket.cpp -noinst_HEADERS = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h HostStatusPacket.h LogPacket.h +noinst_HEADERS = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h HostStatusPacket.h LogPacket.h UserListPacket.h diff --git a/src/Net/Packets/Makefile.in b/src/Net/Packets/Makefile.in index b5c92c4..be59444 100644 --- a/src/Net/Packets/Makefile.in +++ b/src/Net/Packets/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -52,7 +52,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) libpackets_la_LIBADD = am_libpackets_la_OBJECTS = ErrorPacket.lo FSInfoPacket.lo \ HostListPacket.lo HostStatePacket.lo HostStatusPacket.lo \ - LogPacket.lo + LogPacket.lo UserListPacket.lo libpackets_la_OBJECTS = $(am_libpackets_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -212,11 +212,12 @@ srcdir = @srcdir@ sys_symbol_underscore = @sys_symbol_underscore@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +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 HostStatusPacket.cpp LogPacket.cpp -noinst_HEADERS = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h HostStatusPacket.h LogPacket.h +libpackets_la_SOURCES = ErrorPacket.cpp FSInfoPacket.cpp HostListPacket.cpp HostStatePacket.cpp HostStatusPacket.cpp LogPacket.cpp UserListPacket.cpp +noinst_HEADERS = ErrorPacket.h FSInfoPacket.h HostListPacket.h HostStatePacket.h HostStatusPacket.h LogPacket.h UserListPacket.h all: all-am .SUFFIXES: @@ -225,8 +226,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -274,6 +275,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HostStatePacket.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HostStatusPacket.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogPacket.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UserListPacket.Plo@am__quote@ .cpp.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -307,7 +309,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/src/Net/Packets/UserListPacket.cpp b/src/Net/Packets/UserListPacket.cpp new file mode 100644 index 0000000..d364522 --- /dev/null +++ b/src/Net/Packets/UserListPacket.cpp @@ -0,0 +1,85 @@ +/* + * UserListPacket.cpp + * + * Copyright (C) 2009 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 "UserListPacket.h" +#include +#include + +namespace Mad { +namespace Net { +namespace Packets { + +void UserListPacket::assemblePacket() { + std::string str; + + for(std::vector::iterator user = userList.begin(); user != userList.end(); ++user) + str += user->getUsername() + "\n" + user->getFullName() + "\n"; + + setLength(sizeof(uint16_t) + sizeof(UserData)*userList.size() + str.length()); + + nUsers = (uint16_t*)rawData->data; + userData = (UserData*)(rawData->data + sizeof(uint16_t)); + charData = (char*)(rawData->data + sizeof(uint16_t) + sizeof(UserData)*userList.size()); + + std::memcpy(charData, str.c_str(), str.length()); + + *nUsers = htons(userList.size()); + + for(size_t i = 0; i < userList.size(); ++i) { + userData[i].uid = htons((uint32_t)userList[i].getUid()); + userData[i].gid = htons((uint32_t)userList[i].getGid()); + } +} + +void UserListPacket::parsePacket() { + userList.clear(); + + if(getLength() < sizeof(uint16_t)) + return; + + nUsers = (uint16_t*)rawData->data; + userList.resize(ntohs(*nUsers)); + + if(getLength() < sizeof(uint16_t) + sizeof(UserData)*userList.size()) + setLength(sizeof(uint16_t) + sizeof(UserData)*userList.size()); + + nUsers = (uint16_t*)rawData->data; + userData = (UserData*)(rawData->data + sizeof(uint16_t)); + charData = (char*)(rawData->data + sizeof(uint16_t) + sizeof(UserData)*userList.size()); + + std::istringstream stream(std::string(charData, getLength() - (sizeof(uint16_t)+sizeof(UserData)*userList.size()))); + + for(size_t i = 0; i < userList.size(); ++i) { + userList[i].setUid(ntohs(userData[i].uid)); + userList[i].setGid(ntohs(userData[i].gid)); + + if(!stream.eof()) { + std::string str; + + std::getline(stream, str); + userList[i].setUsername(str); + std::getline(stream, str); + userList[i].setFullName(str); + } + } +} + +} +} +} diff --git a/src/Net/Packets/UserListPacket.h b/src/Net/Packets/UserListPacket.h new file mode 100644 index 0000000..d099fab --- /dev/null +++ b/src/Net/Packets/UserListPacket.h @@ -0,0 +1,79 @@ +/* + * UserListPacket.h + * + * Copyright (C) 2009 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_USERLISTPACKET_H_ +#define MAD_NET_PACKETS_USERLISTPACKET_H_ + +#include "../Packet.h" +#include +#include + +namespace Mad { +namespace Net { +namespace Packets { + +class UserListPacket : public Packet { + protected: + struct UserData { + uint32_t uid; + uint32_t gid; + }; + + uint16_t *nUsers; + UserData *userData; + char *charData; + + std::vector userList; + + void assemblePacket(); + void parsePacket(); + + public: + UserListPacket(Type type, uint16_t requestId, const std::vector &users) : Packet(type, requestId), userList(users) { + assemblePacket(); + } + + UserListPacket(const Packet &p) : Packet(p) { + parsePacket(); + } + + UserListPacket& operator=(const Packet &p) { + Packet::operator=(p); + parsePacket(); + + return *this; + } + + UserListPacket& operator=(const UserListPacket &p) { + Packet::operator=(p); + parsePacket(); + + return *this; + } + + const std::vector& getUserInfo() const { + return userList; + } +}; + +} +} +} + +#endif /* MAD_NET_PACKETS_USERLISTPACKET_H_ */ -- cgit v1.2.3