X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.h;h=d7c9be0ad713b3c41de6b197b46c3502fe32b5d0;hb=5ecf9cca8b5b9bf876d7e7c7fde03d5b187bb42b;hp=1644982917a49d4b5d08e7bf1abb72bfaf396f40;hpb=0945c6c301e38138b6ac54a02d5b3aea602de526;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/network.h b/network.h index 1644982..d7c9be0 100644 --- a/network.h +++ b/network.h @@ -1,13 +1,20 @@ +/* + * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + * All trademarks are property of their respective owners + */ + #ifndef NETWORK_H #define NETWORK_H #include "vg/vg_stdint.h" #include "steam.h" #include "network_msg.h" +#include "highscores.h" /* * Interface */ +#define SR_USE_LOCALHOST /* Call it at start; Connects us to the gameserver */ static void network_init(void); @@ -16,7 +23,7 @@ static void network_init(void); static void network_update(void); /* Call it at shutdown */ -static void network_end(void); +static void network_end(void*_); /* * Can buffer up a bunch of these by calling many times, they will be @@ -24,7 +31,6 @@ static void network_end(void); */ static void network_submit_highscore( u32 trackid, u16 points, u16 time ); - /* * Game endpoints are provided with the same names to allow running without a * network connection. @@ -36,6 +42,7 @@ static void network_submit_highscore( u32 trackid, u16 points, u16 time ); */ static u8 steam_app_ticket[ 1024 ]; static u32 steam_app_ticket_length; +static int network_name_update = 1; static HSteamNetConnection cremote; static ESteamNetworkingConnectionState cremote_state = @@ -90,14 +97,131 @@ static void request_auth_ticket(void) NULL, 0 ); } -static void server_connect(void) +static void send_auth_ticket(void) { - /* Connect to server if not connected */ + u32 size = sizeof(netmsg_auth) + steam_app_ticket_length; + netmsg_auth *auth = alloca(size); + + auth->inetmsg_id = k_inetmsg_auth; + auth->ticket_length = steam_app_ticket_length; + for( int i=0; iticket[i] = steam_app_ticket[i]; + + SteamAPI_ISteamNetworkingSockets_SendMessageToConnection( + hSteamNetworkingSockets, cremote, auth, size, + k_nSteamNetworkingSend_Reliable, NULL ); +} + +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, cremote, &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, cremote, 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, 10 ); + strcpy( nick.nickname, "Harry" ); + SteamAPI_ISteamNetworkingSockets_SendMessageToConnection( + hSteamNetworkingSockets, cremote, &nick, sizeof(netmsg_set_nickname), + k_nSteamNetworkingSend_Reliable, NULL ); + + network_name_update = 0; +} + +static void server_routine_update(void) +{ + send_auth_ticket(); + + if( network_name_update ) + send_nickname(); + + send_score_update(); + send_score_request(); +} + +static void on_server_connect_status( CallbackMsg_t *msg ) +{ + SteamNetConnectionStatusChangedCallback_t *info = (void *)msg->m_pubParam; + vg_info( " Connection status changed for %lu\n", info->m_hConn ); + vg_info( " %s -> %s\n", + string_ESteamNetworkingConnectionState(info->m_eOldState), + string_ESteamNetworkingConnectionState(info->m_info.m_eState) ); + + if( info->m_hConn == cremote ) + { + cremote_state = info->m_info.m_eState; + if( info->m_info.m_eState == + k_ESteamNetworkingConnectionState_Connected ) + { + vg_success(" Connected to remote server.. running updates\n"); + server_routine_update(); + } + } + else + { + vg_warn( " Recieved signal from unknown connection\n" ); + } +} + +static void network_connect_gc(void) +{ + /* Connect to server if not connected */ SteamNetworkingIPAddr remoteAddr; -#define USE_LOCALHOST -#ifdef USE_LOCALHOST +#ifdef SR_USE_LOCALHOST SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost( &remoteAddr, 27402 ); #else const char *server_lon1 = "46.101.34.155:27402"; @@ -112,31 +236,40 @@ static void server_connect(void) hSteamNetworkingSockets, &remoteAddr, 0, NULL ); } -static void scores_update(void) +static void on_inet_scoreboard( SteamNetworkingMessage_t *msg ) { - vg_log( "scores_update()\n" ); + netmsg_scoreboard *sb = msg->m_pData; - if( cremote_state == k_ESteamNetworkingConnectionState_Connected ) + 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 ) { - /* - * request updated scores - */ - netmsg_scores_request req; - req.inetmsg_id = k_inetmsg_scores_request; - - SteamAPI_ISteamNetworkingSockets_SendMessageToConnection( - hSteamNetworkingSockets, cremote, &req, - sizeof(netmsg_scores_request), - k_nSteamNetworkingSend_Reliable, NULL ); + vg_error( "Server scoreboard was corrupted. Size: %u != %u\n", + msg->m_cbSize, expected ); } else { - /* - * if we are not connected, make a connection to the server and then in - * the future this function will be called again when it is connected - */ - server_connect(); + 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 ); + } } + + /* We dont need to stay on the server currently */ + SteamAPI_ISteamNetworkingSockets_CloseConnection( + hSteamNetworkingSockets, cremote, 0, NULL, 1 ); + + network_scores_updated = 1; } static void poll_connection(void) @@ -158,54 +291,52 @@ static void poll_connection(void) if( msg->m_cbSize < sizeof(netmsg_blank) ) { - vg_warn( "Discarding message (too small: %d)\n", - msg->m_cbSize ); + vg_warn( "Discarding message (too small: %d)\n", msg->m_cbSize ); continue; } netmsg_blank *tmp = msg->m_pData; - if( tmp->inetmsg_id == k_inetmsg_scores_info ) - { - netmsg_scores_info *info = msg->m_pData; - vg_log( "Recieved %u score records\n", info->record_count ); - SteamAPI_ISteamNetworkingSockets_CloseConnection( - hSteamNetworkingSockets, cremote, 0, NULL, 1 ); - cremote_state = k_ESteamNetworkingConnectionState_None; - } + if( tmp->inetmsg_id == k_inetmsg_scoreboard ) + on_inet_scoreboard( msg ); SteamAPI_SteamNetworkingMessage_t_Release( msg ); } } } -static u64 in_server_ticks( double seconds ) +/* + * Subroutine to be connected to main game loop, runs all routines on timers + */ +static void network_update(void) { - return (u64)(seconds / 0.1); -} + if( steam_ready ) + { + static double last_update = 0.0; + poll_connection(); + + if( vg.time > (last_update + 60.0) ) + { + last_update = vg.time; -static void on_server_connect_status( CallbackMsg_t *msg ) -{ - SteamNetConnectionStatusChangedCallback_t *info = (void *)msg->m_pubParam; - vg_info( " Connection status changed for %lu\n", info->m_hConn ); - vg_info( " %s -> %s\n", - string_ESteamNetworkingConnectionState(info->m_info.m_eState), - string_ESteamNetworkingConnectionState(info->m_eOldState) ); + if( steam_app_ticket_length ) + { + network_connect_gc(); + } + else + { + vg_low( "Not making remote connection; app ticket not gotten\n" ); + } + } - if( info->m_hConn == cremote ) - { - cremote_state = info->m_info.m_eState; - if( info->m_info.m_eState == - k_ESteamNetworkingConnectionState_Connected ) + if( vg.time > (last_update + 10.0) && + (cremote_state == k_ESteamNetworkingConnectionState_Connected )) { - vg_success(" Connected to remote server\n"); - scores_update(); + vg_warn( "Connected to server but no return... disconnecting\n" ); + SteamAPI_ISteamNetworkingSockets_CloseConnection( + hSteamNetworkingSockets, cremote, 0, NULL, 1 ); } } - else - { - vg_warn( " Recieved signal from unknown connection\n" ); - } } static void network_init(void) @@ -218,25 +349,22 @@ static void network_init(void) } } -static void network_update(void) +static void network_end(void*_) { - if( steam_ready ) + /* TODO: Fire off any buffered highscores that need to be setn */ + if( cremote_state == k_ESteamNetworkingConnectionState_Connected || + cremote_state == k_ESteamNetworkingConnectionState_Connecting ) { - static double last_update = -9000.0; - poll_connection(); - - if( vg_time > (last_update + 60.0) ) - { - last_update = vg_time; - scores_update(); - } + SteamAPI_ISteamNetworkingSockets_CloseConnection( + hSteamNetworkingSockets, cremote, 0, NULL, 1 ); } } -static void network_end(void) -{ - /* TODO: Fire off any buffered highscores that need to be setn */ -} +#else /* SR_NETWORKED */ -#endif +static void network_init(void){} +static void network_update(void){} +static void network_end(void*_){} + +#endif /* SR_NETWORKED */ #endif /* NETWORK_H */