Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Limit the length of LocalPlayerName in the UI

Browse source 
In the network game protocol, the name of each player is at most 15
bytes of text + 1 byte for a terminating null character.  Don't let
the user type any more than that when starting or joining a network
game.
This commit is contained in:
kon 2011-10-02 08:05:32 +00:00
parent 2374d6ea49
commit c402b0f565
3 changed files with 22 additions and 5 deletions

10
include/netconnect.h
View file

@ -59,6 +59,12 @@
-- Declarations
----------------------------------------------------------------------------*/
/**
* Number of bytes in the name of a network player,
* including the terminating null character.
*/
#define NetPlayerNameSize 16
/**
** Network systems active in current game.
*/
@ -66,12 +72,12 @@ class CNetworkHost {
public:
unsigned char *Serialize() const;
void Deserialize(const unsigned char *p);
static size_t Size() { return 4+2+2+16; }
static size_t Size() { return 4+2+2+NetPlayerNameSize; }
Uint32 Host; /// Host address
Uint16 Port; /// Port on host
Uint16 PlyNr; /// Player nummer
char PlyName[16]; /// Name of player
char PlyName[NetPlayerNameSize]; /// Name of player
};
/**

3
tolua/network.pkg
View file

@ -30,11 +30,12 @@ class CServerSetup {
extern CServerSetup LocalSetupState;
extern CServerSetup ServerSetupState;
extern int NetLocalHostsSlot;
tolua_readonly int NetPlayerNameSize;
struct CNetworkHost {
unsigned long Host; /// Host address
unsigned short Port; /// Port on host
unsigned short PlyNr; /// Player nummer
char PlyName[16]; /// Name of player
char PlyName[NetPlayerNameSize]; /// Name of player
};
extern CNetworkHost Hosts[PlayerMax];

14
tolua/tolua.cpp
View file

@ -1,6 +1,6 @@
/*
** Lua binding: stratagus
** Generated automatically by tolua++-1.0.93 on Sun Oct 2 03:06:13 2011.
** Generated automatically by tolua++-1.0.93 on Sun Oct 2 03:18:19 2011.
*/
#ifndef __cplusplus
@ -12769,6 +12769,15 @@ static int tolua_set_NetLocalHostsSlot(lua_State* tolua_S)
}
#endif //#ifndef TOLUA_DISABLE
/* get function: NetPlayerNameSize */
#ifndef TOLUA_DISABLE_tolua_get_NetPlayerNameSize
static int tolua_get_NetPlayerNameSize(lua_State* tolua_S)
{
tolua_pushnumber(tolua_S,(lua_Number)NetPlayerNameSize);
return 1;
}
#endif //#ifndef TOLUA_DISABLE
/* get function: Host of class CNetworkHost */
#ifndef TOLUA_DISABLE_tolua_get_CNetworkHost_unsigned_Host
static int tolua_get_CNetworkHost_unsigned_Host(lua_State* tolua_S)
@ -12884,7 +12893,7 @@ static int tolua_set_CNetworkHost_PlyName(lua_State* tolua_S)
tolua_error(tolua_S,"#vinvalid type in variable assignment.",&tolua_err);
#endif
strncpy((char*)
self->PlyName,(const char*)tolua_tostring(tolua_S,2,0),16-1);
self->PlyName,(const char*)tolua_tostring(tolua_S,2,0),NetPlayerNameSize-1);
return 0;
}
#endif //#ifndef TOLUA_DISABLE
@ -20441,6 +20450,7 @@ TOLUA_API int tolua_stratagus_open (lua_State* tolua_S)
tolua_variable(tolua_S,"LocalSetupState",tolua_get_LocalSetupState,tolua_set_LocalSetupState);
tolua_variable(tolua_S,"ServerSetupState",tolua_get_ServerSetupState,tolua_set_ServerSetupState);
tolua_variable(tolua_S,"NetLocalHostsSlot",tolua_get_NetLocalHostsSlot,tolua_set_NetLocalHostsSlot);
tolua_variable(tolua_S,"NetPlayerNameSize",tolua_get_NetPlayerNameSize,NULL);
#ifdef __cplusplus
tolua_cclass(tolua_S,"CNetworkHost","CNetworkHost","",tolua_collect_CNetworkHost);
#else