X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.c;h=da0be1e392e07fc65f7df722041a4c913e2af1a9;hb=6ba5c35d106d749a1ebafbd3cbe18c3a02f781d3;hp=b0ae67786542032c53b3ee7872d7e5357bdb9654;hpb=7e1fe6c7931ba4492aa10ac5eebc316b74fb5dac;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/network.c b/network.c index b0ae677..da0be1e 100644 --- a/network.c +++ b/network.c @@ -3,7 +3,9 @@ #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); @@ -55,83 +57,6 @@ static void request_auth_ticket(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; irecords[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 ); @@ -149,8 +74,10 @@ static void network_send_username(void){ } 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; @@ -171,6 +98,7 @@ static void network_send_request( netmsg_request *req, vg_msg *body, 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" ); @@ -186,43 +114,29 @@ static void network_send_request( netmsg_request *req, vg_msg *body, 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, "" ); - - 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 ); +static void network_scoreboard_callback( netmsg_request *res, vg_msg *body, + u64 userdata ){ + world_instance *world = world_current_instance(); - sfd_encode( 4, buf ); - return; - } + world_routes_recv_scoreboard( world, body, userdata, res->status ); + if( userdata == world_sfd.active_route_board ) + world_sfd_compile_active_scores(); +} - u32 l = 0; - if( vg_msg_seekframe( body, "rows" ) ){ - while( vg_msg_seekframe( body, NULL ) ){ - const char *username = vg_msg_getkvstr( body, "username" ); - if( username ) - sfd_encode( l ++, username ); - else - sfd_encode( l ++, "UNKNOWN USER" ); - - 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; @@ -235,10 +149,11 @@ static void network_request_scoreboard( const char *mod_uid, 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 ){ +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 ); } @@ -260,7 +175,7 @@ static void network_publish_laptime( const char *mod_uid, 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 ); + network_send_request( req, &data, network_publish_callback, 0 ); } static void network_request_rx_300_400( SteamNetworkingMessage_t *msg ){ @@ -288,7 +203,7 @@ 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 ); } } @@ -430,15 +345,8 @@ static void on_persona_state_change( CallbackMsg_t *msg ){ 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 ); @@ -448,40 +356,6 @@ static void network_connect(void){ 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;