Skip to content

[All Games; ServerBrowser] Use 64bit time_t instead of 32bit unsigned int to store timestamps #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SanyaSho wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

[All Games; ServerBrowser] Use 64bit time_t instead of 32bit unsigned int to store timestamps #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/common/ServerBrowser/blacklisted_server_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ int CBlacklistedServerManager::LoadServersFromFile( const char *pszFilename, boo
{
const char *pszName = pData->GetString( "name" );

uint32 ulDate = pData->GetInt( "date" );
time_t ulDate = pData->GetUint64( "date" );
if ( bResetTimes )
{
time_t today;
Expand Down Expand Up @@ -90,7 +90,7 @@ void CBlacklistedServerManager::SaveToFile( const char *pszFilename )
{
KeyValues *pSubKey = new KeyValues( "server" );
pSubKey->SetString( "name", m_Blacklist[i].m_szServerName );
pSubKey->SetInt( "date", m_Blacklist[i].m_ulTimeBlacklistedAt );
pSubKey->SetUint64( "date", m_Blacklist[i].m_ulTimeBlacklistedAt );
pSubKey->SetString( "addr", m_Blacklist[i].m_NetAdr.ToString() );
pKV->AddSubKey( pSubKey );
}
Expand Down Expand Up @@ -155,7 +155,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverNa
//-----------------------------------------------------------------------------
// Purpose: Add the given server to the blacklist. Return added server.
//-----------------------------------------------------------------------------
blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverName, const char *netAddressString, uint32 timestamp )
blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverName, const char *netAddressString, time_t timestamp )
{
netadr_t netAdr( netAddressString );

Expand Down
4 changes: 2 additions & 2 deletions src/common/ServerBrowser/blacklisted_server_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct blacklisted_server_t
{
int m_nServerID;
char m_szServerName[64];
uint32 m_ulTimeBlacklistedAt;
time_t m_ulTimeBlacklistedAt;
netadr_t m_NetAdr;
};

Expand All @@ -40,7 +40,7 @@ class CBlacklistedServerManager

blacklisted_server_t *AddServer( gameserveritem_t &server );
blacklisted_server_t *AddServer( const char *serverName, uint32 serverIP, int serverPort );
blacklisted_server_t *AddServer( const char *serverName, const char *netAddressString, uint32 timestamp );
blacklisted_server_t *AddServer( const char *serverName, const char *netAddressString, time_t timestamp );

void RemoveServer( int iServerID ); // remove server with matching 'server id' from list

Expand Down