X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=server.c;h=be3f2a9e0d10d6b52efd8cf3f252a82827c03d82;hb=6eb7d6fbfc16c66c1d237a9d593730e75203695c;hp=1f2863380ecf254a75f93797d110f72d39e32612;hpb=89032d64e2867adb66e4598a0c66d3e853a22bb0;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/server.c b/server.c index 1f28633..be3f2a9 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,6 @@ -// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved +/* + * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + */ /* * This server application requires steamclient.so to be present in the @@ -9,6 +11,7 @@ #define _DEFAULT_SOURCE #include #include +#include volatile sig_atomic_t sig_stop; @@ -34,6 +37,7 @@ static void *hSteamHTTP, static u8 steam_symetric_key[ k_nSteamEncryptedAppTicketSymmetricKeyLen ]; static HSteamNetPollGroup client_pollgroup; +#if 0 static void recieve_http( void *callresult, void *context ) { HTTPRequestCompleted_t *result = callresult; @@ -43,16 +47,17 @@ static void recieve_http( void *callresult, void *context ) SteamAPI_ISteamHTTP_GetHTTPResponseBodySize( hSteamHTTP, request, &size ); - u8 *buffer = malloc( size ); + u8 *buffer = vg_alloc( size ); SteamAPI_ISteamHTTP_GetHTTPResponseBodyData( hSteamHTTP, request, buffer, size ); buffer[size-1] = '\0'; vg_info( "%s\n", (char *)buffer ); - free( buffer ); + vg_free( buffer ); SteamAPI_ISteamHTTP_ReleaseHTTPRequest( hSteamHTTP, result->m_hRequest ); } +#endif static u64_steamid get_connection_authsteamid( SteamNetworkingMessage_t *msg ) { @@ -123,7 +128,7 @@ static void on_inet_auth( SteamNetworkingMessage_t *msg ) return; } - vg_log( "Attempting to verify user\n" ); + vg_low( "Attempting to verify user\n" ); if( msg->m_cbSize < sizeof(netmsg_auth) ) { @@ -142,7 +147,7 @@ static void on_inet_auth( SteamNetworkingMessage_t *msg ) } u8 decrypted[1024]; - u32 ticket_len; + u32 ticket_len = 1024; int success = SteamEncryptedAppTicket_BDecryptTicket( auth->ticket, auth->ticket_length, decrypted, @@ -330,8 +335,16 @@ int main( int argc, char *argv[] ) { signal( SIGINT, inthandler ); signal( SIGQUIT, inthandler ); + + /* TODO: Options to override, ammend, remove etc */ + + vg_set_mem_quota( 80*1024*1024 ); + vg_alloc_quota(); highscores_init( 250000, 10000 ); + + if( !highscores_read() ) + highscores_create_db(); steamworks_ensure_txt( "2103940" ); if( !vg_load_steam_symetric_key( "application_key", steam_symetric_key ) ) @@ -384,8 +397,8 @@ int main( int argc, char *argv[] ) hSteamHTTP, k_EHTTPMethodGET, "https://www.harrygodden.com/hello.txt" ); - steam_async *call1 = steam_new_async(); - call1->data = NULL; + vg_steam_async_call *call1 = vg_alloc_async_steam_api_call(); + call1->userdata = NULL; call1->p_handler = recieve_http; SteamAPI_ISteamHTTP_SendHTTPRequest( hSteamHTTP, test_req, &call1->id ); #endif @@ -418,7 +431,6 @@ int main( int argc, char *argv[] ) } highscores_serialize_all(); - highscores_free(); SteamAPI_ISteamNetworkingSockets_DestroyPollGroup( hSteamNetworkingSockets, client_pollgroup );