[Opentnl-cvs] tnl/zap masterConnection.cpp,1.14,1.15

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/zap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5682/zap

Modified Files:
	masterConnection.cpp 
Log Message:
Fixed Zap dedicated server crash when MOTD arrives
Symmetric cipher can be created from any size byte buffer (not all zeroes if size isn't exactly right)
Arranged NetConnection can now use the arranged secret data as the shared secret data for encryption purposes

Index: masterConnection.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/masterConnection.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** masterConnection.cpp	22 Feb 2005 09:46:36 -0000	1.14
--- masterConnection.cpp	28 Apr 2005 20:42:55 -0000	1.15
***************
*** 142,146 ****
  
     conn->connectArranged(getInterface(), fullPossibleAddresses,
!       nonce, serverNonce, theSharedData,false);
  }
  
--- 142,146 ----
  
     conn->connectArranged(getInterface(), fullPossibleAddresses,
!       nonce, serverNonce, theSharedData,false, false, false, true);
  }
  
***************
*** 175,179 ****
  
        conn->connectArranged(getInterface(), fullPossibleAddresses,
!          nonce, serverNonce, theSharedData,true);
     }
  }
--- 175,179 ----
  
        conn->connectArranged(getInterface(), fullPossibleAddresses,
!          nonce, serverNonce, theSharedData,true, false, false, true);
     }
  }
***************
*** 191,195 ****
  TNL_IMPLEMENT_RPC_OVERRIDE(MasterServerConnection, m2cSetMOTD, (StringPtr motdString))
  {
!    gMainMenuUserInterface.setMOTD(motdString);
  }
  
--- 191,196 ----
  TNL_IMPLEMENT_RPC_OVERRIDE(MasterServerConnection, m2cSetMOTD, (StringPtr motdString))
  {
!    if(!mIsGameServer)
!       gMainMenuUserInterface.setMOTD(motdString);
  }