X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.h;h=752c6c3c46534e7bf580b5a60ef2c3462e08323e;hb=a7d144c7905105909cc4434e0ab43008bbb8f89f;hp=ee0f334d5cb04156dda91cac833cdcbd8cd04b9c;hpb=5ee174baa9b2c30e01dc0ca0dfa38f916f805636;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/network.h b/network.h index ee0f334..752c6c3 100644 --- a/network.h +++ b/network.h @@ -1,13 +1,25 @@ +/* + * 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" +#include "addon_types.h" + +#define NETWORK_MAX_REQUESTS 8 + +static int network_scores_updated = 0; /* * Interface */ +//#define SR_USE_LOCALHOST /* Call it at start; Connects us to the gameserver */ static void network_init(void); @@ -28,238 +40,37 @@ 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. */ -#ifdef SR_NETWORKED - -/* - * Runtime connection stuff - */ -static u8 steam_app_ticket[ 1024 ]; -static u32 steam_app_ticket_length; - -static HSteamNetConnection cremote; -static ESteamNetworkingConnectionState cremote_state = - k_ESteamNetworkingConnectionState_None; - -/* - * Implementation - */ - -static void scores_update(void); - -static void on_auth_ticket_recieved( void *result, void *context ) -{ - EncryptedAppTicketResponse_t *response = result; - - if( response->m_eResult == k_EResultOK ) - { - vg_info( " New app ticket ready\n" ); - } - else - { - vg_warn( " Could not request new encrypted app ticket (%u)\n", - response->m_eResult ); - } - - if( SteamAPI_ISteamUser_GetEncryptedAppTicket( hSteamUser, - steam_app_ticket, - vg_list_size(steam_app_ticket), - &steam_app_ticket_length )) - { - vg_success( " Loaded app ticket (%u bytes)\n", steam_app_ticket_length ); - } - else - { - vg_error( " No ticket availible\n" ); - steam_app_ticket_length = 0; - } -} - -static void request_auth_ticket(void) -{ - /* - * TODO Check for one thats cached on the disk and load it. - * This might be OK though because steam seems to cache the result - */ - - vg_info( "Requesting new authorization ticket\n" ); - steam_async *call = steam_new_async(); - call->data = NULL; - call->p_handler = on_auth_ticket_recieved; - call->id = SteamAPI_ISteamUser_RequestEncryptedAppTicket( hSteamUser, - NULL, 0 ); -} - -static void server_connect(void) -{ - /* Connect to server if not connected */ - - SteamNetworkingIPAddr remoteAddr; - -#define USE_LOCALHOST -#ifdef USE_LOCALHOST - SteamAPI_SteamNetworkingIPAddr_SetIPv6LocalHost( &remoteAddr, 27402 ); -#else - const char *server_lon1 = "46.101.34.155:27402"; - SteamAPI_SteamNetworkingIPAddr_ParseString( &remoteAddr, server_lon1 ); -#endif - - char buf[256]; - SteamAPI_SteamNetworkingIPAddr_ToString( &remoteAddr, buf, 256, 1 ); - vg_info( "connect to: %s\n", buf ); - - cremote = SteamAPI_ISteamNetworkingSockets_ConnectByIPAddress( - hSteamNetworkingSockets, &remoteAddr, 0, NULL ); -} -static void send_auth_ticket(void) -{ - u32 size = sizeof(netmsg_auth) + steam_app_ticket_length; - netmsg_auth *auth = malloc(size); +struct { + u8 app_symmetric_key[ 1024 ]; + u32 app_key_length; + EServerMode auth_mode; - auth.inetmsg_id = k_inetmsg_auth; - auth.ticket_length = steam_app_ticket_length; - for( int i=0; im_cbSize < sizeof(netmsg_blank) ) - { - 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 ); + f64 last_attempt, last_frame; + u32 retries; - SteamAPI_ISteamNetworkingSockets_CloseConnection( - hSteamNetworkingSockets, cremote, 0, NULL, 1 ); - cremote_state = k_ESteamNetworkingConnectionState_None; - } + i32 network_info; - SteamAPI_SteamNetworkingMessage_t_Release( msg ); - } + struct network_request { + vg_pool_node poolnode; + void (*callback)( netmsg_request *res, vg_msg *body ); + f64 sendtime; } + *request_buffer; + vg_pool request_pool; } +static network_client = { + .auth_mode = eServerModeAuthentication, + .state = k_ESteamNetworkingConnectionState_None, +}; -static u64 in_server_ticks( double seconds ) -{ - return (u64)(seconds / 0.1); -} - -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( 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\n"); - scores_update(); - } - } - else - { - vg_warn( " Recieved signal from unknown connection\n" ); - } -} - -static void network_init(void) -{ - if( steam_ready ) - { - steam_register_callback( k_iSteamNetConnectionStatusChangedCallBack, - on_server_connect_status ); - request_auth_ticket(); - } -} - -static void network_update(void) -{ - if( steam_ready ) - { - static double last_update = -9000.0; - poll_connection(); - - if( vg_time > (last_update + 60.0) ) - { - last_update = vg_time; - scores_update(); - } - } -} - -static void network_end(void) -{ - /* TODO: Fire off any buffered highscores that need to be setn */ -} +static int packet_minsize( SteamNetworkingMessage_t *msg, u32 size ); +static void network_send_item( enum netmsg_playeritem_type type ); +static void network_request_scoreboard( const char *mod_uid, + const char *route_uid, + u32 week ); -#endif #endif /* NETWORK_H */