diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-10-08 00:22:32 +0000 |
| commit | b807e3df990e6fad25cd0bca94d2959dac042b13 (patch) | |
| tree | aa8b185cac406abe412d76d90a903b450191d84d /indra/llmessage/message.cpp | |
| parent | 4296542cd062af425d7744c88d6dd2bd00daf532 (diff) | |
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)
Diffstat (limited to 'indra/llmessage/message.cpp')
| -rw-r--r-- | indra/llmessage/message.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index abd9467602..dd7818c470 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -754,11 +754,12 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count ) clearReceiveState(); valid_packet = FALSE; } + if( valid_packet && mTemplateMessageReader->isUdpBanned()) { llwarns << "Received UDP black listed message " - << mTemplateMessageReader->getMessageName() - << " from " << host << llendl; + << mTemplateMessageReader->getMessageName() + << " from " << host << llendl; clearReceiveState(); valid_packet = FALSE; } @@ -766,7 +767,6 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count ) if( valid_packet ) { logValidMsg(cdp, host, recv_reliable, recv_resent, (BOOL)(acks>0) ); - valid_packet = mTemplateMessageReader->readMessage(buffer, host); } |