2006-01-19 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientAccount.cpp, aiclient/ClientAccount.h,
aiclient/ClientConnection.cpp, aiclient/ClientConnection.h,
aiclient/client.cpp, aiclient/client.h, client/BaseClient.cpp,
client/BaseClient.h, client/CharacterClient.cpp,
client/CharacterClient.h, client/ClientConnection.cpp,
client/ClientConnection.h, client/CreatorClient.cpp,
client/CreatorClient.h, client/ObserverClient.cpp,
client/ObserverClient.h, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp,
client/define_world.cpp, client/define_world.h, common/Add.h,
common/Affect.h, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/Attack.h, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.cpp, common/BaseWorld.h,
common/Burn.h, common/Chop.h, common/Connect.h, common/CustomOp.cpp,
common/CustomOp.h, common/CustomOp_impl.h, common/Cut.h,
common/Database.cpp, common/Database.h, common/Delve.h, common/Dig.h,
common/Eat.h, common/FormattedXMLWriter.cpp,
common/FormattedXMLWriter.h, common/Generic.h, common/Load.h,
common/Monitor.h, common/Mow.h, common/Nourish.h,
common/OOGThing.cpp, common/OOGThing.h, common/Property.cpp,
common/Property.h, common/Property_impl.h, common/Save.h,
common/Setup.h, common/Tick.h, common/Unseen.h, common/Update.h,
common/Use.h, common/Wield.h, common/accountbase.cpp,
common/accountbase.h, common/const.cpp, common/const.h,
common/custom.cpp, common/debug.h, common/globals.cpp,
common/globals.h, common/id.cpp, common/id.h, common/inheritance.cpp,
common/inheritance.h, common/inheritance_impl.h, common/log.cpp,
common/log.h, common/newid.cpp, common/nls.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/random.h,
common/refno.h, common/serialno.cpp, common/serialno.h,
common/system.cpp, common/system.h, common/terrain_utils.cpp,
common/terrain_utils.h, common/type_utils.h, common/types.h,
common/utility.cpp, common/utility.h, modules/DateTime.cpp,
modules/DateTime.h, modules/Location.cpp, modules/Location.h,
modules/WorldTime.cpp, modules/WorldTime.h, physics/BBox.cpp,
physics/BBox.h, physics/Collision.cpp, physics/Collision.h,
physics/Quaternion.cpp, physics/Quaternion.h, physics/Vector3D.cpp,
physics/Vector3D.h, physics/VectorPol.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/ArithmeticScript.cpp, rulesets/ArithmeticScript.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/CalendarProperty.cpp, rulesets/CalendarProperty.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Combat.cpp,
rulesets/Combat.h, rulesets/Container.cpp, rulesets/Container.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/EntityProperties.cpp,
rulesets/Entity_getLocation.h, rulesets/Fell.cpp, rulesets/Fell.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/Line.cpp,
rulesets/Line.h, rulesets/LineProperty.cpp, rulesets/LineProperty.h,
rulesets/MemEntity.cpp, rulesets/MemEntity.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/MemMap_methods.h,
rulesets/MindFactory.cpp, rulesets/MindFactory.h, rulesets/Missile.h,
rulesets/Motion.cpp, rulesets/Motion.h, rulesets/Movement.cpp,
rulesets/Movement.h, rulesets/Pedestrian.cpp, rulesets/Pedestrian.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_BBox.cpp,
rulesets/Py_BBox.h, rulesets/Py_EntityWrapper.h,
rulesets/Py_Location.cpp, rulesets/Py_Location.h,
rulesets/Py_Map.cpp, rulesets/Py_Map.h, rulesets/Py_Mind.cpp,
rulesets/Py_Mind.h, rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Operation.h,
rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp,
rulesets/Py_Optime.h, rulesets/Py_Point3D.cpp, rulesets/Py_Point3D.h,
rulesets/Py_Property.cpp, rulesets/Py_Property.h,
rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_RootEntity.cpp, rulesets/Py_RootEntity.h,
rulesets/Py_Statistics.cpp, rulesets/Py_Statistics.h,
rulesets/Py_Task.cpp, rulesets/Py_Task.h, rulesets/Py_Thing.cpp,
rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp,
rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonArithmeticScript.cpp,
rulesets/PythonArithmeticScript.h, rulesets/PythonMindScript.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.cpp,
rulesets/PythonScript.h, rulesets/PythonThingScript.cpp,
rulesets/PythonThingScript.h, rulesets/PythonWrapper.cpp,
rulesets/PythonWrapper.h, rulesets/Python_API.cpp,
rulesets/Python_API.h, rulesets/Python_Script_Utils.h,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Statistics.cpp, rulesets/Statistics.h,
rulesets/StatisticsProperty.cpp, rulesets/StatisticsProperty.h,
rulesets/Structure.cpp, rulesets/Structure.h, rulesets/Task.cpp,
rulesets/Task.h, rulesets/TaskScript.cpp, rulesets/TaskScript.h,
rulesets/TerrainProperty.cpp, rulesets/TerrainProperty.h,
rulesets/Thing.cpp, rulesets/Thing.h, rulesets/ThingFactory.cpp,
rulesets/ThingFactory.h, rulesets/World.cpp, rulesets/World.h,
rulesets/attributes.h, server/Account.cpp, server/Account.h,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.cpp,
server/ArithmeticFactory.h, server/CommClient.cpp,
server/CommClient.h, server/CommIdleSocket.cpp,
server/CommIdleSocket.h, server/CommListener.cpp,
server/CommListener.h, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommMDNSPublisher.cpp,
server/CommMDNSPublisher.h, server/CommMaster.cpp,
server/CommMaster.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommPeer.cpp,
server/CommPeer.h, server/CommPeerListener.cpp,
server/CommPeerListener.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommServer.cpp,
server/CommServer.h, server/CommSlaveClient.cpp,
server/CommSlaveClient.h, server/CommSlaveListener.cpp,
server/CommSlaveListener.h, server/CommSocket.cpp,
server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/Connection.cpp,
server/Connection.h, server/Connection_methods.h,
server/EntityFactory.cpp, server/EntityFactory.h,
server/ExternalMind.cpp, server/ExternalMind.h,
server/Idle.cpp, server/Idle.h, server/Lobby.cpp, server/Lobby.h,
server/Master.cpp, server/Master.h, server/Peer.cpp, server/Peer.h,
server/Persistance.cpp, server/Persistance.h,
server/PersistantThingFactory.cpp, server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h, server/Persistor.cpp,
server/Persistor.h, server/Persistor_impl.h,
server/Player.cpp, server/Player.h, server/Restoration.cpp,
server/Restoration.h, server/Restorer.cpp, server/Restorer.h,
server/Restorer_impl.h, server/ScriptFactory.cpp,
server/ScriptFactory.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/SlaveClientConnection.cpp, server/SlaveClientConnection.h,
server/TaskFactory.cpp, server/TaskFactory.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h,
server/server.cpp, server/server.h, server/slave.cpp,
tests/Areatest.cpp, tests/BaseEntitytest.cpp,
tests/Charactertest.cpp, tests/Containertest.cpp,
tests/Creatortest.cpp, tests/EntityExerciser.h,
tests/EntityFactorytest.cpp, tests/Entitytest.cpp,
tests/Foodtest.cpp, tests/IGEntityExerciser.h,
tests/Linetest.cpp, tests/Locationtest.cpp, tests/OOGThingtest.cpp,
tests/Planttest.cpp, tests/Propertytest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Tasktest.cpp, tests/TestWorld.h,
tests/Thingtest.cpp, tests/WorldTimetest.cpp, tests/Worldtest.cpp,
tests/allOperations.h, tests/collisiontest.cpp, tests/consttest.cpp,
tests/distancetest.cpp, tests/emergencetest.cpp,
tests/inheritancetest.cpp, tests/logtest.cpp, tests/randomtest.cpp,
tests/systemtest.cpp, tests/transformtest.cpp,
tests/type_utilstest.cpp, tests/utilitytest.cpp,
tools/AdminClient.cpp, tools/AdminClient.h, tools/cyaddrules.cpp,
tools/cycmd.cpp, tools/cyconfig.cpp, tools/cyconvertrules.cpp,
tools/cyctrl.cpp, tools/cydbload.cpp, tools/cydumprules.cpp,
tools/cyisoload.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp,
tools/cywatchdog.cpp: Replace the copyright and license statements
with new versions that include disclaimer of warranty, and
permit distribution under later versions of the GPL.
2006-01-19 02:17:06 +00:00
|
|
|
// Cyphesis Online RPG Server and AI Engine
|
2005-05-13 23:25:32 +00:00
|
|
|
// Copyright (C) 2001 Alistair Riddoch
|
2006-01-19 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientAccount.cpp, aiclient/ClientAccount.h,
aiclient/ClientConnection.cpp, aiclient/ClientConnection.h,
aiclient/client.cpp, aiclient/client.h, client/BaseClient.cpp,
client/BaseClient.h, client/CharacterClient.cpp,
client/CharacterClient.h, client/ClientConnection.cpp,
client/ClientConnection.h, client/CreatorClient.cpp,
client/CreatorClient.h, client/ObserverClient.cpp,
client/ObserverClient.h, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp,
client/define_world.cpp, client/define_world.h, common/Add.h,
common/Affect.h, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/Attack.h, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.cpp, common/BaseWorld.h,
common/Burn.h, common/Chop.h, common/Connect.h, common/CustomOp.cpp,
common/CustomOp.h, common/CustomOp_impl.h, common/Cut.h,
common/Database.cpp, common/Database.h, common/Delve.h, common/Dig.h,
common/Eat.h, common/FormattedXMLWriter.cpp,
common/FormattedXMLWriter.h, common/Generic.h, common/Load.h,
common/Monitor.h, common/Mow.h, common/Nourish.h,
common/OOGThing.cpp, common/OOGThing.h, common/Property.cpp,
common/Property.h, common/Property_impl.h, common/Save.h,
common/Setup.h, common/Tick.h, common/Unseen.h, common/Update.h,
common/Use.h, common/Wield.h, common/accountbase.cpp,
common/accountbase.h, common/const.cpp, common/const.h,
common/custom.cpp, common/debug.h, common/globals.cpp,
common/globals.h, common/id.cpp, common/id.h, common/inheritance.cpp,
common/inheritance.h, common/inheritance_impl.h, common/log.cpp,
common/log.h, common/newid.cpp, common/nls.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/random.h,
common/refno.h, common/serialno.cpp, common/serialno.h,
common/system.cpp, common/system.h, common/terrain_utils.cpp,
common/terrain_utils.h, common/type_utils.h, common/types.h,
common/utility.cpp, common/utility.h, modules/DateTime.cpp,
modules/DateTime.h, modules/Location.cpp, modules/Location.h,
modules/WorldTime.cpp, modules/WorldTime.h, physics/BBox.cpp,
physics/BBox.h, physics/Collision.cpp, physics/Collision.h,
physics/Quaternion.cpp, physics/Quaternion.h, physics/Vector3D.cpp,
physics/Vector3D.h, physics/VectorPol.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/ArithmeticScript.cpp, rulesets/ArithmeticScript.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/CalendarProperty.cpp, rulesets/CalendarProperty.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Combat.cpp,
rulesets/Combat.h, rulesets/Container.cpp, rulesets/Container.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/EntityProperties.cpp,
rulesets/Entity_getLocation.h, rulesets/Fell.cpp, rulesets/Fell.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/Line.cpp,
rulesets/Line.h, rulesets/LineProperty.cpp, rulesets/LineProperty.h,
rulesets/MemEntity.cpp, rulesets/MemEntity.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/MemMap_methods.h,
rulesets/MindFactory.cpp, rulesets/MindFactory.h, rulesets/Missile.h,
rulesets/Motion.cpp, rulesets/Motion.h, rulesets/Movement.cpp,
rulesets/Movement.h, rulesets/Pedestrian.cpp, rulesets/Pedestrian.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_BBox.cpp,
rulesets/Py_BBox.h, rulesets/Py_EntityWrapper.h,
rulesets/Py_Location.cpp, rulesets/Py_Location.h,
rulesets/Py_Map.cpp, rulesets/Py_Map.h, rulesets/Py_Mind.cpp,
rulesets/Py_Mind.h, rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Operation.h,
rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp,
rulesets/Py_Optime.h, rulesets/Py_Point3D.cpp, rulesets/Py_Point3D.h,
rulesets/Py_Property.cpp, rulesets/Py_Property.h,
rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_RootEntity.cpp, rulesets/Py_RootEntity.h,
rulesets/Py_Statistics.cpp, rulesets/Py_Statistics.h,
rulesets/Py_Task.cpp, rulesets/Py_Task.h, rulesets/Py_Thing.cpp,
rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp,
rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonArithmeticScript.cpp,
rulesets/PythonArithmeticScript.h, rulesets/PythonMindScript.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.cpp,
rulesets/PythonScript.h, rulesets/PythonThingScript.cpp,
rulesets/PythonThingScript.h, rulesets/PythonWrapper.cpp,
rulesets/PythonWrapper.h, rulesets/Python_API.cpp,
rulesets/Python_API.h, rulesets/Python_Script_Utils.h,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Statistics.cpp, rulesets/Statistics.h,
rulesets/StatisticsProperty.cpp, rulesets/StatisticsProperty.h,
rulesets/Structure.cpp, rulesets/Structure.h, rulesets/Task.cpp,
rulesets/Task.h, rulesets/TaskScript.cpp, rulesets/TaskScript.h,
rulesets/TerrainProperty.cpp, rulesets/TerrainProperty.h,
rulesets/Thing.cpp, rulesets/Thing.h, rulesets/ThingFactory.cpp,
rulesets/ThingFactory.h, rulesets/World.cpp, rulesets/World.h,
rulesets/attributes.h, server/Account.cpp, server/Account.h,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.cpp,
server/ArithmeticFactory.h, server/CommClient.cpp,
server/CommClient.h, server/CommIdleSocket.cpp,
server/CommIdleSocket.h, server/CommListener.cpp,
server/CommListener.h, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommMDNSPublisher.cpp,
server/CommMDNSPublisher.h, server/CommMaster.cpp,
server/CommMaster.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommPeer.cpp,
server/CommPeer.h, server/CommPeerListener.cpp,
server/CommPeerListener.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommServer.cpp,
server/CommServer.h, server/CommSlaveClient.cpp,
server/CommSlaveClient.h, server/CommSlaveListener.cpp,
server/CommSlaveListener.h, server/CommSocket.cpp,
server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/Connection.cpp,
server/Connection.h, server/Connection_methods.h,
server/EntityFactory.cpp, server/EntityFactory.h,
server/ExternalMind.cpp, server/ExternalMind.h,
server/Idle.cpp, server/Idle.h, server/Lobby.cpp, server/Lobby.h,
server/Master.cpp, server/Master.h, server/Peer.cpp, server/Peer.h,
server/Persistance.cpp, server/Persistance.h,
server/PersistantThingFactory.cpp, server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h, server/Persistor.cpp,
server/Persistor.h, server/Persistor_impl.h,
server/Player.cpp, server/Player.h, server/Restoration.cpp,
server/Restoration.h, server/Restorer.cpp, server/Restorer.h,
server/Restorer_impl.h, server/ScriptFactory.cpp,
server/ScriptFactory.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/SlaveClientConnection.cpp, server/SlaveClientConnection.h,
server/TaskFactory.cpp, server/TaskFactory.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h,
server/server.cpp, server/server.h, server/slave.cpp,
tests/Areatest.cpp, tests/BaseEntitytest.cpp,
tests/Charactertest.cpp, tests/Containertest.cpp,
tests/Creatortest.cpp, tests/EntityExerciser.h,
tests/EntityFactorytest.cpp, tests/Entitytest.cpp,
tests/Foodtest.cpp, tests/IGEntityExerciser.h,
tests/Linetest.cpp, tests/Locationtest.cpp, tests/OOGThingtest.cpp,
tests/Planttest.cpp, tests/Propertytest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Tasktest.cpp, tests/TestWorld.h,
tests/Thingtest.cpp, tests/WorldTimetest.cpp, tests/Worldtest.cpp,
tests/allOperations.h, tests/collisiontest.cpp, tests/consttest.cpp,
tests/distancetest.cpp, tests/emergencetest.cpp,
tests/inheritancetest.cpp, tests/logtest.cpp, tests/randomtest.cpp,
tests/systemtest.cpp, tests/transformtest.cpp,
tests/type_utilstest.cpp, tests/utilitytest.cpp,
tools/AdminClient.cpp, tools/AdminClient.h, tools/cyaddrules.cpp,
tools/cycmd.cpp, tools/cyconfig.cpp, tools/cyconvertrules.cpp,
tools/cyctrl.cpp, tools/cydbload.cpp, tools/cydumprules.cpp,
tools/cyisoload.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp,
tools/cywatchdog.cpp: Replace the copyright and license statements
with new versions that include disclaimer of warranty, and
permit distribution under later versions of the GPL.
2006-01-19 02:17:06 +00:00
|
|
|
//
|
|
|
|
|
// 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 2 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, write to the Free Software Foundation,
|
|
|
|
|
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2006-10-26 00:48:00 +00:00
|
|
|
|
2005-05-13 23:25:32 +00:00
|
|
|
#include "AdminClient.h"
|
|
|
|
|
|
2005-05-14 16:25:39 +00:00
|
|
|
#include "common/debug.h"
|
|
|
|
|
|
2005-05-15 18:29:52 +00:00
|
|
|
#include <Atlas/Net/Stream.h>
|
|
|
|
|
|
|
|
|
|
#include <Atlas/Objects/Encoder.h>
|
|
|
|
|
|
2005-08-27 23:18:48 +00:00
|
|
|
#include <Atlas/Objects/Entity.h>
|
2005-05-15 18:29:52 +00:00
|
|
|
|
2009-11-26 20:35:13 +00:00
|
|
|
#include <iostream>
|
|
|
|
|
|
2005-05-13 23:25:32 +00:00
|
|
|
using Atlas::Message::Element;
|
|
|
|
|
using Atlas::Message::MapType;
|
|
|
|
|
using Atlas::Message::ListType;
|
|
|
|
|
|
2005-08-27 23:18:48 +00:00
|
|
|
using Atlas::Objects::Root;
|
|
|
|
|
|
2005-05-15 18:29:52 +00:00
|
|
|
using Atlas::Objects::Entity::Account;
|
2005-08-27 23:18:48 +00:00
|
|
|
using Atlas::Objects::Entity::Anonymous;
|
2005-05-15 18:29:52 +00:00
|
|
|
|
2005-08-27 23:18:48 +00:00
|
|
|
using Atlas::Objects::Operation::RootOperation;
|
2005-05-13 23:25:32 +00:00
|
|
|
using Atlas::Objects::Operation::Get;
|
|
|
|
|
using Atlas::Objects::Operation::Set;
|
2005-05-15 18:29:52 +00:00
|
|
|
using Atlas::Objects::Operation::Create;
|
|
|
|
|
using Atlas::Objects::Operation::Login;
|
|
|
|
|
using Atlas::Objects::Operation::Info;
|
|
|
|
|
using Atlas::Objects::Operation::Error;
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2005-05-14 16:25:39 +00:00
|
|
|
static const bool debug_flag = false;
|
|
|
|
|
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
/// \brief AdminClient constructor
|
2009-11-28 16:07:07 +00:00
|
|
|
AdminClient::AdminClient()
|
2005-05-15 18:29:52 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AdminClient::~AdminClient()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
/// \brief Read login credentials from standard input
|
2005-05-13 23:25:32 +00:00
|
|
|
void AdminClient::getLogin()
|
|
|
|
|
{
|
|
|
|
|
// This needs to be re-written to hide input, so the password can be
|
|
|
|
|
// secret
|
|
|
|
|
std::cout << "Username: " << std::flush;
|
2009-11-25 04:56:34 +00:00
|
|
|
std::cin >> m_username;
|
2005-05-13 23:25:32 +00:00
|
|
|
std::cout << "Password: " << std::flush;
|
2012-05-30 09:24:53 +01:00
|
|
|
std::cin >> m_password;
|
2005-05-13 23:25:32 +00:00
|
|
|
}
|
|
|
|
|
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
/// \brief Check if a rule exists in the rule table
|
|
|
|
|
///
|
2005-05-14 16:25:39 +00:00
|
|
|
/// @return 0 if a rule exists, 1 if it does not
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
int AdminClient::checkRule(const std::string & id)
|
2005-05-13 23:25:32 +00:00
|
|
|
{
|
2005-05-15 18:29:52 +00:00
|
|
|
Get g;
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2005-08-27 23:18:48 +00:00
|
|
|
Anonymous get_arg;
|
|
|
|
|
get_arg->setId(id);
|
|
|
|
|
get_arg->setObjtype("class");
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2005-08-27 23:18:48 +00:00
|
|
|
g->setArgs1(get_arg);
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2012-05-31 15:25:54 +01:00
|
|
|
g->setFrom(m_accountId);
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2009-11-25 04:56:34 +00:00
|
|
|
send(g);
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2005-05-14 13:05:41 +00:00
|
|
|
waitForInfo();
|
2005-05-13 23:25:32 +00:00
|
|
|
|
|
|
|
|
if (!error_flag) {
|
2005-05-14 16:25:39 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
/// \brief Upload a rule description to the server
|
|
|
|
|
///
|
|
|
|
|
/// @param id Identifier of the rule to be uploaded
|
|
|
|
|
/// @param set Name of the ruleset rule is from
|
|
|
|
|
/// @param rule Atlas description of the rule
|
2005-05-14 16:25:39 +00:00
|
|
|
int AdminClient::uploadRule(const std::string & id, const std::string & set,
|
|
|
|
|
const MapType & rule)
|
|
|
|
|
{
|
2005-05-16 01:23:17 +00:00
|
|
|
if (m_uploadedRules.find(id) != m_uploadedRules.end()) {
|
2016-09-06 22:29:36 -04:00
|
|
|
std::cout << "Overridden rule " << id << " ignored."
|
2007-06-12 18:56:21 +00:00
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
|
2005-05-14 16:25:39 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-16 01:23:17 +00:00
|
|
|
if (checkRule(id) == 0) {
|
|
|
|
|
std::cout << "Updating " << id << " on server."
|
|
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
|
|
|
|
|
Set s;
|
|
|
|
|
|
2009-08-02 17:10:51 +01:00
|
|
|
Root set_arg(0);
|
|
|
|
|
try {
|
|
|
|
|
set_arg = Atlas::Objects::Factories::instance()->createObject(rule);
|
|
|
|
|
}
|
|
|
|
|
catch (Atlas::Message::WrongTypeException&) {
|
|
|
|
|
std::cerr << "Malformed data in rule"
|
|
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-08-27 23:18:48 +00:00
|
|
|
if (!set_arg.isValid()) {
|
|
|
|
|
std::cerr << "Unknown error converting rule for upload"
|
|
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
set_arg->setAttr("ruleset", set);
|
2005-05-16 01:23:17 +00:00
|
|
|
|
2005-08-27 23:18:48 +00:00
|
|
|
s->setArgs1(set_arg);
|
2005-05-16 01:23:17 +00:00
|
|
|
|
2012-05-31 15:25:54 +01:00
|
|
|
s->setFrom(m_accountId);
|
2005-05-16 01:23:17 +00:00
|
|
|
|
2009-11-25 04:56:34 +00:00
|
|
|
send(s);
|
2005-05-16 01:23:17 +00:00
|
|
|
|
|
|
|
|
waitForInfo();
|
|
|
|
|
|
|
|
|
|
if (error_flag) {
|
2005-05-17 23:51:26 +00:00
|
|
|
std::cerr << "Failed to update existing \"" << id << "\" class."
|
|
|
|
|
<< std::endl;
|
2006-04-24 12:41:52 +00:00
|
|
|
std::cerr << "Server Error: \"" << m_errorMessage << "\"."
|
2005-05-17 23:51:26 +00:00
|
|
|
<< std::endl << std::flush;
|
2005-05-16 01:23:17 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
m_uploadedRules.insert(id);
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-24 13:39:22 +02:00
|
|
|
MapType::const_iterator I = rule.find("parent");
|
2005-05-14 16:25:39 +00:00
|
|
|
if (I == rule.end()) {
|
2017-07-24 13:39:22 +02:00
|
|
|
std::cerr << "Rule " << id << " to be uploaded has no parent."
|
2005-05-14 16:25:39 +00:00
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
const Element & pelem = I->second;
|
2017-07-24 13:39:22 +02:00
|
|
|
if (!pelem.isString()) {
|
|
|
|
|
std::cerr << "Rule " << id << " to be uploaded has non-string parent."
|
2005-05-14 16:25:39 +00:00
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2017-07-24 13:39:22 +02:00
|
|
|
const std::string& parent = pelem.asString();
|
2005-05-14 16:25:39 +00:00
|
|
|
|
|
|
|
|
if (checkRule(parent) != 0) {
|
|
|
|
|
debug(std::cerr << "Rule \"" << id << "\" to be uploaded has parent \""
|
|
|
|
|
<< parent << "\" which does not exist on server yet."
|
|
|
|
|
<< std::endl << std::flush;);
|
|
|
|
|
RuleWaitList::const_iterator J = m_waitingRules.lower_bound(parent);
|
|
|
|
|
RuleWaitList::const_iterator Jend = m_waitingRules.upper_bound(parent);
|
|
|
|
|
for (; J != Jend; ++J) {
|
|
|
|
|
if (id == J->second.first.first) {
|
|
|
|
|
debug(std::cerr << "Discarding rule with ID \"" << id
|
|
|
|
|
<< "\" as one is already waiting for upload."
|
|
|
|
|
<< std::endl << std::flush;);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
m_waitingRules.insert(make_pair(parent, make_pair(make_pair(id, set), rule))
|
|
|
|
|
);
|
2005-05-13 23:25:32 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::cout << "Uploading " << id << " to server." << std::endl << std::flush;
|
|
|
|
|
|
2005-05-16 01:23:17 +00:00
|
|
|
Create c;
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2009-08-02 17:10:51 +01:00
|
|
|
Root create_arg;
|
|
|
|
|
try {
|
|
|
|
|
create_arg = Atlas::Objects::Factories::instance()->createObject(rule);
|
|
|
|
|
}
|
|
|
|
|
catch (Atlas::Message::WrongTypeException&) {
|
|
|
|
|
std::cerr << "Malformed data in rule"
|
|
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-08-27 23:18:48 +00:00
|
|
|
if (!create_arg.isValid()) {
|
|
|
|
|
std::cerr << "Unknown error converting rule for upload"
|
|
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
create_arg->setAttr("ruleset", set);
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2005-08-27 23:18:48 +00:00
|
|
|
c->setArgs1(create_arg);
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2012-05-31 15:25:54 +01:00
|
|
|
c->setFrom(m_accountId);
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2009-11-25 04:56:34 +00:00
|
|
|
send(c);
|
2005-05-13 23:25:32 +00:00
|
|
|
|
2005-05-14 13:05:41 +00:00
|
|
|
waitForInfo();
|
2005-05-13 23:25:32 +00:00
|
|
|
|
|
|
|
|
if (error_flag) {
|
|
|
|
|
std::cerr << "Failed to upload new \"" << id << "\" class."
|
|
|
|
|
<< std::endl;
|
2006-04-24 12:41:52 +00:00
|
|
|
std::cerr << "Server Error: \"" << m_errorMessage << "\"."
|
2005-05-13 23:25:32 +00:00
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-05-14 16:25:39 +00:00
|
|
|
|
2005-05-16 01:23:17 +00:00
|
|
|
m_uploadedRules.insert(id);
|
|
|
|
|
|
2005-05-14 16:25:39 +00:00
|
|
|
int count = 1;
|
|
|
|
|
|
|
|
|
|
RuleWaitList::const_iterator J = m_waitingRules.lower_bound(id);
|
|
|
|
|
RuleWaitList::const_iterator Jend = m_waitingRules.upper_bound(id);
|
|
|
|
|
for (; J != Jend; ++J) {
|
|
|
|
|
const std::string & waitId = J->second.first.first;
|
|
|
|
|
const std::string & waitSet = J->second.first.second;
|
|
|
|
|
const MapType & waitRule = J->second.second;
|
|
|
|
|
debug(std::cout << "WAITING rule " << waitId
|
|
|
|
|
<< " now ready" << std::endl << std::flush;);
|
|
|
|
|
int ret = uploadRule(waitId, waitSet, waitRule);
|
|
|
|
|
if (ret > 0) {
|
|
|
|
|
count += ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
m_waitingRules.erase(id);
|
|
|
|
|
|
|
|
|
|
return count;
|
2005-05-13 23:25:32 +00:00
|
|
|
}
|
|
|
|
|
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
/// \brief Keep polling the server connection until a response arrives.
|
|
|
|
|
///
|
|
|
|
|
/// An Info operation is typically expected but this function will also
|
|
|
|
|
/// return if an Error operation arrives.
|
2005-05-14 13:05:41 +00:00
|
|
|
void AdminClient::waitForInfo()
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < 10 && !reply_flag; ++i) {
|
2009-11-26 20:09:26 +00:00
|
|
|
poll(0, 100000);
|
2005-05-14 13:05:41 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
/// \brief Send a Login operation to the remote server
|
|
|
|
|
///
|
|
|
|
|
/// This function uses credentials that have been set earlier.
|
2005-05-13 23:25:32 +00:00
|
|
|
int AdminClient::login()
|
|
|
|
|
{
|
2012-05-30 09:24:53 +01:00
|
|
|
return AtlasStreamClient::login(m_username, m_password);
|
2005-05-13 23:25:32 +00:00
|
|
|
}
|
2005-05-14 16:25:39 +00:00
|
|
|
|
2006-12-26 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/ClientConnection.cpp, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/BaseEntity.cpp, common/BaseEntity.h,
common/Property.h, common/accountbase.cpp, common/accountbase.h,
rulesets/ActivePropertyFactory.h,
rulesets/ActivePropertyFactory_impl.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h, server/Account.cpp,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.h,
tests/Makefile.am, tools/AdminClient.cpp, tools/AdminClient.h,
tools/cycmd.cpp: Add inline documentation.
* rulesets/ActivePropertyFactory.h: Use handler function pointer
typedef for readability.
* rulesets/AreaProperty.cpp, rulesets/AreaProperty.h: Fix PropertyBase
overriding by adding const to the right methods.
2006-12-26 14:30:42 +00:00
|
|
|
/// \brief Report information about rules which didn't upload
|
|
|
|
|
///
|
|
|
|
|
/// When this client is used to upload rules to the server, sometimes it is
|
|
|
|
|
/// not possible to upload some until their location in the inheritance
|
|
|
|
|
/// tree has been found. This function reports any rules for which a place
|
|
|
|
|
/// was never found, typically because its parent did not exist in the tree.
|
2005-05-14 16:25:39 +00:00
|
|
|
void AdminClient::report()
|
|
|
|
|
{
|
|
|
|
|
if (m_waitingRules.empty()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RuleWaitList::const_iterator I = m_waitingRules.begin();
|
|
|
|
|
RuleWaitList::const_iterator Iend = m_waitingRules.end();
|
|
|
|
|
for (; I != Iend; ++I) {
|
|
|
|
|
std::cout << "Rule \"" << I->second.first.first << "\" with parent \""
|
|
|
|
|
<< I->first << "\" from ruleset \""
|
|
|
|
|
<< I->second.first.second
|
2012-05-30 09:27:16 +01:00
|
|
|
<< "\" was never uploaded as its parent does not exist in "
|
|
|
|
|
"any of the available rulesets."
|
2005-05-14 16:25:39 +00:00
|
|
|
<< std::endl << std::flush;
|
|
|
|
|
}
|
|
|
|
|
}
|