Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[9599] armagetronad/trunk
|
From: <z-...@us...> - 2011-07-21 22:17:00
|
Revision: 9599
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9599&view=rev
Author: z-man
Date: 2011-07-21 22:16:54 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9596 to 9598:
------------------------------------------------------------------------
r9598 | bazaaarmagetron | 2011-07-21 23:55:20 +0200 (Thu, 21 Jul 2011) | 4 lines
author: Manuel Moos
Merging security fix:
Manuel Moos 2011-03-30 Fixing lenleft checks to avoid reading beyond the end of the message.
The actually relevant changes here were already implemented on trunk due to the new protobuf stuff.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9596&view=rev
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9596
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9598
Modified: armagetronad/trunk/armagetronad/src/network/nNetwork.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2011-07-21 21:55:20 UTC (rev 9598)
+++ armagetronad/trunk/armagetronad/src/network/nNetwork.cpp 2011-07-21 22:16:54 UTC (rev 9599)
@@ -2531,19 +2531,6 @@
nMessageBase::SendCollected(peer);
::sn_myNetID = idback;
- /*
- tJUST_CONTROLLED_PTR<nMessage> r = tNEW(nMessage)(login_accept);
- r->BendMessageID( cookie.first );
- r->SendImmediately(peer,false);
- r = tNEW(nMessage)(login_accept);
- r->BendMessageID( cookie.second );
- r->SendImmediately(peer,false);
- int idback = ::sn_myNetID;
- sn_myNetID = 1; // set a fake ID so the client doesn't consider the packet as a response from the server and messes up its ack data
- nMessage::SendCollected(peer);
- ::sn_myNetID = idback;
- */
-
// and ignore for now
continue;
}
@@ -2695,7 +2682,7 @@
}
catch(nKillHim)
{
- con << "nKillHim signal caught.\n";
+ con << "nKillHim signal caught: ";
sn_DisconnectUser(id, "$network_kill_error");
}
catch( tGenericException & e )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|