X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=network.c;h=92389016c49a7a5240e03ff0794bc674ac6bfd05;hb=874c9d7e6ee2d826f9eb34518e8163283439c38e;hp=9bf240046db3c20d02ba3c44669a32223286ae31;hpb=4bf136afb77a4c2937952b9152165f1ddcd2da9d;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/network.c b/network.c
index 9bf2400..9238901 100644
--- a/network.c
+++ b/network.c
@@ -58,6 +58,9 @@ static void request_auth_ticket(void){
 }
 
 static void network_send_username(void){
+   if( !network_connected() )
+      return;
+
    netmsg_playerusername *update = alloca( sizeof(netmsg_playerusername)+
                                            NETWORK_USERNAME_MAX );
    update->inetmsg_id = k_inetmsg_playerusername;
@@ -267,6 +270,7 @@ static void network_disconnect(void){
    SteamAPI_ISteamNetworkingSockets_CloseConnection( 
          hSteamNetworkingSockets, network_client.remote, 0, NULL, 0 );
    network_client.remote = 0;
+   network_client.state = k_ESteamNetworkingConnectionState_None;
 
    for( int i=0; i<vg_list_size(netplayers.list); i++ ){
       netplayers.list[i].active = 0;
@@ -287,6 +291,14 @@ static void on_server_connect_status( CallbackMsg_t *msg ){
             k_ESteamNetworkingConnectionState_Connected ){
          vg_success("  Connected to remote server.. authenticating\n");
 
+         /* send version info to server */
+         netmsg_version version;
+         version.inetmsg_id = k_inetmsg_version;
+         version.version = NETWORK_SKATERIFT_VERSION;
+         SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+               hSteamNetworkingSockets, network_client.remote, &version, 
+               sizeof(netmsg_version), k_nSteamNetworkingSend_Reliable, NULL );
+
          /* TODO: We should really wait to see if the server is in auth mode
           * first... */
          u32 size = sizeof(netmsg_auth) + network_client.app_key_length;
@@ -299,18 +311,12 @@ static void on_server_connect_status( CallbackMsg_t *msg ){
          SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
                hSteamNetworkingSockets, network_client.remote, auth, size,
                k_nSteamNetworkingSend_Reliable, NULL );
-
-         network_send_username();
-
-         for( u32 i=0; i<k_netmsg_playeritem_max; i ++ ){
-            network_send_item(i);
-         }
       }
       else if( info->m_info.m_eState == 
             k_ESteamNetworkingConnectionState_ClosedByPeer ){
 
          if( info->m_info.m_eEndReason == 
-               k_ESteamNetConnectionEnd_Remote_Max ){
+               k_ESteamNetConnectionEnd_Misc_InternalError ){
             network_client.retries = 40;
          }
          network_disconnect();
@@ -373,6 +379,16 @@ static void network_connect(void){
                   hSteamNetworkingSockets, &remoteAddr, 0, NULL );
 }
 
+static void network_sign_on_complete(void){
+   vg_success( "Sign on completed\n" );
+
+   /* send our init info */
+   network_send_username();
+   for( u32 i=0; i<k_netmsg_playeritem_max; i ++ ){
+      network_send_item(i);
+   }
+}
+
 static void poll_remote_connection(void){
    SteamNetworkingMessage_t *messages[32];
    int len;
@@ -401,6 +417,22 @@ static void poll_remote_connection(void){
          else if( (tmp->inetmsg_id >= 300) && (tmp->inetmsg_id < 400) ){
             network_request_rx_300_400( msg );
          }
+         else {
+            if( tmp->inetmsg_id == k_inetmsg_version ){
+               netmsg_version *version = msg->m_pData;
+               if( version->version != NETWORK_SKATERIFT_VERSION ){
+                  network_disconnect();
+                  /* we dont want to connect to this server ever */
+                  network_client.retries = 999;
+                  network_client.last_attempt = 999999999.9;
+                  vg_error( "version mismatch with server\n" );
+               }
+               else {
+                  network_client.remote_version = version->version;
+                  network_sign_on_complete();
+               }
+            }
+         }
 
          SteamAPI_SteamNetworkingMessage_t_Release( msg );
       }
@@ -447,6 +479,40 @@ static void network_update(void){
    }
 }
 
+static void chat_send_message( const char *message ){
+   if( !network_connected() ){
+      return;
+   }
+
+   netmsg_chat *chat = alloca( sizeof(netmsg_chat) + NETWORK_MAX_CHAT );
+   chat->inetmsg_id = k_inetmsg_chat;
+   chat->client = 0;
+
+   u32 l = vg_strncpy( message, chat->msg, NETWORK_MAX_CHAT, 
+                       k_strncpy_always_add_null );
+
+   SteamAPI_ISteamNetworkingSockets_SendMessageToConnection(
+         hSteamNetworkingSockets, network_client.remote, 
+         chat, sizeof(netmsg_chat)+l+1,
+         k_nSteamNetworkingSend_Reliable, NULL );
+}
+
+static int cmd_network_send_message( int argc, const char *argv[] ){
+   char buf[ NETWORK_MAX_CHAT ];
+   vg_str str;
+   vg_strnull( &str, buf, NETWORK_MAX_CHAT );
+
+   for( int i=0; i<argc; i ++ ){
+      vg_strcat( &str, argv[i] );
+
+      if( i < argc-1 )
+         vg_strcatch( &str, ' ' );
+   }
+
+   chat_send_message( buf );
+   return 0;
+}
+
 static void network_init(void){
    vg_console_reg_var( "network_info", &network_client.network_info,
                        k_var_dtype_i32, VG_VAR_PERSISTENT );
@@ -468,6 +534,8 @@ static void network_init(void){
       steam_register_callback( k_iPersonaStateChange, 
                                on_persona_state_change );
       request_auth_ticket();
+
+      vg_console_reg_cmd( "say", cmd_network_send_message, NULL );
    }
 }