#include "network_msg.h"
#include "network_common.h"
#include "player_remote.h"
+#include "world.h"
#include "world_sfd.h"
+#include "world_routes.h"
static void scores_update(void);
SteamAPI_ISteamUser_RequestEncryptedAppTicket( hSteamUser, NULL, 0 );
}
-#if 0
-static void send_score_request(void){
- vg_info( "Requesting scores\n" );
- netmsg_scores_request req;
- req.inetmsg_id = k_inetmsg_scores_request;
-
- SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
- hSteamNetworkingSockets, network_client.remote,
- &req, sizeof(netmsg_scores_request),
- k_nSteamNetworkingSend_Reliable, NULL );
-}
-
-static void send_score_update(void){
- vg_info( "Sending scores\n" );
- u32 size = sizeof(netmsg_set_score) +
- vg_list_size(track_infos)*sizeof(struct netmsg_score_record);
- netmsg_set_score *setscore = alloca( size );
- setscore->inetmsg_id = k_inetmsg_set_score;
-
- int count = 0;
- for( u32 i=0; i<vg_list_size(track_infos); i++ ){
- if( track_infos[i].push ){
- track_infos[i].push = 0;
-
-#if 0
- highscore_record *user_record = highscore_find_user_record( 0, i );
-
- if( !user_record ){
- vg_error( "No score set but tried to upload for track %u\n", i );
- continue;
- }
-#endif
- highscore_record *user_record = &track_infos[i].record;
-
- setscore->records[count].trackid = i;
- setscore->records[count].playerid = 0;
- setscore->records[count].points = user_record->points;
- setscore->records[count].time = user_record->time;
-
- count ++;
- }
- }
-
- if( count == 0 ) return;
- u32 send_size = sizeof(netmsg_set_score) +
- count*sizeof(struct netmsg_score_record);
- setscore->record_count = count;
-
- SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
- hSteamNetworkingSockets, network_client.remote, setscore, send_size,
- k_nSteamNetworkingSend_Reliable, NULL );
-}
-
-static void send_nickname(void){
- netmsg_set_nickname nick;
- nick.inetmsg_id = k_inetmsg_set_nickname;
-
- memset( nick.nickname, 0, 16 );
- vg_strncpy( steam_username_at_startup, nick.nickname, 16,
- k_strncpy_allow_cutoff );
-
- SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
- hSteamNetworkingSockets, network_client.remote,
- &nick, sizeof(netmsg_set_nickname),
- k_nSteamNetworkingSend_Reliable, NULL );
-
- network_client.name_update = 0;
-}
-#endif
-
-#if 0
-static void server_routine_update(void){
- send_score_update();
- send_score_request();
-}
-#endif
-
static void network_send_username(void){
netmsg_playerusername *update = alloca( sizeof(netmsg_playerusername)+
NETWORK_USERNAME_MAX );
}
static void network_send_request( netmsg_request *req, vg_msg *body,
- void (*callback)( netmsg_request *res,
- vg_msg *body )){
+ void (*callback)(
+ netmsg_request *res, vg_msg *body,
+ u64 userdata),
+ u64 userdata ){
u32 len = 0;
if( body ){
len = body->cur.co;
vg_pool_item( &network_client.request_pool, req->id );
pn->callback = callback;
pn->sendtime = vg.time_real;
+ pn->userdata = userdata;
}
else{
vg_error( "Unable to send request. Pool is full.\n" );
k_nSteamNetworkingSend_Reliable, NULL );
}
-static void network_scoreboard_callback( netmsg_request *res, vg_msg *body ){
- for( u32 i=0; i<13; i++ )
- sfd_encode( i, "" );
+static void network_scoreboard_callback( netmsg_request *res, vg_msg *body,
+ u64 userdata ){
+ world_instance *world = world_current_instance();
- if( res->status != k_request_status_ok ){
- char buf[32];
- vg_str s;
- vg_strnull( &s, buf, 32 );
- vg_strcat( &s, "Error: " );
- vg_strcati32( &s, res->status );
+ world_routes_recv_scoreboard( world, body, userdata, res->status );
+ if( userdata == world_sfd.active_route_board )
+ world_sfd_compile_active_scores();
+}
- sfd_encode( 4, buf );
- return;
- }
- u32 l = 0;
- if( vg_msg_seekframe( body, "rows" ) ){
- while( vg_msg_seekframe( body, NULL ) ){
- const char *username = vg_msg_getkvstr( body, "username" );
- sfd_encode( l ++, username );
- vg_msg_skip_frame( body );
- }
- }
-}
/* mod_uid: world mod uid,
* route_uid: run name (just a string)
- * week: 0 for all-time, n for week #
+ * week:
+ * 0 ALL TIME
+ * 1 CURRENT WEEK
+ * 2 ALL TIME + CURRENT WEEK
+ * .
+ * 10+ specific week index
*/
static void network_request_scoreboard( const char *mod_uid,
const char *route_uid,
- u32 week ){
+ u32 week, u64 userdata ){
if( !network_client.remote )
return;
netmsg_request *req = alloca( sizeof(netmsg_request) + 512 );
req->inetmsg_id = k_inetmsg_request;
- req->id = 0; /* TODO: pool allocatable */
vg_msg data;
vg_msg_init( &data, req->q, 512 );
vg_msg_wkvstr( &data, "mod", mod_uid );
vg_msg_wkvstr( &data, "route", route_uid );
vg_msg_wkvu32( &data, "week", week );
- network_send_request( req, &data, network_scoreboard_callback );
+ network_send_request( req, &data, network_scoreboard_callback, userdata );
+}
+
+static void network_publish_callback( netmsg_request *res, vg_msg *body,
+ u64 userdata ){
+ if( res->status != k_request_status_ok ){
+ vg_error( "Publish laptime, server error #%d\n", (i32)res->status );
+ }
+}
+
+static void network_publish_laptime( const char *mod_uid,
+ const char *route_uid, f64 lap_time ){
+ if( !network_client.remote )
+ return;
+
+ i32 time_centiseconds = lap_time * 100.0;
+
+ netmsg_request *req = alloca( sizeof(netmsg_request) + 512 );
+ req->inetmsg_id = k_inetmsg_request;
+
+ vg_msg data;
+ vg_msg_init( &data, req->q, 512 );
+ vg_msg_wkvstr( &data, "endpoint", "setlap" );
+ vg_msg_wkvstr( &data, "mod", mod_uid );
+ vg_msg_wkvstr( &data, "route", route_uid );
+ vg_msg_wkvi32( &data, "time", time_centiseconds );
+ network_send_request( req, &data, network_publish_callback, 0 );
}
static void network_request_rx_300_400( SteamNetworkingMessage_t *msg ){
if( res->id ){
struct network_request *pn =
vg_pool_item( &network_client.request_pool, res->id );
- pn->callback( res, body );
+ pn->callback( res, body, pn->userdata );
vg_pool_unwatch( &network_client.request_pool, res->id );
}
}
if( (type == k_netmsg_playeritem_world0) ||
(type == k_netmsg_playeritem_world1) ){
- addon_reg *reg = world_static.addon_hub;
-
- if( type == k_netmsg_playeritem_world1 )
- reg = world_static.addon_client;
+ enum world_purpose purpose = type - k_netmsg_playeritem_world0;
+ addon_reg *reg = world_static.instance_addons[ purpose ];
if( reg )
addon_alias_uid( ®->alias, item->uid );
static void network_connect(void){
/* Connect to server if not connected */
SteamNetworkingIPAddr remoteAddr;
-
-#ifdef SR_USE_LOCALHOST
- SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost( &remoteAddr, 27402 );
-#else
- const char *server_lon1 = "46.101.34.155:27402";
- SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, server_lon1 );
-#endif
- const char *server_lan = "192.168.1.32:27402";
- SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, server_lan );
+ SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr,
+ network_client.server_adress );
char buf[256];
SteamAPI_SteamNetworkingIPAddr_ToString( &remoteAddr, buf, 256, 1 );
hSteamNetworkingSockets, &remoteAddr, 0, NULL );
}
-static void on_inet_scoreboard( SteamNetworkingMessage_t *msg ){
- netmsg_scoreboard *sb = msg->m_pData;
-
- u32 base_size = sizeof(netmsg_scoreboard)-
- sizeof(struct netmsg_board)*vg_list_size(track_infos),
- expected = base_size+sizeof(struct netmsg_board)*sb->board_count;
-
- if( msg->m_cbSize != expected ){
- vg_error( "Server scoreboard was corrupted. Size: %u != %u\n",
- msg->m_cbSize, expected );
- }
- else{
- if( vg_list_size(track_infos) > sb->board_count )
- vg_warn( "Server is out of date, not enough boards recieved\n");
- else if( vg_list_size(track_infos) < sb->board_count )
- vg_warn( "Client out of date, server sent more boards than we have\n");
- else
- vg_success( "Recieved new scoreboards from server\n" );
-
- for( int i=0; i < vg_min(sb->board_count,vg_list_size(track_infos)); i++){
- scoreboard_client_data.boards[i] = sb->boards[i];
- highscores_board_printf( stdout, sb->boards[i].data, 10 );
- }
- }
-
-#if 0
- /* We dont need to stay on the server currently */
- SteamAPI_ISteamNetworkingSockets_CloseConnection(
- hSteamNetworkingSockets, network_client.remote, 0, NULL, 1 );
-#endif
-
- network_scores_updated = 1;
-}
-
static void poll_remote_connection(void){
SteamNetworkingMessage_t *messages[32];
int len;
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff