X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gameserver.c;h=c0eca6757e5958c47830097d6393a7402ef8c939;hb=074fa69f479724f9800849430bad5caf730b01ef;hp=ff8d63552384903277721e25b43318b9c76fd847;hpb=333430b27b5f9f73cbe9ad7921a4735aaff444f1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/gameserver.c b/gameserver.c index ff8d635..c0eca67 100644 --- a/gameserver.c +++ b/gameserver.c @@ -17,6 +17,7 @@ static void inthandler( int signum ) { #include "highscores.c" #include "servermonitor_server.c" #include "vg/vg_opt.h" +#include "network_common.h" static const u64 k_connection_unauthorized = 0xffffffffffffffff; @@ -49,35 +50,58 @@ static void gameserver_send_to_all( int ignore, } } -static void gameserver_populate_join_msg( int index, netmsg_playerjoin *msg ){ - memset( msg, 0, sizeof(*msg) ); - msg->inetmsg_id = k_inetmsg_playerjoin; - msg->index = index; - vg_strncpy( gameserver.clients[index].username, msg->username, - sizeof(msg->username), k_strncpy_always_add_null ); -} - static void gameserver_player_join( int index ){ struct gameserver_client *joiner = &gameserver.clients[index]; - netmsg_playerjoin join; - gameserver_populate_join_msg( index, &join ); + netmsg_playerjoin join = { .inetmsg_id = k_inetmsg_playerjoin, + .index = index }; gameserver_send_to_all( index, &join, sizeof(join), k_nSteamNetworkingSend_Reliable ); /* update the joining user about current connections */ + + netmsg_playerusername *username = + alloca( sizeof(netmsg_playerusername) + NETWORK_USERNAME_MAX ); + username->inetmsg_id = k_inetmsg_playerusername; + + netmsg_playeritem *item = + alloca( sizeof(netmsg_playeritem) + ADDON_UID_MAX ); + item->inetmsg_id = k_inetmsg_playeritem; + for( int i=0; iactive ) continue; - netmsg_playerjoin init; - gameserver_populate_join_msg( i, &init ); - + /* join */ + netmsg_playerjoin init = { .inetmsg_id = k_inetmsg_playerjoin, + .index = i }; SteamAPI_ISteamNetworkingSockets_SendMessageToConnection( hSteamNetworkingSockets, joiner->connection, &init, sizeof(init), k_nSteamNetworkingSend_Reliable, NULL ); + + /* username */ + username->index = i; + u32 chs = vg_strncpy( client->username, username->name, + NETWORK_USERNAME_MAX, + k_strncpy_always_add_null ); + u32 size = sizeof(netmsg_playerusername) + chs + 1; + SteamAPI_ISteamNetworkingSockets_SendMessageToConnection( + hSteamNetworkingSockets, joiner->connection, + username, size, k_nSteamNetworkingSend_Reliable, NULL ); + + /* items */ + for( int j=0; jitems[j], item->uid, ADDON_UID_MAX, + k_strncpy_always_add_null ); + item->type_index = j; + item->client = i; + size = sizeof(netmsg_playeritem) + chs + 1; + SteamAPI_ISteamNetworkingSockets_SendMessageToConnection( + hSteamNetworkingSockets, joiner->connection, + item, size, k_nSteamNetworkingSend_Reliable, NULL ); + } } } @@ -115,6 +139,7 @@ static void new_client_connecting( HSteamNetConnection client ){ hSteamNetworkingSockets, client ); if( accept_status == k_EResultOK ){ vg_success( "Accepted client (id: %u, index: %d)\n", client, index ); + memset( &gameserver.clients[index], 0, sizeof(struct gameserver_client) ); gameserver.clients[index].active = 1; gameserver.clients[index].connection = client; @@ -300,38 +325,72 @@ static void gameserver_rx_200_300( SteamNetworkingMessage_t *msg ){ if( client_id == -1 ) return; if( tmp->inetmsg_id == k_inetmsg_playerusername ){ - if( !packet_minsize( msg, sizeof(netmsg_playerusername) )) + if( !packet_minsize( msg, sizeof(netmsg_playerusername)+1 )) return; struct gameserver_client *client = &gameserver.clients[ client_id ]; netmsg_playerusername *src = msg->m_pData; - vg_info( "%d change name '%s' -> '%s'\n", - client_id, client->username, src->username ); - - vg_strncpy( src->username, client->username, sizeof(client->username), - k_strncpy_always_add_null ); + u32 name_len = network_msgstring( src->name, msg->m_cbSize, + sizeof(netmsg_playerusername), + client->username, + NETWORK_USERNAME_MAX ); /* update other users about this change */ - netmsg_playerusername msg; - memset( &msg, 0, sizeof(msg) ); - msg.inetmsg_id = k_inetmsg_playerusername; - msg.index = client_id; - vg_strncpy( client->username, msg.username, sizeof(msg.username), - k_strncpy_always_add_null ); - - gameserver_send_to_all( client_id, &msg, sizeof(msg), + netmsg_playerusername *prop = alloca(sizeof(netmsg_playerusername)+ + NETWORK_USERNAME_MAX ); + + prop->inetmsg_id = k_inetmsg_playerusername; + prop->index = client_id; + u32 chs = vg_strncpy( client->username, prop->name, NETWORK_USERNAME_MAX, + k_strncpy_always_add_null ); + + vg_info( "client #%d changed name to: %s\n", client_id, prop->name ); + + u32 propsize = sizeof(netmsg_playerusername) + chs + 1; + gameserver_send_to_all( client_id, prop, propsize, k_nSteamNetworkingSend_Reliable ); } else if( tmp->inetmsg_id == k_inetmsg_playerframe ){ /* propogate */ - netmsg_playerframe *frame = alloca(msg->m_cbSize); memcpy( frame, msg->m_pData, msg->m_cbSize ); frame->client = client_id; gameserver_send_to_all( client_id, frame, msg->m_cbSize, k_nSteamNetworkingSend_Unreliable ); } + else if( tmp->inetmsg_id == k_inetmsg_playeritem ){ + netmsg_playeritem *item = msg->m_pData; + + /* record */ + struct gameserver_client *client = &gameserver.clients[ client_id ]; + + if( item->type_index >= k_netmsg_playeritem_max ){ + vg_warn( "Client #%d invalid equip type %u\n", + client_id, (u32)item->type_index ); + return; + } + + char *dest = client->items[ item->type_index ]; + + network_msgstring( item->uid, msg->m_cbSize, sizeof(netmsg_playeritem), + dest, ADDON_UID_MAX ); + + vg_info( "Client #%d equiped: [%s] %s\n", + item->client, + (const char *[]){[k_netmsg_playeritem_board]="board", + [k_netmsg_playeritem_player]="player", + [k_netmsg_playeritem_world0]="world0", + [k_netmsg_playeritem_world1]="world1" + }[item->type_index], item->uid ); + + /* propogate */ + netmsg_playeritem *prop = alloca(msg->m_cbSize); + memcpy( prop, msg->m_pData, msg->m_cbSize ); + prop->client = client_id; + gameserver_send_to_all( client_id, prop, msg->m_cbSize, + k_nSteamNetworkingSend_Reliable ); + } } #if 0