mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 07:19:41 +00:00
Code Issues Releases Wiki Activity

[General] Add basic integrity check to reading of ActorList packets

Browse source 
Additionally, add newlines to files missing them.
This commit is contained in:
David Cernat 2017-05-16 14:20:40 +03:00
parent 252a28fe24
commit f527fe9ebe
11 changed files with 46 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw-mp/ActorProcessor.cpp
View file

@ -36,11 +36,16 @@ bool ActorProcessor::Process(RakNet::Packet &packet, BaseActorList &actorList) n
ActorPacket *myPacket = Networking::get().getActorPacketController()->GetPacket(packet.data[0]);
myPacket->setActorList(&actorList);
actorList.isValid = true;
if (!processor.second->avoidReading)
myPacket->Read();
processor.second->Do(*myPacket, *player, actorList);
if (actorList.isValid)
processor.second->Do(*myPacket, *player, actorList);
else
LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Received %s that failed integrity check and was ignored!", processor.second->strPacketID.c_str());
return true;
}
}

2
apps/openmw-mp/PlayerProcessor.cpp
View file

@ -40,4 +40,4 @@ bool PlayerProcessor::Process(RakNet::Packet &packet) noexcept
}
}
return false;
}
}

2
apps/openmw-mp/ProcessorInitializer.cpp
View file

@ -107,4 +107,4 @@ void ProcessorInitializer()
WorldProcessor::AddProcessor(new ProcessorScriptLocalShort());
WorldProcessor::AddProcessor(new ProcessorScriptMemberShort());
WorldProcessor::AddProcessor(new ProcessorVideoPlay());
}
}

2
apps/openmw-mp/Script/LangPawn/PawnFunc.cpp
View file

@ -151,4 +151,4 @@ cell LangPAWN::CreateTimer(AMX *amx, const cell *params) noexcept
cell LangPAWN::CreateTimerEx(AMX *amx, const cell *params) noexcept
{
}
}

2
apps/openmw-mp/Script/ScriptFunctions.hpp
View file

@ -149,4 +149,4 @@ public:
};
};
#endif //SCRIPTFUNCTIONS_HPP
#endif //SCRIPTFUNCTIONS_HPP

33
apps/openmw/mwmp/ActorProcessor.cpp
View file

@ -22,22 +22,27 @@ bool ActorProcessor::Process(RakNet::Packet &packet, ActorList &actorList)
myPacket->SetReadStream(&bsIn);
BOOST_FOREACH(processors_t::value_type &processor, processors)
{
if (processor.first == packet.data[0])
{
myGuid = Main::get().getLocalPlayer()->guid;
request = packet.length == myPacket->headerSize();
{
if (processor.first == packet.data[0])
{
myGuid = Main::get().getLocalPlayer()->guid;
request = packet.length == myPacket->headerSize();
if (!request && !processor.second->avoidReading)
{
myPacket->Read();
}
actorList.isValid = true;
processor.second->Do(*myPacket, actorList);
if (!request && !processor.second->avoidReading)
{
myPacket->Read();
}
return true;
}
}
if (actorList.isValid)
processor.second->Do(*myPacket, actorList);
else
LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Received %s that failed integrity check and was ignored!", processor.second->strPacketID.c_str());
return true;
}
}
return false;
}
@ -50,4 +55,4 @@ void ActorProcessor::AddProcessor(mwmp::ActorProcessor *processor)
processor->className + " and " + p.second->className);
}
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<ActorProcessor>(processor)));
}
}

2
apps/openmw/mwmp/ProcessorInitializer.cpp
View file

@ -119,4 +119,4 @@ void ProcessorInitializer()
ActorProcessor::AddProcessor(new ProcessorActorSpeech());
ActorProcessor::AddProcessor(new ProcessorActorStatsDynamic());
ActorProcessor::AddProcessor(new ProcessorActorTest());
}
}

2
apps/openmw/mwmp/WorldProcessor.cpp
View file

@ -55,4 +55,4 @@ void WorldProcessor::AddProcessor(mwmp::WorldProcessor *processor)
processor->className + " and " + p.second->className);
}
processors.insert(processors_t::value_type(processor->GetPacketID(), boost::shared_ptr<WorldProcessor>(processor)));
}
}

2
components/openmw-mp/Base/BaseActor.hpp
View file

@ -70,6 +70,8 @@ namespace mwmp
ESM::Cell cell;
unsigned char action; // 0 - Clear and set in entirety, 1 - Add item, 2 - Remove item, 3 - Request items
bool isValid;
};
}

12
components/openmw-mp/Packets/Actor/PacketActorList.cpp
View file

@ -25,6 +25,12 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
RW(actorList->count, send);
if (actorList->count > 2000)
{
actorList->isValid = false;
return;
}
RW(actorList->cell.mData.mFlags, send);
RW(actorList->cell.mData.mX, send);
RW(actorList->cell.mData.mY, send);
@ -43,6 +49,12 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
RW(actor.refNumIndex, send);
RW(actor.mpNum, send);
if (actor.refId.empty() || (actor.refNumIndex != 0 && actor.mpNum != 0))
{
actorList->isValid = false;
return;
}
if (!send)
{
actorList->baseActors.push_back(actor);

2
components/openmw-mp/Utils.cpp
View file

@ -159,4 +159,4 @@ string Utils::intToHexStr(unsigned val)
ostringstream sstr;
sstr << "0x" << setfill('0') << setw(8) << uppercase << hex << val;
return sstr.str();
}
}