X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=gameserver.c;h=b7b809087c8e16c2a348891e0876ed7dfdea38b9;hb=137d40d96fe923600d8378b8e138e3c276f27ff4;hp=b90a4a8a34905c337709985477ebcab5913fbb2a;hpb=a7d144c7905105909cc4434e0ab43008bbb8f89f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gameserver.c b/gameserver.c index b90a4a8..b7b8090 100644 --- a/gameserver.c +++ b/gameserver.c @@ -321,6 +321,24 @@ static int packet_minsize( SteamNetworkingMessage_t *msg, u32 size ){ } } +struct db_set_username_thread_data { + u64 steamid; + char username[ NETWORK_USERNAME_MAX ]; +}; + +static void gameserver_update_db_username( db_request *db_req ){ + struct db_set_username_thread_data *inf = (void *)db_req->data; + + if( inf->steamid == k_connection_unauthorized ) + return; + + int admin = 0; + if( inf->steamid == 76561198072130043 ) + admin = 2; + + db_updateuser( inf->steamid, inf->username, admin ); +} + static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){ netmsg_blank *tmp = msg->m_pData; @@ -353,6 +371,16 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){ u32 propsize = sizeof(netmsg_playerusername) + chs + 1; gameserver_send_to_all( client_id, prop, propsize, k_nSteamNetworkingSend_Reliable ); + + /* update database about this */ + db_request *call = db_alloc_request( + sizeof(struct db_set_username_thread_data) ); + struct db_set_username_thread_data *inf = (void *)call->data; + inf->steamid = get_connection_authsteamid( msg ); + vg_strncpy( client->username, inf->username, + sizeof(inf->username), k_strncpy_always_add_null ); + call->handler = gameserver_update_db_username; + db_send_request( call ); } else if( tmp->inetmsg_id == k_inetmsg_playerframe ){ /* propogate */ @@ -405,14 +433,10 @@ static void gameserver_request_respond( enum request_status status, SteamNetworkingMessage_t *msg ){ int client_id = gameserver_client_index( msg->m_conn ); u32 len = 0; - if( status == k_request_status_ok ){ - len = body->len; - - vg_success( "[%d#%d] Response: %d\n", client_id, (i32)res->id, status ); - vg_msg_print( body ); - } - else{ - vg_warn( "[%d#%d] Response: %d\n", client_id, (i32)res->id, status ); + if( body ){ + len = body->cur.co; + vg_low( "[%d#%d] Response: %d\n", client_id, (i32)res->id, status ); + vg_msg_print( body, len ); } res->status = status; @@ -428,6 +452,66 @@ struct user_request_thread_data { SteamNetworkingMessage_t *msg; }; +static u32 gameserver_get_current_week(void){ + return time(NULL) / (7*24*60*60); +} + +static enum request_status gameserver_cat_table( + vg_msg *msg, + const char *mod, const char *route, u32 week, const char *alias ) +{ + char table_name[ DB_TABLE_UID_MAX ]; + if( !db_get_highscore_table_name( mod, route, week, table_name ) ) + return k_request_status_out_of_memory; + + char buf[512]; + vg_str q; + vg_strnull( &q, buf, 512 ); + vg_strcat( &q, "SELECT * FROM \"" ); + vg_strcat( &q, table_name ); + vg_strcat( &q, "\" ORDER BY time DESC LIMIT 10;" ); + if( !vg_strgood(&q) ) + return k_request_status_out_of_memory; + + sqlite3_stmt *stmt = db_stmt( q.buffer ); + if( !stmt ) + return k_request_status_database_error; + + vg_msg_frame( msg, alias ); + for( u32 i=0; i<10; i ++ ){ + int fc = sqlite3_step( stmt ); + + if( fc == SQLITE_ROW ){ + i32 time = sqlite3_column_int( stmt, 1 ); + i64 steamid_i64 = sqlite3_column_int64( stmt, 0 ); + u64 steamid = *((u64 *)&steamid_i64); + + if( steamid == k_connection_unauthorized ) + continue; + + vg_msg_frame( msg, "" ); + vg_msg_wkvu32( msg, "time", time ); + vg_msg_wkvu64( msg, "steamid", steamid ); + + char username[32]; + if( db_getuserinfo( steamid, username, sizeof(username), NULL ) ) + vg_msg_wkvstr( msg, "username", username ); + vg_msg_end_frame( msg ); + } + else if( fc == SQLITE_DONE ){ + break; + } + else { + log_sqlite3( fc ); + break; + } + } + + sqlite3_finalize( stmt ); + vg_msg_end_frame( msg ); + return k_request_status_ok; +} + static void gameserver_process_user_request( db_request *db_req ){ struct user_request_thread_data *inf = (void *)db_req->data; SteamNetworkingMessage_t *msg = inf->msg; @@ -439,20 +523,17 @@ static void gameserver_process_user_request( db_request *db_req ){ } netmsg_request *req = (netmsg_request *)msg->m_pData; - vg_msg data = {0}; - data.buf = req->q; - data.len = msg->m_cbSize - sizeof(netmsg_request); - data.max = data.len; + vg_msg data; + vg_msg_init( &data, req->q, msg->m_cbSize - sizeof(netmsg_request) ); /* create response packet */ netmsg_request *res = alloca( sizeof(netmsg_request) + 512 ); res->inetmsg_id = k_inetmsg_response; res->id = req->id; - vg_msg body = {0}; - body.buf = res->q; - body.max = 512; + vg_msg body; + vg_msg_init( &body, res->q, 512 ); - const char *endpoint = vg_msg_seekkvstr( &data, "endpoint", 0 ); + const char *endpoint = vg_msg_getkvstr( &data, "endpoint" ); if( !endpoint ){ gameserver_request_respond( k_request_status_invalid_endpoint, @@ -461,76 +542,68 @@ static void gameserver_process_user_request( db_request *db_req ){ } if( !strcmp( endpoint, "scoreboard" ) ){ - const char *mod = vg_msg_seekkvstr( &data, "mod", 0 ); - const char *route = vg_msg_seekkvstr( &data, "route", 0 ); - u32 week = vg_msg_seekkvu32( &data, "week", 0 ); + const char *mod = vg_msg_getkvstr( &data, "mod" ); + const char *route = vg_msg_getkvstr( &data, "route" ); + u32 week = vg_msg_getkvu32( &data, "week", 0 ); - char table_name[ DB_TABLE_UID_MAX ]; - if( !db_get_highscore_table_name( mod, route, week, table_name ) ){ - gameserver_request_respond( k_request_status_out_of_memory, - res, NULL, msg ); - return; + if( week == NETWORK_LEADERBOARD_CURRENT_WEEK ){ + gameserver_cat_table( &body, mod, route, + gameserver_get_current_week(), "rows_weekly" ); + } + else if( week == NETWORK_LEADERBOARD_ALLTIME_AND_CURRENT_WEEK ){ + gameserver_cat_table( &body, mod, route, 0, "rows" ); + gameserver_cat_table( &body, mod, route, + gameserver_get_current_week(), "rows_weekly" ); } + else + gameserver_cat_table( &body, mod, route, week, "rows" ); - char buf[512]; - vg_str q; - vg_strnull( &q, buf, 512 ); - vg_strcat( &q, "SELECT * FROM \"" ); - vg_strcat( &q, table_name ); - vg_strcat( &q, "\" ORDER BY time DESC LIMIT 10;" ); - if( !vg_strgood(&q) ) { + if( body.error != k_vg_msg_error_OK ){ gameserver_request_respond( k_request_status_out_of_memory, res, NULL, msg ); return; } - sqlite3_stmt *stmt = db_stmt( q.buffer ); - - if( !stmt ){ - gameserver_request_respond( k_request_status_database_error, + gameserver_request_respond( k_request_status_ok, res, &body, msg ); + } + else if( !strcmp( endpoint, "setlap" ) ){ + /* TODO: we can change userdata to be the client ID and store that in + * the client structure. it also would save us scanning the + * client array over and over..? + */ + u64 steamid = get_connection_authsteamid( msg ); + if( steamid == k_connection_unauthorized ){ + gameserver_request_respond( k_request_status_unauthorized, res, NULL, msg ); return; } - vg_msg_frame( &body, "rows" ); - for( u32 i=0; i<10; i ++ ){ - int fc = sqlite3_step( stmt ); - - if( fc == SQLITE_ROW ){ - i32 time = sqlite3_column_int( stmt, 1 ); - i64 steamid_i64 = sqlite3_column_int64( stmt, 0 ); - u64 steamid = *((u64 *)&steamid_i64); + const char *mod = vg_msg_getkvstr( &data, "mod" ); + const char *route = vg_msg_getkvstr( &data, "route" ); + + char weekly_table[ DB_TABLE_UID_MAX ], + alltime_table[ DB_TABLE_UID_MAX ]; - vg_msg_frame( &body, "" ); - vg_msg_wkvu32( &body, "time", time ); - vg_msg_wkvu64( &body, "steamid", steamid ); + u32 week = gameserver_get_current_week(); - char username[32]; - if( db_getuserinfo( steamid, username, sizeof(username), NULL ) ){ - vg_msg_wkvstr( &body, "username", username ); - } - - vg_msg_end_frame( &body ); - } - else if( fc == SQLITE_DONE ){ - break; - } - else { - log_sqlite3( fc ); - break; - } + if( !db_get_highscore_table_name( mod, route, 0, alltime_table ) || + !db_get_highscore_table_name( mod, route, week, weekly_table ) ){ + gameserver_request_respond( k_request_status_out_of_memory, + res, NULL, msg ); + return; } - sqlite3_finalize( stmt ); - vg_msg_end_frame( &body ); - - if( body.error != k_vg_msg_error_OK ){ - gameserver_request_respond( k_request_status_out_of_memory, + i32 centiseconds = vg_msg_getkvi32( &data, "time", -1 ); + if( centiseconds < 5*100 ){ + gameserver_request_respond( k_request_status_client_error, res, NULL, msg ); return; } - gameserver_request_respond( k_request_status_ok, res, &body, msg ); + db_writeusertime( alltime_table, steamid, centiseconds, 1 ); + db_writeusertime( weekly_table, steamid, centiseconds, 1 ); + + gameserver_request_respond( k_request_status_ok, res, NULL, msg ); } else{ gameserver_request_respond( k_request_status_invalid_endpoint, @@ -663,7 +736,7 @@ int main( int argc, char *argv[] ){ vg_warn( "Running without user authentication.\n" ); } - if( !SteamGameServer_Init( 0, 27400, 27401, + if( !SteamGameServer_Init( 0, NETWORK_PORT, NETWORK_PORT+1, gameserver.auth_mode, "1.0.0.0" ) ){ vg_error( "SteamGameServer_Init failed\n" ); return 0; @@ -690,7 +763,7 @@ int main( int argc, char *argv[] ){ HSteamListenSocket listener; SteamNetworkingIPAddr localAddr; SteamAPI_SteamNetworkingIPAddr_Clear( &localAddr ); - localAddr.m_port = 27402; + localAddr.m_port = NETWORK_PORT; listener = SteamAPI_ISteamNetworkingSockets_CreateListenSocketIP( hSteamNetworkingSockets, &localAddr, 0, NULL );