Thread: [Opentnl-cvs] tnl/zap main.cpp,1.2,1.3 masterConnection.cpp,1.1,1.2
Brought to you by:
mark_frohnmayer,
s_alanet
From: Mark F. <mar...@us...> - 2004-04-20 23:37:37
|
Update of /cvsroot/opentnl/tnl/zap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23375/zap Modified Files: main.cpp masterConnection.cpp Log Message: Fixed master server Index: main.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/main.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** main.cpp 20 Apr 2004 22:18:48 -0000 1.2 --- main.cpp 20 Apr 2004 23:37:26 -0000 1.3 *************** *** 50,54 **** const char *gHostName = "ZAP Game"; U32 gMaxPlayers = 128; ! const char *gMasterAddressString = "IP:master.garagegames.com:29002"; Address gMasterAddress; --- 50,54 ---- const char *gHostName = "ZAP Game"; U32 gMaxPlayers = 128; ! const char *gMasterAddressString = "IP:master.opentnl.org:29002"; Address gMasterAddress; Index: masterConnection.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/masterConnection.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** masterConnection.cpp 20 Apr 2004 04:27:20 -0000 1.1 --- masterConnection.cpp 20 Apr 2004 23:37:26 -0000 1.2 *************** *** 117,125 **** c2mAcceptArrangedConnection(requestId, localAddress, b); GameConnection *conn = new GameConnection(); - Vector<Address> fullPossibleAddresses; for(S32 i = 0; i < possibleAddresses.size(); i++) fullPossibleAddresses.push_back(Address(possibleAddresses[i])); logprintf("Accepting arranged connection from %s", Address(fullPossibleAddresses[0]).toString()); logprintf(" Generated shared secret data: %s", b.encodeBase64()->getBuffer()); --- 117,126 ---- c2mAcceptArrangedConnection(requestId, localAddress, b); GameConnection *conn = new GameConnection(); Vector<Address> fullPossibleAddresses; for(S32 i = 0; i < possibleAddresses.size(); i++) fullPossibleAddresses.push_back(Address(possibleAddresses[i])); + conn->setNetAddress(fullPossibleAddresses[0]); + logprintf("Accepting arranged connection from %s", Address(fullPossibleAddresses[0]).toString()); logprintf(" Generated shared secret data: %s", b.encodeBase64()->getBuffer()); |