small compression
[carveJwlIkooP6JGAAIwe30JlM.git] / gameserver.c
index e2082cb39fc77f82ff2d0664a235b2aad0cfa6f3..b7b809087c8e16c2a348891e0876ed7dfdea38b9 100644 (file)
@@ -9,14 +9,18 @@
 
 volatile sig_atomic_t sig_stop;
 
-static void inthandler( int signum ) {
-   sig_stop = 1;
-}
-
 #include "gameserver.h" 
 #include "highscores.c"
 #include "servermonitor_server.c"
 #include "vg/vg_opt.h"
+#include "network_common.h"
+#include "gameserver_db.h"
+#include "vg/vg_m.h"
+#include "vg/vg_msg.h"
+
+static void inthandler( int signum ) {
+   sig_stop = 1;
+}
 
 static const u64 k_connection_unauthorized = 0xffffffffffffffff;
 
@@ -49,35 +53,58 @@ static void gameserver_send_to_all( int ignore,
    }
 }
 
-static void gameserver_populate_join_msg( int index, netmsg_playerjoin *msg ){
-   memset( msg, 0, sizeof(*msg) );
-   msg->inetmsg_id = k_inetmsg_playerjoin;
-   msg->index = index;
-   vg_strncpy( gameserver.clients[index].username, msg->username, 
-               sizeof(msg->username), k_strncpy_always_add_null );
-}
-
 static void gameserver_player_join( int index ){
    struct gameserver_client *joiner = &gameserver.clients[index];
    
-   netmsg_playerjoin join;
-   gameserver_populate_join_msg( index, &join );
+   netmsg_playerjoin join = { .inetmsg_id = k_inetmsg_playerjoin,
+                              .index = index };
    gameserver_send_to_all( index, &join, sizeof(join),
                            k_nSteamNetworkingSend_Reliable );
 
    /* update the joining user about current connections */
+
+   netmsg_playerusername *username = 
+      alloca( sizeof(netmsg_playerusername) + NETWORK_USERNAME_MAX );
+   username->inetmsg_id = k_inetmsg_playerusername;
+
+   netmsg_playeritem *item = 
+      alloca( sizeof(netmsg_playeritem) + ADDON_UID_MAX );
+   item->inetmsg_id = k_inetmsg_playeritem;
+
    for( int i=0; i<vg_list_size(gameserver.clients); i++ ){
       struct gameserver_client *client = &gameserver.clients[i];
 
       if( (i==index) || !client->active )
          continue;
 
-      netmsg_playerjoin init;
-      gameserver_populate_join_msg( i, &init );
-
+      /* join */
+      netmsg_playerjoin init = { .inetmsg_id = k_inetmsg_playerjoin,
+                                 .index = i };
       SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
             hSteamNetworkingSockets, joiner->connection,
-            &join, sizeof(join), k_nSteamNetworkingSend_Reliable, NULL );
+            &init, sizeof(init), k_nSteamNetworkingSend_Reliable, NULL );
+
+      /* username */
+      username->index = i;
+      u32 chs = vg_strncpy( client->username, username->name, 
+                            NETWORK_USERNAME_MAX,
+                            k_strncpy_always_add_null );
+      u32 size = sizeof(netmsg_playerusername) + chs + 1;
+      SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+            hSteamNetworkingSockets, joiner->connection,
+            username, size, k_nSteamNetworkingSend_Reliable, NULL );
+
+      /* items */
+      for( int j=0; j<k_netmsg_playeritem_max; j++ ){
+         chs = vg_strncpy( client->items[j], item->uid, ADDON_UID_MAX, 
+                           k_strncpy_always_add_null );
+         item->type_index = j;
+         item->client = i;
+         size = sizeof(netmsg_playeritem) + chs + 1;
+         SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+               hSteamNetworkingSockets, joiner->connection,
+               item, size, k_nSteamNetworkingSend_Reliable, NULL );
+      }
    }
 }
 
@@ -115,6 +142,7 @@ static void new_client_connecting( HSteamNetConnection client ){
             hSteamNetworkingSockets, client );
    if( accept_status == k_EResultOK ){
       vg_success( "Accepted client (id: %u, index: %d)\n", client, index );
+      memset( &gameserver.clients[index], 0, sizeof(struct gameserver_client) );
 
       gameserver.clients[index].active = 1;
       gameserver.clients[index].connection = client;
@@ -293,91 +321,322 @@ 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;
 
+   int client_id = gameserver_client_index( msg->m_conn );
+   if( client_id == -1 ) return;
+
    if( tmp->inetmsg_id == k_inetmsg_playerusername ){
-      if( !packet_minsize( msg, sizeof(netmsg_playerusername) ))
+      if( !packet_minsize( msg, sizeof(netmsg_playerusername)+1 ))
          return;
       
-      int client_id = gameserver_client_index( msg->m_conn );
-      if( client_id != -1 ){
-         struct gameserver_client *client = &gameserver.clients[ client_id ];
-         netmsg_playerusername *src = msg->m_pData;
-
-         vg_strncpy( src->username, client->username, sizeof(client->username),
-                     k_strncpy_always_add_null );
-
-         /* update other users about this change */
-         netmsg_playerusername msg;
-         memset( &msg, 0, sizeof(msg) );
-         msg.inetmsg_id = k_inetmsg_playerusername;
-         msg.index = client_id;
-         vg_strncpy( client->username, msg.username, sizeof(msg.username),
-                     k_strncpy_always_add_null );
-
-         gameserver_send_to_all( client_id, &msg, sizeof(msg), 
-                                 k_nSteamNetworkingSend_Reliable );
+      struct gameserver_client *client = &gameserver.clients[ client_id ];
+      netmsg_playerusername *src = msg->m_pData;
+
+      u32 name_len = network_msgstring( src->name, msg->m_cbSize, 
+                                        sizeof(netmsg_playerusername),
+                                        client->username, 
+                                        NETWORK_USERNAME_MAX );
+
+      /* update other users about this change */
+      netmsg_playerusername *prop = alloca(sizeof(netmsg_playerusername)+
+                                             NETWORK_USERNAME_MAX );
+                                           
+      prop->inetmsg_id = k_inetmsg_playerusername;
+      prop->index = client_id;
+      u32 chs = vg_strncpy( client->username, prop->name, NETWORK_USERNAME_MAX,
+                            k_strncpy_always_add_null );
+
+      vg_info( "client #%d changed name to: %s\n", client_id, prop->name );
+
+      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 */
+      netmsg_playerframe *frame = alloca(msg->m_cbSize);
+      memcpy( frame, msg->m_pData, msg->m_cbSize );
+      frame->client = client_id;
+      gameserver_send_to_all( client_id, frame, msg->m_cbSize, 
+                              k_nSteamNetworkingSend_Unreliable );
+   }
+   else if( tmp->inetmsg_id == k_inetmsg_playeritem ){
+      netmsg_playeritem *item = msg->m_pData;
+
+      /* record */
+      struct gameserver_client *client = &gameserver.clients[ client_id ];
+
+      if( item->type_index >= k_netmsg_playeritem_max ){
+         vg_warn( "Client #%d invalid equip type %u\n", 
+                  client_id, (u32)item->type_index );
+         return;
       }
+      
+      char *dest = client->items[ item->type_index ];
+
+      network_msgstring( item->uid, msg->m_cbSize, sizeof(netmsg_playeritem),
+                         dest, ADDON_UID_MAX );
+
+      vg_info( "Client #%d equiped: [%s] %s\n", 
+               client_id, 
+               (const char *[]){[k_netmsg_playeritem_board]="board",
+                                [k_netmsg_playeritem_player]="player",
+                                [k_netmsg_playeritem_world0]="world0",
+                                [k_netmsg_playeritem_world1]="world1"
+               }[item->type_index], item->uid );
+                           
+      /* propogate */
+      netmsg_playeritem *prop = alloca(msg->m_cbSize);
+      memcpy( prop, msg->m_pData, msg->m_cbSize );
+      prop->client = client_id;
+      gameserver_send_to_all( client_id, prop, msg->m_cbSize, 
+                              k_nSteamNetworkingSend_Reliable );
+   }
+   else {
+      vg_warn( "Unknown inetmsg_id recieved from client. (%u)\n",
+               tmp->inetmsg_id );
    }
 }
 
-#if 0
-static void on_inet_score_request( SteamNetworkingMessage_t *msg ){
-   if( !inet_require_auth(msg) ) return;
+static void gameserver_request_respond( enum request_status status,
+                                        netmsg_request *res, vg_msg *body,
+                                        SteamNetworkingMessage_t *msg ){
+   int client_id = gameserver_client_index( msg->m_conn );
+   u32 len = 0;
+   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;
 
    SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
-         hSteamNetworkingSockets, msg->m_conn, 
-         &scoreboard_client_data, sizeof(netmsg_scoreboard),
+         hSteamNetworkingSockets, msg->m_conn,
+         res, sizeof(netmsg_request) + len,
          k_nSteamNetworkingSend_Reliable, NULL );
+   SteamAPI_SteamNetworkingMessage_t_Release( msg );
 }
 
-static void on_inet_set_nickname( SteamNetworkingMessage_t *msg ){
-   if(!inet_require_auth(msg)) return;
+struct user_request_thread_data {
+   SteamNetworkingMessage_t *msg;
+};
 
-   u64_steamid steamid = get_connection_authsteamid(msg);
-   netmsg_set_nickname *setnick = msg->m_pData;
-   if( msg->m_cbSize < sizeof(netmsg_set_nickname) ){
-      vg_warn( "Invalid nickname request from client: %u, steamid: %lu\n", 
-            msg->m_conn, steamid );
-      return;
+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;
+      }
    }
-   
-   highscore_set_user_nickname( steamid, setnick->nickname );
+
+   sqlite3_finalize( stmt );
+   vg_msg_end_frame( msg );
+   return k_request_status_ok;
 }
 
-static void on_inet_set_score( SteamNetworkingMessage_t *msg ){
-   if(!inet_require_auth(msg)) return;
+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;
 
-   u64_steamid steamid = get_connection_authsteamid(msg);
-   
-   if( msg->m_cbSize < sizeof(netmsg_set_score) ){
-      vg_warn( "Invalid set score post from client: %u, steamid: %lu\n",
-            msg->m_conn, steamid );
+   int client_id = gameserver_client_index( msg->m_conn );
+   if( client_id == -1 ){
+      SteamAPI_SteamNetworkingMessage_t_Release( msg );
+      return;
+   }
+
+   netmsg_request *req = (netmsg_request *)msg->m_pData;
+   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;
+   vg_msg_init( &body, res->q, 512 );
+
+   const char *endpoint = vg_msg_getkvstr( &data, "endpoint" );
+
+   if( !endpoint ){
+      gameserver_request_respond( k_request_status_invalid_endpoint,
+                                  res, NULL, msg );
       return;
    }
 
-   netmsg_set_score *info = msg->m_pData;
+   if( !strcmp( endpoint, "scoreboard" ) ){
+      const char *mod = vg_msg_getkvstr( &data, "mod" );
+      const char *route = vg_msg_getkvstr( &data, "route" );
+      u32 week = vg_msg_getkvu32( &data, "week", 0 );
+      
+      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" );
+
+      if( body.error != k_vg_msg_error_OK ){
+         gameserver_request_respond( k_request_status_out_of_memory,
+                                     res, NULL, msg );
+         return;
+      }
+
+      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;
+      }
+
+      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 ];
+
+      u32 week = gameserver_get_current_week();
+
+      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;
+      }
+
+      i32 centiseconds = vg_msg_getkvi32( &data, "time", -1 );
+      if( centiseconds < 5*100 ){
+         gameserver_request_respond( k_request_status_client_error,
+                                     res, NULL, msg );
+         return;
+      }
+
+      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,
+                                  res, NULL, msg );
+   }
+}
 
-   if( msg->m_cbSize < sizeof(netmsg_set_score) +
-                       sizeof(struct netmsg_score_record)*info->record_count ){
-      vg_warn( "Malformed set score post from client: %u, steamid: %lu\n",
-            msg->m_conn, steamid );
+static void gameserver_rx_300_400( SteamNetworkingMessage_t *msg ){
+   netmsg_blank *tmp = msg->m_pData;
+
+   int client_id = gameserver_client_index( msg->m_conn );
+   if( client_id == -1 ){
+      SteamAPI_SteamNetworkingMessage_t_Release( msg );
       return;
    }
 
-   for( int i=0; i<info->record_count; i++ ){
-      highscore_record temp;
-      temp.trackid  = info->records[i].trackid;
-      temp.datetime = time(NULL);
-      temp.playerid = steamid;
-      temp.points   = info->records[i].points;
-      temp.time     = info->records[i].time;
+   if( tmp->inetmsg_id == k_inetmsg_request ){
+      if( !packet_minsize( msg, sizeof(netmsg_request)+1 ))
+         return;
 
-      highscores_push_record( &temp );
+      db_request *call = db_alloc_request( 
+                           sizeof(struct user_request_thread_data) );
+      struct user_request_thread_data *inf = (void *)call->data;
+      inf->msg = msg;
+      call->handler = gameserver_process_user_request;
+      db_send_request( call );
+   }
+   else {
+      vg_warn( "Unknown inetmsg_id recieved from client. (%u)\n",
+               tmp->inetmsg_id );
+      SteamAPI_SteamNetworkingMessage_t_Release( msg );
    }
 }
-#endif
 
 static void poll_connections(void){
    SteamNetworkingMessage_t *messages[32];
@@ -404,28 +663,20 @@ static void poll_connections(void){
 
          if( (tmp->inetmsg_id >= 200) && (tmp->inetmsg_id < 300) ){
             gameserver_rx_200_300( msg );
+            SteamAPI_SteamNetworkingMessage_t_Release( msg );
+         }
+         else if( (tmp->inetmsg_id >= 300) && (tmp->inetmsg_id < 400) ){
+            gameserver_rx_300_400( msg );
          }
          else{
             if( tmp->inetmsg_id == k_inetmsg_auth )
                gameserver_rx_auth( msg );
-#if 0
-            else if( tmp->inetmsg_id == k_inetmsg_scores_request )
-               on_inet_score_request( msg );
-            else if( tmp->inetmsg_id == k_inetmsg_set_nickname )
-               on_inet_set_nickname( msg );
-            else if( tmp->inetmsg_id == k_inetmsg_set_score )
-               on_inet_set_score( msg );
-            else if( tmp->inetmsg_id == k_inetmsg_playerframe )
-               on_inet_playerframe( msg );
-#endif
             else {
                vg_warn( "Unknown inetmsg_id recieved from client. (%u)\n",
                         tmp->inetmsg_id );
             }
+            SteamAPI_SteamNetworkingMessage_t_Release( msg );
          }
-
-
-         SteamAPI_SteamNetworkingMessage_t_Release( msg );
       }
    }
 }
@@ -434,22 +685,17 @@ static u64 seconds_to_server_ticks( double s ){
    return s / 0.01;
 }
 
-static void generate_boards(void){
-   FILE *fp = fopen( "www/html/srhighscores.txt", "w" );
-
-   if( !fp ){
-      vg_error( "Can't write boards to www/html/srhighscores.txt\n" );
-      return;
-   }
-
-   for( int i=0; i<vg_list_size(track_infos); i++ ){
-      struct netmsg_board *board = &scoreboard_client_data.boards[i];
-
-      highscores_board_generate( board->data, i, 10 );
-      highscores_board_printf( fp, board->data, 10 );
+static void test_runner( db_request *req ){
+   vg_warn( "RUNNER\n" );
+   char table[DB_TABLE_UID_MAX];
+   if( db_get_highscore_table_name( "sr002-local-mp_mtzero", 
+                                    "Coastal Run", 0, table ) ){
+      if( db_writeusertime( table, 76561198072130043, 232, 1 ) ){
+         vg_success( "Written time\n" );
+         i32 v = db_readusertime( table, 76561198072130043 );
+         vg_success( "Returned time: %u\n", v );
+      }
    }
-
-   fclose( fp );
 }
 
 int main( int argc, char *argv[] ){
@@ -461,20 +707,25 @@ int main( int argc, char *argv[] ){
    while( vg_argp( argc, argv ) ){
       if( vg_long_opt( "noauth" ) )
          gameserver.auth_mode = eServerModeNoAuthentication;
+
+      /* TODO: Options to override, ammend, remove etc */
    }
    
-   /* 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();
+   db_init();
+   db_request *req = db_alloc_request(0);
+   if( req ){
+      req->handler = test_runner;
+      db_send_request(req);
+   }
 
-   steamworks_ensure_txt( "2103940" );
+   monitor_start_server(); /* UNIX socket monitor */
 
+   /* steamworks init 
+    * --------------------------------------------------------------- */
+   steamworks_ensure_txt( "2103940" );
    if( gameserver.auth_mode == eServerModeAuthentication ){
       if( !vg_load_steam_symetric_key( "application_key", 
                                        gameserver.app_symmetric_key )){
@@ -485,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;
@@ -496,15 +747,9 @@ int main( int argc, char *argv[] ){
 
    SteamAPI_ManualDispatch_Init();
    HSteamPipe hsteampipe = SteamGameServer_GetHSteamPipe();
-
-   //hSteamHTTP = SteamAPI_SteamGameServerHTTP();
    hSteamNetworkingSockets = 
       SteamAPI_SteamGameServerNetworkingSockets_SteamAPI();
 
-   /* 
-    * Server code
-    */
-
    steam_register_callback( k_iSteamNetAuthenticationStatus, on_auth_status );
    steam_register_callback( k_iSteamNetConnectionStatusChangedCallBack,
                              on_connect_status );
@@ -515,11 +760,10 @@ int main( int argc, char *argv[] ){
    /*
     * Create a listener
     */
-
    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 );
@@ -531,9 +775,6 @@ int main( int argc, char *argv[] ){
        last_scoreboard_gen = 0,
        last_monitor_heartbeat = 0;
 
-   generate_boards();
-   monitor_start_server();
-
    while( !sig_stop ){
       monitor_event_loop();
       steamworks_event_loop( hsteampipe );
@@ -548,19 +789,10 @@ int main( int argc, char *argv[] ){
          monitor_heartbeat();
       }
 
-      if( server_ticks > last_scoreboard_gen + seconds_to_server_ticks(60.0) ){
-         last_scoreboard_gen = server_ticks;
-         generate_boards();
-      }
-
-      if( server_ticks > last_record_save + seconds_to_server_ticks(10.0*60.0)){
-         last_record_save = server_ticks;
-         highscores_serialize_all();
-      }
+      if( db_killed() )
+         break;
    }
    
-   highscores_serialize_all();
-   
    SteamAPI_ISteamNetworkingSockets_DestroyPollGroup( hSteamNetworkingSockets,
          gameserver.client_group );
    SteamAPI_ISteamNetworkingSockets_CloseListenSocket( 
@@ -568,6 +800,8 @@ int main( int argc, char *argv[] ){
    
    vg_info( "Shutting down\n..." );
    SteamGameServer_Shutdown();
+   db_kill();
+   db_free();
 
    return 0;
 }