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
|
2004-12-15 00:55:54 +00:00
|
|
|
// Copyright (C) 2004 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
|
2004-12-15 00:55:54 +00:00
|
|
|
|
2009-02-02 Al Riddoch <alriddoch@googlemail.com>
* common/Identified.cpp, common/Identified.h:
Flatten down the base classes into one called Router.
* client/CharacterClient.cpp, client/CreatorClient.cpp,
rulesets/BaseMind.cpp, rulesets/Character.cpp,
rulesets/Creator.cpp, rulesets/Entity.cpp,
rulesets/LocatedEntity.cpp, rulesets/MemEntity.cpp,
rulesets/Plant.cpp, rulesets/Stackable.cpp,
rulesets/Thing.cpp, rulesets/World.cpp,
server/Account.cpp, server/Admin.cpp,
server/Connection.cpp, server/ExternalMind.cpp,
server/Lobby.cpp, server/Master.cpp,
server/Peer.cpp, server/Player.cpp,
server/ServerRouting.cpp, server/SlaveClientConnection.cpp,
server/TrustedConnection.cpp, tests/LocatedEntitytest.cpp,
tests/ThingupdatePropertiestest.cpp: Update all the operation
routing classes to use the modified base class correctly.
2009-02-02 02:28:45 +00:00
|
|
|
// $Id$
|
2006-10-26 00:48:00 +00:00
|
|
|
|
2004-12-15 00:55:54 +00:00
|
|
|
#include "Peer.h"
|
|
|
|
|
|
2010-07-19 12:30:39 +05:30
|
|
|
#include "ServerRouting.h"
|
|
|
|
|
#include "Lobby.h"
|
2011-10-31 19:07:21 +00:00
|
|
|
#include "CommServer.h"
|
2010-07-20 02:37:46 +05:30
|
|
|
#include "TeleportState.h"
|
2012-11-23 16:11:21 +00:00
|
|
|
#include "rulesets/ExternalMind.h"
|
2010-07-19 12:30:39 +05:30
|
|
|
|
2013-01-17 10:17:07 +00:00
|
|
|
#include "common/BaseWorld.h"
|
2012-11-23 11:05:59 +00:00
|
|
|
#include "common/CommSocket.h"
|
2005-11-13 Al Riddoch <alriddoch@zepler.org>
* server/Admin.cpp, server/CommPeer.cpp, server/CommPeer.h,
server/CommPeerListener.cpp, server/Peer.cpp, server/Peer.h:
Re-work classes for peer connections to use integer IDs.
* server/Lobby.cpp, server/Lobby.h: Modify interface so its more
obvious that lobby only handles accounts, and adjust to have
integer ID.
* server/Connection.cpp, server/Connection.h,
server/TrustedConnection.cpp, server/TrustedConnection.h: Use
integer IDs, and modify to match new Lobby API changes.
* server/ServerRouting.cpp, server/ServerRouting.h, server/server.cpp:
Modify server to have integer ID, and handle ID for Lobby as well.
* server/CommListener.cpp, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommUnixListener.cpp:
Modify communication classes for normal clients to handle
integer IDs on the connection classes.
2005-11-13 23:28:02 +00:00
|
|
|
#include "common/id.h"
|
2010-07-15 02:21:02 +05:30
|
|
|
#include "common/log.h"
|
2010-07-19 12:30:39 +05:30
|
|
|
#include "common/system.h"
|
2010-07-20 01:34:52 +05:30
|
|
|
#include "common/serialno.h"
|
2010-07-19 12:30:39 +05:30
|
|
|
#include "common/compose.hpp"
|
2010-07-15 02:21:02 +05:30
|
|
|
|
2010-07-21 02:47:44 +05:30
|
|
|
#include "rulesets/Character.h"
|
|
|
|
|
|
2010-07-15 02:21:02 +05:30
|
|
|
#include <Atlas/Objects/Operation.h>
|
|
|
|
|
#include <Atlas/Objects/Anonymous.h>
|
2005-11-13 Al Riddoch <alriddoch@zepler.org>
* server/Admin.cpp, server/CommPeer.cpp, server/CommPeer.h,
server/CommPeerListener.cpp, server/Peer.cpp, server/Peer.h:
Re-work classes for peer connections to use integer IDs.
* server/Lobby.cpp, server/Lobby.h: Modify interface so its more
obvious that lobby only handles accounts, and adjust to have
integer ID.
* server/Connection.cpp, server/Connection.h,
server/TrustedConnection.cpp, server/TrustedConnection.h: Use
integer IDs, and modify to match new Lobby API changes.
* server/ServerRouting.cpp, server/ServerRouting.h, server/server.cpp:
Modify server to have integer ID, and handle ID for Lobby as well.
* server/CommListener.cpp, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommUnixListener.cpp:
Modify communication classes for normal clients to handle
integer IDs on the connection classes.
2005-11-13 23:28:02 +00:00
|
|
|
|
2010-07-21 02:47:44 +05:30
|
|
|
#include <wfmath/MersenneTwister.h>
|
|
|
|
|
|
2010-07-19 12:30:39 +05:30
|
|
|
#include <iostream>
|
|
|
|
|
|
2011-10-31 19:07:21 +00:00
|
|
|
#include <ctime>
|
2010-08-20 14:35:28 +05:30
|
|
|
|
2010-07-19 12:30:39 +05:30
|
|
|
using Atlas::Message::Element;
|
|
|
|
|
using Atlas::Objects::Root;
|
|
|
|
|
using Atlas::Objects::Operation::Info;
|
2010-07-20 01:34:52 +05:30
|
|
|
using Atlas::Objects::Operation::Create;
|
2010-07-21 02:47:44 +05:30
|
|
|
using Atlas::Objects::Operation::Delete;
|
|
|
|
|
using Atlas::Objects::Operation::Logout;
|
2010-07-19 12:30:39 +05:30
|
|
|
using Atlas::Objects::Operation::Move;
|
|
|
|
|
using Atlas::Objects::Entity::Anonymous;
|
|
|
|
|
|
2007-09-22 15:34:04 +00:00
|
|
|
/// \brief Constructor
|
|
|
|
|
///
|
|
|
|
|
/// @param client the client socket used to connect to the peer.
|
|
|
|
|
/// @param svr the server routing object of this server.
|
|
|
|
|
/// @param addr a string representation of the address of the peer.
|
|
|
|
|
/// @param id a string giving the indentifier of the peer connection.
|
2012-07-31 20:21:58 +01:00
|
|
|
Peer::Peer(CommSocket & client,
|
2005-11-13 Al Riddoch <alriddoch@zepler.org>
* server/Admin.cpp, server/CommPeer.cpp, server/CommPeer.h,
server/CommPeerListener.cpp, server/Peer.cpp, server/Peer.h:
Re-work classes for peer connections to use integer IDs.
* server/Lobby.cpp, server/Lobby.h: Modify interface so its more
obvious that lobby only handles accounts, and adjust to have
integer ID.
* server/Connection.cpp, server/Connection.h,
server/TrustedConnection.cpp, server/TrustedConnection.h: Use
integer IDs, and modify to match new Lobby API changes.
* server/ServerRouting.cpp, server/ServerRouting.h, server/server.cpp:
Modify server to have integer ID, and handle ID for Lobby as well.
* server/CommListener.cpp, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommUnixListener.cpp:
Modify communication classes for normal clients to handle
integer IDs on the connection classes.
2005-11-13 23:28:02 +00:00
|
|
|
ServerRouting & svr,
|
|
|
|
|
const std::string & addr,
|
2012-07-19 10:05:45 +01:00
|
|
|
int port,
|
2010-11-26 16:07:29 +00:00
|
|
|
const std::string & id, long iid) :
|
2012-07-31 20:21:58 +01:00
|
|
|
Link(client, id, iid),
|
2012-07-19 10:05:45 +01:00
|
|
|
m_host(addr),
|
|
|
|
|
m_port(port),
|
2010-07-21 05:29:56 +05:30
|
|
|
m_state(PEER_INIT),
|
|
|
|
|
m_server(svr)
|
2004-12-15 00:55:54 +00:00
|
|
|
{
|
2010-11-30 21:38:29 +00:00
|
|
|
logEvent(CONNECT, String::compose("%1 - - Connect to %2", id, addr));
|
2004-12-15 00:55:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Peer::~Peer()
|
|
|
|
|
{
|
2010-12-11 11:32:23 +00:00
|
|
|
destroyed.emit();
|
2004-12-15 00:55:54 +00:00
|
|
|
}
|
2008-01-12 18:08:03 +00:00
|
|
|
|
2010-08-15 03:51:48 +05:30
|
|
|
/// \brief Set the authentication state of the peer connection
|
|
|
|
|
///
|
|
|
|
|
/// @param state The state to set
|
2010-07-20 01:34:52 +05:30
|
|
|
void Peer::setAuthState(PeerAuthState state)
|
|
|
|
|
{
|
|
|
|
|
m_state = state;
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-15 03:51:48 +05:30
|
|
|
/// \brief Get the authentication state of the peer
|
|
|
|
|
///
|
|
|
|
|
/// \return The current authentication state of the peer
|
2010-07-20 01:34:52 +05:30
|
|
|
PeerAuthState Peer::getAuthState()
|
|
|
|
|
{
|
|
|
|
|
return m_state;
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-04 20:39:35 +00:00
|
|
|
void Peer::externalOperation(const Operation & op, Link &)
|
2012-11-13 23:33:23 +00:00
|
|
|
{
|
|
|
|
|
log(ERROR, String::compose("%1 called", __PRETTY_FUNCTION__));
|
|
|
|
|
}
|
|
|
|
|
|
2010-08-15 03:51:48 +05:30
|
|
|
/// \brief Execute an operation sent by a connected peer
|
|
|
|
|
///
|
|
|
|
|
/// \param op The operation to be executed
|
|
|
|
|
/// \param res The result set of replies
|
2010-07-15 02:21:02 +05:30
|
|
|
void Peer::operation(const Operation &op, OpVector &res)
|
2008-01-12 18:08:03 +00:00
|
|
|
{
|
2010-12-08 18:42:26 +00:00
|
|
|
if (!op->isDefaultRefno()) {
|
|
|
|
|
replied.emit(op);
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-28 15:39:59 +00:00
|
|
|
auto op_no = op->getClassNo();
|
2010-07-19 20:10:20 +05:30
|
|
|
switch (op_no) {
|
2010-07-15 02:21:02 +05:30
|
|
|
case Atlas::Objects::Operation::INFO_NO:
|
2010-07-19 20:10:20 +05:30
|
|
|
{
|
2010-08-15 03:51:48 +05:30
|
|
|
// If we receive an Info op while we are not yet authenticated, it
|
|
|
|
|
// can only be the result of an authentication request.
|
2010-07-20 01:34:52 +05:30
|
|
|
if (m_state == PEER_AUTHENTICATING) {
|
2010-07-23 03:23:56 +05:30
|
|
|
const std::vector<Root> & args = op->getArgs();
|
|
|
|
|
if (args.empty()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const Root & arg = args.front();
|
|
|
|
|
if (!arg->hasAttrFlag(Atlas::Objects::ID_FLAG)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-07-20 01:34:52 +05:30
|
|
|
// Response to a Login op
|
2010-07-23 03:26:41 +05:30
|
|
|
m_accountId = arg->getId();
|
2011-04-08 21:59:32 +02:00
|
|
|
if (!arg->getParents().empty()) {
|
|
|
|
|
m_accountType = arg->getParents().front();
|
2010-07-20 01:34:52 +05:30
|
|
|
}
|
2010-11-24 00:16:29 +00:00
|
|
|
m_state = PEER_AUTHENTICATED;
|
2010-07-20 01:34:52 +05:30
|
|
|
} else if (m_state == PEER_AUTHENTICATED) {
|
2010-08-15 03:51:48 +05:30
|
|
|
// If we received an Info op while authenticated, it is a
|
|
|
|
|
// response to a teleport request.
|
2010-07-21 02:47:44 +05:30
|
|
|
peerTeleportResponse(op, res);
|
2010-07-19 20:10:20 +05:30
|
|
|
}
|
2010-07-19 12:30:39 +05:30
|
|
|
}
|
2010-11-23 23:23:10 +00:00
|
|
|
break;
|
|
|
|
|
case Atlas::Objects::Operation::ERROR_NO:
|
|
|
|
|
{
|
2010-11-24 01:44:45 +00:00
|
|
|
m_state = PEER_FAILED;
|
2010-11-23 23:23:10 +00:00
|
|
|
}
|
|
|
|
|
break;
|
2010-07-19 12:30:39 +05:30
|
|
|
}
|
2008-01-12 18:08:03 +00:00
|
|
|
}
|
2010-07-20 01:34:52 +05:30
|
|
|
|
2010-08-15 03:51:48 +05:30
|
|
|
/// \brief Teleport an entity to the connected peer
|
|
|
|
|
///
|
2010-11-25 00:45:07 +00:00
|
|
|
/// @param ent The entity to be teleported
|
2010-08-15 03:51:48 +05:30
|
|
|
/// @return Returns 0 on success and -1 on failure
|
2013-01-17 10:17:07 +00:00
|
|
|
int Peer::teleportEntity(const LocatedEntity * ent)
|
2010-07-20 01:34:52 +05:30
|
|
|
{
|
|
|
|
|
if (m_state != PEER_AUTHENTICATED) {
|
|
|
|
|
log(ERROR, "Peer not authenticated yet.");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2010-11-24 23:17:50 +00:00
|
|
|
|
|
|
|
|
long iid = ent->getIntId();
|
2010-11-24 18:49:07 +00:00
|
|
|
if (m_teleports.find(iid) != m_teleports.end()) {
|
2010-07-31 17:30:16 +05:30
|
|
|
log(INFO, "Transfer of this entity already in progress");
|
2010-07-31 17:33:11 +05:30
|
|
|
return -1;
|
2010-07-31 17:30:16 +05:30
|
|
|
}
|
2010-07-20 01:34:52 +05:30
|
|
|
|
2012-07-31 20:21:58 +01:00
|
|
|
std::time_t teleport_time = m_commSocket.m_commServer.time();
|
2010-08-20 14:35:28 +05:30
|
|
|
|
2010-08-15 03:51:48 +05:30
|
|
|
// Add a teleport state object to identify this teleport request
|
2010-11-25 00:43:25 +00:00
|
|
|
TeleportState * s = new TeleportState(teleport_time);
|
|
|
|
|
if (s == NULL) {
|
2010-07-20 02:37:46 +05:30
|
|
|
log(ERROR, "Unable to allocate teleport state object");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2010-11-24 23:17:50 +00:00
|
|
|
|
2010-11-25 16:48:51 +00:00
|
|
|
// Check if the entity has a mind
|
|
|
|
|
const Character * chr = dynamic_cast<const Character *>(ent);
|
|
|
|
|
|
2010-11-24 23:17:50 +00:00
|
|
|
Atlas::Objects::Entity::Anonymous atlas_repr;
|
|
|
|
|
ent->addToEntity(atlas_repr);
|
2010-11-25 00:43:25 +00:00
|
|
|
|
|
|
|
|
Create op;
|
|
|
|
|
op->setFrom(m_accountId);
|
|
|
|
|
op->setSerialno(iid);
|
2010-11-30 09:48:52 +00:00
|
|
|
op->setArgs1(atlas_repr);
|
2010-07-28 19:33:48 +05:30
|
|
|
|
2012-11-25 00:04:12 +00:00
|
|
|
if (chr != 0 &&
|
|
|
|
|
chr->m_externalMind != 0 &&
|
|
|
|
|
chr->m_externalMind->isLinked()) {
|
2010-11-25 00:43:25 +00:00
|
|
|
// Entities with a mind require an additional one-time possess key that
|
|
|
|
|
// is used by the client to authenticate a teleport on the destination
|
|
|
|
|
// peer
|
|
|
|
|
std::string key;
|
|
|
|
|
log(INFO, "Entity has a mind. Generating random key");
|
|
|
|
|
// FIXME non-random, plus potetial timing attack.
|
|
|
|
|
WFMath::MTRand generator;
|
|
|
|
|
for(int i=0;i<32;i++) {
|
|
|
|
|
char ch = (char)((int)'a' + generator.rand(25));
|
|
|
|
|
key += ch;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s->setKey(key);
|
2010-07-28 19:33:48 +05:30
|
|
|
// Add an additional possess key argument
|
2010-08-20 16:25:23 +05:30
|
|
|
log(INFO, String::compose("Adding possess key %1 to Create op", key));
|
2010-07-28 19:33:48 +05:30
|
|
|
Anonymous key_arg;
|
|
|
|
|
key_arg->setAttr("possess_key", key);
|
|
|
|
|
|
2010-11-30 09:48:52 +00:00
|
|
|
std::vector<Root> & create_args = op->modifyArgs();
|
|
|
|
|
create_args.push_back(key_arg);
|
2010-07-28 19:33:48 +05:30
|
|
|
}
|
2012-07-31 20:21:58 +01:00
|
|
|
this->send(op);
|
2010-07-28 19:33:48 +05:30
|
|
|
log(INFO, "Sent Create op to peer");
|
2010-08-15 03:51:48 +05:30
|
|
|
|
|
|
|
|
// Set it as validated and add to the list of teleports
|
2010-07-20 02:37:46 +05:30
|
|
|
s->setRequested();
|
2010-11-24 18:49:07 +00:00
|
|
|
m_teleports[iid] = s;
|
2010-07-23 03:24:59 +05:30
|
|
|
log(INFO, "Added new teleport state");
|
2010-07-20 02:37:46 +05:30
|
|
|
|
2010-07-20 01:34:52 +05:30
|
|
|
return 0;
|
|
|
|
|
}
|
2010-07-21 02:47:44 +05:30
|
|
|
|
2010-08-15 03:51:48 +05:30
|
|
|
/// \brief Handle an Info op response sent as reply to a teleport request
|
|
|
|
|
///
|
|
|
|
|
/// @param op The Info op sent back as reply to a teleport request
|
|
|
|
|
/// @param res The result set of replies
|
2010-07-21 02:47:44 +05:30
|
|
|
void Peer::peerTeleportResponse(const Operation &op, OpVector &res)
|
|
|
|
|
{
|
2010-07-23 03:24:59 +05:30
|
|
|
log(INFO, "Got a peer teleport response");
|
2010-07-21 02:47:44 +05:30
|
|
|
// Response to a Create op
|
|
|
|
|
const std::vector<Root> & args = op->getArgs();
|
2010-11-24 18:49:07 +00:00
|
|
|
if (args.size() < 1) {
|
2010-07-31 02:02:16 +05:30
|
|
|
log(ERROR, "Malformed args in Info op");
|
2010-07-21 02:47:44 +05:30
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const Root & arg = args.front();
|
2010-08-11 16:44:57 +05:30
|
|
|
|
2010-11-24 18:49:07 +00:00
|
|
|
if (op->isDefaultRefno()) {
|
|
|
|
|
log(ERROR, "Response to teleport has no refno");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
long iid = op->getRefno();
|
2010-07-23 03:36:56 +05:30
|
|
|
|
2010-11-24 18:49:07 +00:00
|
|
|
TeleportMap::iterator I = m_teleports.find(iid);
|
2010-08-20 22:14:31 +05:30
|
|
|
if (I == m_teleports.end()) {
|
2010-07-31 20:59:24 +05:30
|
|
|
log(ERROR, "Info op for unknown create");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-08-03 18:54:23 +05:30
|
|
|
|
2010-08-03 19:05:02 +05:30
|
|
|
TeleportState *s = I->second;
|
2010-08-03 20:29:04 +05:30
|
|
|
assert (s != NULL);
|
2010-08-03 18:54:23 +05:30
|
|
|
|
2010-07-21 02:47:44 +05:30
|
|
|
s->setCreated();
|
2010-11-24 18:49:07 +00:00
|
|
|
log(INFO, String::compose("Entity with ID %1 replicated on peer", iid));
|
2010-07-21 02:47:44 +05:30
|
|
|
|
2010-07-28 19:34:28 +05:30
|
|
|
// This is the sender entity. This is retreived again rather than
|
2010-08-15 03:51:48 +05:30
|
|
|
// relying on a pointer (in the TeleportState object perhaps) as the
|
2010-07-28 19:34:28 +05:30
|
|
|
// entity might have been deleted in the time between sending and response
|
2013-01-17 10:17:07 +00:00
|
|
|
LocatedEntity * entity = BaseWorld::instance().getEntity(iid);
|
2010-07-21 02:47:44 +05:30
|
|
|
if (entity == 0) {
|
2010-11-24 18:49:07 +00:00
|
|
|
log(ERROR, String::compose("No entity found with ID: %1", iid));
|
2010-08-20 14:35:28 +05:30
|
|
|
// Clean up the teleport state object
|
|
|
|
|
m_teleports.erase(I);
|
2010-07-21 02:47:44 +05:30
|
|
|
return;
|
|
|
|
|
}
|
2010-07-28 19:34:28 +05:30
|
|
|
|
|
|
|
|
// If entity has a mind, add extra information in the Logout op
|
2010-11-25 16:48:51 +00:00
|
|
|
if (s->isMind()) {
|
2010-07-28 19:34:28 +05:30
|
|
|
Character * chr = dynamic_cast<Character *>(entity);
|
|
|
|
|
if (!chr) {
|
|
|
|
|
log(ERROR, "Entity is not a character");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (chr->m_externalMind == 0) {
|
|
|
|
|
log(ERROR, "No external mind (though teleport state claims it)");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2012-11-25 00:04:12 +00:00
|
|
|
if (!chr->m_externalMind->isLinked()) {
|
2010-07-28 19:34:28 +05:30
|
|
|
log(ERROR, "Mind is NULL or not connected");
|
|
|
|
|
return;
|
2010-07-21 02:47:44 +05:30
|
|
|
}
|
2010-07-23 03:56:25 +05:30
|
|
|
std::vector<Root> logout_args;
|
2010-11-25 09:54:48 +00:00
|
|
|
|
2010-07-21 02:47:44 +05:30
|
|
|
Anonymous op_arg;
|
2010-11-25 09:54:48 +00:00
|
|
|
op_arg->setId(entity->getId());
|
2010-07-23 03:56:25 +05:30
|
|
|
logout_args.push_back(op_arg);
|
2010-11-25 09:54:48 +00:00
|
|
|
|
2010-07-23 03:56:25 +05:30
|
|
|
Anonymous ip_arg;
|
2012-07-19 10:05:45 +01:00
|
|
|
ip_arg->setAttr("teleport_host", m_host);
|
|
|
|
|
ip_arg->setAttr("teleport_port", m_port);
|
2010-07-28 19:33:48 +05:30
|
|
|
ip_arg->setAttr("possess_key", s->getPossessKey());
|
2010-07-25 15:57:57 +05:30
|
|
|
ip_arg->setAttr("possess_entity_id", arg->getId());
|
2010-07-23 03:56:25 +05:30
|
|
|
logout_args.push_back(ip_arg);
|
2010-11-25 09:54:48 +00:00
|
|
|
|
|
|
|
|
Logout logoutOp;
|
2010-07-25 15:57:57 +05:30
|
|
|
logoutOp->setArgs(logout_args);
|
2010-11-25 09:54:48 +00:00
|
|
|
logoutOp->setTo(entity->getId());
|
2010-07-23 03:27:01 +05:30
|
|
|
OpVector temp;
|
2012-11-25 00:04:12 +00:00
|
|
|
chr->m_externalMind->operation(logoutOp, temp);
|
2010-07-23 03:27:01 +05:30
|
|
|
log(INFO, "Sent random key to connected mind");
|
2010-07-21 02:47:44 +05:30
|
|
|
}
|
|
|
|
|
|
2010-11-24 18:49:07 +00:00
|
|
|
// FIXME Remove from the world cleanly, not delete.
|
|
|
|
|
|
2010-07-21 02:47:44 +05:30
|
|
|
// Delete the entity from the current world
|
|
|
|
|
Delete delOp;
|
|
|
|
|
Anonymous del_arg;
|
2010-11-25 09:54:48 +00:00
|
|
|
del_arg->setId(entity->getId());
|
2010-07-21 02:47:44 +05:30
|
|
|
delOp->setArgs1(del_arg);
|
2010-11-25 09:54:48 +00:00
|
|
|
delOp->setTo(entity->getId());
|
2010-07-21 02:47:44 +05:30
|
|
|
entity->sendWorld(delOp);
|
2010-07-23 03:24:59 +05:30
|
|
|
log(INFO, "Deleted entity from current server");
|
2010-11-30 21:38:29 +00:00
|
|
|
logEvent(EXPORT_ENT, String::compose("%1 - %2 Exported entity",
|
|
|
|
|
getId(), entity->getId()));
|
2010-08-11 08:43:45 +05:30
|
|
|
|
2010-08-20 14:35:28 +05:30
|
|
|
// Clean up the teleport state object
|
|
|
|
|
m_teleports.erase(I);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Peer::cleanTeleports()
|
|
|
|
|
{
|
|
|
|
|
if (m_teleports.size() == 0) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// Get the current time
|
2012-07-31 20:21:58 +01:00
|
|
|
std::time_t curr_time = m_commSocket.m_commServer.time();
|
2010-08-20 14:35:28 +05:30
|
|
|
|
|
|
|
|
TeleportMap::iterator I = m_teleports.begin();
|
|
|
|
|
for(I = m_teleports.begin(); I != m_teleports.end(); ++I) {
|
2010-08-20 20:54:56 +05:30
|
|
|
time_t time_passed = curr_time - I->second->getCreateTime();
|
2010-08-20 14:35:28 +05:30
|
|
|
// If 5 seconds have passed, the teleport has failed
|
2010-08-20 20:54:56 +05:30
|
|
|
if (time_passed >= 10 && I->second->isRequested()) {
|
2010-08-20 14:39:12 +05:30
|
|
|
log(INFO, String::compose("Teleport timed out for entity (ID %1)",
|
|
|
|
|
I->first));
|
2010-11-24 10:36:04 +00:00
|
|
|
// FIXME I think this is unsafe.
|
2010-08-20 14:35:28 +05:30
|
|
|
m_teleports.erase(I);
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-07-21 02:47:44 +05:30
|
|
|
}
|