Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't broadcast to other players about a new player in NET_CreatePlayer(), we will only do NETBroadcastPlayerInfo() when a player has passed all the verification steps. 

This fixes ticket:1611

Correctly handle rejection of the verification process as well.

2.3:r10572

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10583 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2010-04-15 03:14:30 +00:00 committed by Git SVN Gateway
parent 71a9f27b40
commit 1d47645d07
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/netplay/netplay.c
View File

@ -443,7 +443,6 @@ static signed int NET_CreatePlayer(const char* name)
NET_InitPlayer(index, false); // re-init everything NET_InitPlayer(index, false); // re-init everything
NetPlay.players[index].allocated = true; NetPlay.players[index].allocated = true;
sstrcpy(NetPlay.players[index].name, name); sstrcpy(NetPlay.players[index].name, name);
NETBroadcastPlayerInfo(index);
NetPlay.playercount++; NetPlay.playercount++;
sync_counter.joins++; sync_counter.joins++;
return index; return index;
@ -2259,7 +2258,11 @@ static void NETallowJoining(void)
if (onBanList(clientAddress)) if (onBanList(clientAddress))
{ {
debug(LOG_INFO, "A player that you have kicked tried to rejoin the game, and was rejected. IP:%s", clientAddress); char buf[256] = {'\0'};
ssprintf(buf, "** A player that you have kicked tried to rejoin the game, and was rejected. IP:%s", clientAddress );
debug(LOG_INFO, buf);
NETlogEntry(buf, SYNC_FLAG, i);
SocketSet_DelSocket(tmp_socket_set, tmp_socket[i]); SocketSet_DelSocket(tmp_socket_set, tmp_socket[i]);
socketClose(tmp_socket[i]); socketClose(tmp_socket[i]);
tmp_socket[i] = NULL; tmp_socket[i] = NULL;
@ -2291,7 +2294,7 @@ static void NETallowJoining(void)
index = tmp; index = tmp;
debug(LOG_NET, "freeing temp socket %p (%d)", tmp_socket[i], __LINE__); debug(LOG_NET, "freeing temp socket %p (%d), creating permanent socket.", tmp_socket[i], __LINE__);
SocketSet_DelSocket(tmp_socket_set, tmp_socket[i]); SocketSet_DelSocket(tmp_socket_set, tmp_socket[i]);
NET_initBufferedSocket(connected_bsocket[index], tmp_socket[i]); NET_initBufferedSocket(connected_bsocket[index], tmp_socket[i]);
SocketSet_AddSocket(socket_set, connected_bsocket[index]->socket); SocketSet_AddSocket(socket_set, connected_bsocket[index]->socket);
@ -2320,7 +2323,11 @@ static void NETallowJoining(void)
if (rejected) if (rejected)
{ {
debug(LOG_INFO, "We were rejected, reason (%u)", (unsigned int) rejected); char buf[256] = {'\0'};
ssprintf(buf, "** This player %u, was rejected, error code: %u",(unsigned int) index, (unsigned int) rejected);
debug(LOG_INFO, buf);
NETlogEntry(buf, SYNC_FLAG, index);
NETbeginEncode(NET_REJECTED, index); NETbeginEncode(NET_REJECTED, index);
NETuint8_t(&rejected); NETuint8_t(&rejected);
NETend(); NETend();
@ -2342,6 +2349,9 @@ static void NETallowJoining(void)
NETlogEntry(buf, SYNC_FLAG, index); NETlogEntry(buf, SYNC_FLAG, index);
} }
// Broadcast to everyone that a new player has joined
NETBroadcastPlayerInfo(index);
NETbeginEncode(NET_ACCEPTED, index); NETbeginEncode(NET_ACCEPTED, index);
NETuint8_t(&index); NETuint8_t(&index);
NETend(); NETend();
@ -2803,17 +2813,16 @@ BOOL NETjoinGame(UDWORD gameNumber, const char* playername)
} }
else if (type == NET_REJECTED) else if (type == NET_REJECTED)
{ {
// :(
uint8_t rejection = 0; uint8_t rejection = 0;
NETbeginDecode(NET_REJECTED); NETbeginDecode(NET_REJECTED);
// WRY???
NETuint8_t(&rejection); NETuint8_t(&rejection);
NETend(); NETend();
debug(LOG_NET, "NET_REJECTED received. Better luck next time?"); debug(LOG_NET, "NET_REJECTED received. Error code: %u", (unsigned int) rejection);
setLobbyError((LOBBY_ERROR_TYPES)rejection); setLobbyError((LOBBY_ERROR_TYPES)rejection);
NETclose();
} }
} }
} }