UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Serialize and deserialize usermessages from the server on CS:GO to avoid issues on linux (bug 5588).

Browse Source
This commit is contained in:
Nicholas Hastings 2013-02-10 23:06:26 -05:00
parent d3dd82f190
commit 6775898712
1 changed files with 26 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
core/UserMessages.cpp
View File

@ -493,116 +493,16 @@ void UserMessages::_DecRefCounter()
} }
} }
#ifdef USE_PROTOBUF_USERMESSAGES
// Unlike protobuf's Message::CopyFrom:
// - Does not require to/from message descriptors to be identical.
// - Fields are copied by name, rather than index.
// - String fields are retrieved for copy with GetStringReference, to avoid destucting libprotobuf std::string in sm.
// - Unknown fields in |from| message are not copied to |to| message.
// - Copying Message fields recursively calls this function, rather than Message::MergeFrom.
static void _CopyProtobufMessage(const protobuf::Message &from, protobuf::Message *to)
{
const protobuf::Descriptor* descriptor = from.GetDescriptor();
const protobuf::Reflection* from_reflection = from.GetReflection();
const protobuf::Reflection* to_reflection = to->GetReflection();
protobuf::UnknownFieldSet toUnknownFields;
int fromFieldCount = descriptor->field_count();
for (int i = 0; i < fromFieldCount; i++)
{
const protobuf::FieldDescriptor* fromField = descriptor->field(i);
const protobuf::FieldDescriptor* toField = to->GetDescriptor()->FindFieldByName(fromField->name());
// This will stripped new fields off of intercepted usermessages.
// TODO: fix that.
if (!toField)
{
continue;
}
if (fromField->is_repeated())
{
int count = from_reflection->FieldSize(from, fromField);
for (int j = 0; j < count; j++)
{
switch (fromField->cpp_type())
{
#define HANDLE_TYPE(CPPTYPE, METHOD) \
case protobuf::FieldDescriptor::CPPTYPE_##CPPTYPE: \
to_reflection->Add##METHOD(to, toField, \
from_reflection->GetRepeated##METHOD(from, fromField, j)); \
break;
HANDLE_TYPE(INT32 , Int32 );
HANDLE_TYPE(INT64 , Int64 );
HANDLE_TYPE(UINT32, UInt32);
HANDLE_TYPE(UINT64, UInt64);
HANDLE_TYPE(FLOAT , Float );
HANDLE_TYPE(DOUBLE, Double);
HANDLE_TYPE(BOOL , Bool );
HANDLE_TYPE(ENUM , Enum );
#undef HANDLE_TYPE
case protobuf::FieldDescriptor::CPPTYPE_STRING:
{
std::string buffer;
to_reflection->AddString(to, toField,
from_reflection->GetRepeatedStringReference(from, fromField, j, &buffer));
}
break;
case protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
_CopyProtobufMessage(
from_reflection->GetRepeatedMessage(from, fromField, j),
to_reflection->AddMessage(to, toField)
);
break;
}
}
}
else
{
switch (fromField->cpp_type())
{
#define HANDLE_TYPE(CPPTYPE, METHOD) \
case protobuf::FieldDescriptor::CPPTYPE_##CPPTYPE: \
to_reflection->Set##METHOD(to, toField, \
from_reflection->Get##METHOD(from, fromField)); \
break;
HANDLE_TYPE(INT32 , Int32 );
HANDLE_TYPE(INT64 , Int64 );
HANDLE_TYPE(UINT32, UInt32);
HANDLE_TYPE(UINT64, UInt64);
HANDLE_TYPE(FLOAT , Float );
HANDLE_TYPE(DOUBLE, Double);
HANDLE_TYPE(BOOL , Bool );
HANDLE_TYPE(ENUM , Enum );
#undef HANDLE_TYPE
case protobuf::FieldDescriptor::CPPTYPE_STRING:
{
std::string buffer;
to_reflection->SetString(to, toField,
from_reflection->GetStringReference(from, fromField, &buffer));
}
break;
case protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
_CopyProtobufMessage(
from_reflection->GetMessage(from, fromField),
to_reflection->MutableMessage(to, toField)
);
break;
}
}
}
}
#endif
#if SOURCE_ENGINE == SE_CSGO #if SOURCE_ENGINE == SE_CSGO
void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg) void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
{ {
OnStartMessage_Pre(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type)); OnStartMessage_Pre(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
if (m_FakeMetaRes == MRES_SUPERCEDE) if (m_FakeMetaRes == MRES_SUPERCEDE)
{ {
_CopyProtobufMessage(msg, m_InterceptBuffer); int size = msg.ByteSize();
uint8 *data = (uint8 *)stackalloc(size);
msg.SerializePartialToArray(data, size);
m_InterceptBuffer->ParseFromArray(data, size);
} }
else else
{ {
@ -858,12 +758,19 @@ void UserMessages::OnMessageEnd_Pre()
#endif // SE_CSGO #endif // SE_CSGO
} }
{
int size = m_OrigBuffer->ByteSize();
uint8 *data = (uint8 *)stackalloc(size);
m_OrigBuffer->SerializePartialToArray(data, size);
protobuf::Message *pTempMsg = g_Cstrike15UsermessageHelpers.GetPrototype(m_CurId)->New();
pTempMsg->ParseFromArray(data, size);
pList = &m_msgHooks[m_CurId]; pList = &m_msgHooks[m_CurId];
for (iter=pList->begin(); iter!=pList->end(); ) for (iter=pList->begin(); iter!=pList->end(); )
{ {
pInfo = (*iter); pInfo = (*iter);
pInfo->IsHooked = true; pInfo->IsHooked = true;
pInfo->Callback->OnUserMessage(m_CurId, m_OrigBuffer, m_CurRecFilter); pInfo->Callback->OnUserMessage(m_CurId, pTempMsg, m_CurRecFilter);
if (pInfo->KillMe) if (pInfo->KillMe)
{ {
@ -877,6 +784,9 @@ void UserMessages::OnMessageEnd_Pre()
iter++; iter++;
} }
delete pTempMsg;
}
UM_RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED); UM_RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED);
supercede: supercede:
m_BlockEndPost = true; m_BlockEndPost = true;