Compare commits
No commits in common. "990a0eb71f7d8153001d61112b9fea6d14e18f87" and "bfa1e95f7b93aded0f166731add4118af0a9f236" have entirely different histories.
990a0eb71f
...
bfa1e95f7b
|
@ -769,7 +769,7 @@ STEAMAPI_API void S_CALLTYPE SteamAPI_ManualDispatch_RunFrame( HSteamPipe hSteam
|
||||||
/// Fetch the next pending callback on the given pipe, if any. If a callback is available, true is returned
|
/// Fetch the next pending callback on the given pipe, if any. If a callback is available, true is returned
|
||||||
/// and the structure is populated. In this case, you MUST call SteamAPI_ManualDispatch_FreeLastCallback
|
/// and the structure is populated. In this case, you MUST call SteamAPI_ManualDispatch_FreeLastCallback
|
||||||
/// (after dispatching the callback) before calling SteamAPI_ManualDispatch_GetNextCallback again.
|
/// (after dispatching the callback) before calling SteamAPI_ManualDispatch_GetNextCallback again.
|
||||||
STEAMAPI_API steam_bool S_CALLTYPE SteamAPI_ManualDispatch_GetNextCallback( HSteamPipe hSteamPipe, CallbackMsg_t *pCallbackMsg )
|
STEAMAPI_API bool S_CALLTYPE SteamAPI_ManualDispatch_GetNextCallback( HSteamPipe hSteamPipe, CallbackMsg_t *pCallbackMsg )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("%s\n", __FUNCTION__);
|
PRINT_DEBUG("%s\n", __FUNCTION__);
|
||||||
std::queue<struct cb_data> *q = NULL;
|
std::queue<struct cb_data> *q = NULL;
|
||||||
|
@ -829,7 +829,7 @@ STEAMAPI_API void S_CALLTYPE SteamAPI_ManualDispatch_FreeLastCallback( HSteamPip
|
||||||
|
|
||||||
/// Return the call result for the specified call on the specified pipe. You really should
|
/// Return the call result for the specified call on the specified pipe. You really should
|
||||||
/// only call this in a handler for SteamAPICallCompleted_t callback.
|
/// only call this in a handler for SteamAPICallCompleted_t callback.
|
||||||
STEAMAPI_API steam_bool S_CALLTYPE SteamAPI_ManualDispatch_GetAPICallResult( HSteamPipe hSteamPipe, SteamAPICall_t hSteamAPICall, void *pCallback, int cubCallback, int iCallbackExpected, bool *pbFailed )
|
STEAMAPI_API bool S_CALLTYPE SteamAPI_ManualDispatch_GetAPICallResult( HSteamPipe hSteamPipe, SteamAPICall_t hSteamAPICall, void *pCallback, int cubCallback, int iCallbackExpected, bool *pbFailed )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("SteamAPI_ManualDispatch_GetAPICallResult %i %llu %i %i\n", hSteamPipe, hSteamAPICall, cubCallback, iCallbackExpected);
|
PRINT_DEBUG("SteamAPI_ManualDispatch_GetAPICallResult %i %llu %i %i\n", hSteamPipe, hSteamAPICall, cubCallback, iCallbackExpected);
|
||||||
Steam_Client *steam_client = get_steam_client();
|
Steam_Client *steam_client = get_steam_client();
|
||||||
|
@ -961,7 +961,7 @@ SteamMasterServerUpdater
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
STEAMCLIENT_API steam_bool Steam_BGetCallback( HSteamPipe hSteamPipe, CallbackMsg_t *pCallbackMsg )
|
STEAMCLIENT_API bool Steam_BGetCallback( HSteamPipe hSteamPipe, CallbackMsg_t *pCallbackMsg )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("%s %i\n", __FUNCTION__, hSteamPipe);
|
PRINT_DEBUG("%s %i\n", __FUNCTION__, hSteamPipe);
|
||||||
SteamAPI_ManualDispatch_Init();
|
SteamAPI_ManualDispatch_Init();
|
||||||
|
@ -976,7 +976,7 @@ STEAMCLIENT_API void Steam_FreeLastCallback( HSteamPipe hSteamPipe )
|
||||||
SteamAPI_ManualDispatch_FreeLastCallback( hSteamPipe );
|
SteamAPI_ManualDispatch_FreeLastCallback( hSteamPipe );
|
||||||
}
|
}
|
||||||
|
|
||||||
STEAMCLIENT_API steam_bool Steam_GetAPICallResult( HSteamPipe hSteamPipe, SteamAPICall_t hSteamAPICall, void* pCallback, int cubCallback, int iCallbackExpected, bool* pbFailed )
|
STEAMCLIENT_API bool Steam_GetAPICallResult( HSteamPipe hSteamPipe, SteamAPICall_t hSteamAPICall, void* pCallback, int cubCallback, int iCallbackExpected, bool* pbFailed )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("Steam_GetAPICallResult %i %llu %i %i\n", hSteamPipe, hSteamAPICall, cubCallback, iCallbackExpected);
|
PRINT_DEBUG("Steam_GetAPICallResult %i %llu %i %i\n", hSteamPipe, hSteamAPICall, cubCallback, iCallbackExpected);
|
||||||
return SteamAPI_ManualDispatch_GetAPICallResult(hSteamPipe, hSteamAPICall, pCallback, cubCallback, iCallbackExpected, pbFailed);
|
return SteamAPI_ManualDispatch_GetAPICallResult(hSteamPipe, hSteamAPICall, pCallback, cubCallback, iCallbackExpected, pbFailed);
|
||||||
|
|
|
@ -125,20 +125,6 @@ message Networking_Sockets {
|
||||||
bytes data = 5;
|
bytes data = 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
message Networking_Messages {
|
|
||||||
enum Types {
|
|
||||||
CONNECTION_NEW = 0;
|
|
||||||
CONNECTION_ACCEPT = 1;
|
|
||||||
CONNECTION_END = 2;
|
|
||||||
DATA = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
Types type = 1;
|
|
||||||
uint32 channel = 2;
|
|
||||||
uint32 id_from = 3;
|
|
||||||
bytes data = 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
message Gameserver {
|
message Gameserver {
|
||||||
uint64 id = 1;
|
uint64 id = 1;
|
||||||
bytes game_description = 2;
|
bytes game_description = 2;
|
||||||
|
@ -226,7 +212,6 @@ message Common_Message {
|
||||||
Network_Old network_old = 12;
|
Network_Old network_old = 12;
|
||||||
Networking_Sockets networking_sockets = 13;
|
Networking_Sockets networking_sockets = 13;
|
||||||
Steam_Messages steam_messages = 14;
|
Steam_Messages steam_messages = 14;
|
||||||
Networking_Messages networking_messages = 15;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32 source_ip = 128;
|
uint32 source_ip = 128;
|
||||||
|
|
|
@ -554,11 +554,6 @@ void Networking::do_callbacks_message(Common_Message *msg)
|
||||||
PRINT_DEBUG("has_steam_messages\n");
|
PRINT_DEBUG("has_steam_messages\n");
|
||||||
run_callbacks(CALLBACK_ID_STEAM_MESSAGES, msg);
|
run_callbacks(CALLBACK_ID_STEAM_MESSAGES, msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (msg->has_networking_messages()) {
|
|
||||||
PRINT_DEBUG("has_networking_messages\n");
|
|
||||||
run_callbacks(CALLBACK_ID_NETWORKING_MESSAGES, msg);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Networking::handle_tcp(Common_Message *msg, struct TCP_Socket &socket)
|
bool Networking::handle_tcp(Common_Message *msg, struct TCP_Socket &socket)
|
||||||
|
|
|
@ -56,7 +56,6 @@ enum Callback_Ids {
|
||||||
CALLBACK_ID_FRIEND_MESSAGES,
|
CALLBACK_ID_FRIEND_MESSAGES,
|
||||||
CALLBACK_ID_NETWORKING_SOCKETS,
|
CALLBACK_ID_NETWORKING_SOCKETS,
|
||||||
CALLBACK_ID_STEAM_MESSAGES,
|
CALLBACK_ID_STEAM_MESSAGES,
|
||||||
CALLBACK_ID_NETWORKING_MESSAGES,
|
|
||||||
|
|
||||||
CALLBACK_IDS_MAX
|
CALLBACK_IDS_MAX
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,22 +17,6 @@
|
||||||
|
|
||||||
#include "base.h"
|
#include "base.h"
|
||||||
|
|
||||||
#define NETWORKING_MESSAGES_TIMEOUT 30.0
|
|
||||||
|
|
||||||
struct Steam_Message_Connection {
|
|
||||||
SteamNetworkingIdentity remote_identity;
|
|
||||||
std::map<int, std::queue<std::string>> data;
|
|
||||||
|
|
||||||
std::list<int> channels;
|
|
||||||
bool accepted = false;
|
|
||||||
bool dead = false;
|
|
||||||
|
|
||||||
unsigned id;
|
|
||||||
unsigned remote_id = 0;
|
|
||||||
|
|
||||||
std::chrono::high_resolution_clock::time_point created = std::chrono::high_resolution_clock::now();
|
|
||||||
};
|
|
||||||
|
|
||||||
class Steam_Networking_Messages :
|
class Steam_Networking_Messages :
|
||||||
public ISteamNetworkingMessages
|
public ISteamNetworkingMessages
|
||||||
{
|
{
|
||||||
|
@ -42,13 +26,7 @@ public ISteamNetworkingMessages
|
||||||
class SteamCallBacks *callbacks;
|
class SteamCallBacks *callbacks;
|
||||||
class RunEveryRunCB *run_every_runcb;
|
class RunEveryRunCB *run_every_runcb;
|
||||||
|
|
||||||
std::map<CSteamID, Steam_Message_Connection> connections;
|
|
||||||
std::list<Common_Message> incoming_data;
|
|
||||||
|
|
||||||
unsigned id_counter = 0;
|
|
||||||
std::chrono::steady_clock::time_point created;
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static void steam_callback(void *object, Common_Message *msg)
|
static void steam_callback(void *object, Common_Message *msg)
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("steam_networking_messages_callback\n");
|
PRINT_DEBUG("steam_networking_messages_callback\n");
|
||||||
|
@ -70,14 +48,11 @@ Steam_Networking_Messages(class Settings *settings, class Networking *network, c
|
||||||
this->settings = settings;
|
this->settings = settings;
|
||||||
this->network = network;
|
this->network = network;
|
||||||
this->run_every_runcb = run_every_runcb;
|
this->run_every_runcb = run_every_runcb;
|
||||||
this->network->setCallback(CALLBACK_ID_NETWORKING_MESSAGES, settings->get_local_steam_id(), &Steam_Networking_Messages::steam_callback, this);
|
|
||||||
this->network->setCallback(CALLBACK_ID_USER_STATUS, settings->get_local_steam_id(), &Steam_Networking_Messages::steam_callback, this);
|
this->network->setCallback(CALLBACK_ID_USER_STATUS, settings->get_local_steam_id(), &Steam_Networking_Messages::steam_callback, this);
|
||||||
this->run_every_runcb->add(&Steam_Networking_Messages::steam_run_every_runcb, this);
|
this->run_every_runcb->add(&Steam_Networking_Messages::steam_run_every_runcb, this);
|
||||||
|
|
||||||
this->callback_results = callback_results;
|
this->callback_results = callback_results;
|
||||||
this->callbacks = callbacks;
|
this->callbacks = callbacks;
|
||||||
|
|
||||||
this->created = std::chrono::steady_clock::now();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
~Steam_Networking_Messages()
|
~Steam_Networking_Messages()
|
||||||
|
@ -86,45 +61,6 @@ Steam_Networking_Messages(class Settings *settings, class Networking *network, c
|
||||||
this->run_every_runcb->remove(&Steam_Networking_Messages::steam_run_every_runcb, this);
|
this->run_every_runcb->remove(&Steam_Networking_Messages::steam_run_every_runcb, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::map<CSteamID, Steam_Message_Connection>::iterator find_or_create_message_connection(SteamNetworkingIdentity identityRemote, bool incoming, bool restartbroken)
|
|
||||||
{
|
|
||||||
auto conn = connections.find(identityRemote.GetSteamID());
|
|
||||||
if (conn == connections.end() || (conn->second.dead && restartbroken)) {
|
|
||||||
++id_counter;
|
|
||||||
struct Steam_Message_Connection con;
|
|
||||||
con.remote_identity = identityRemote;
|
|
||||||
con.id = id_counter;
|
|
||||||
connections[identityRemote.GetSteamID()] = con;
|
|
||||||
|
|
||||||
Common_Message msg;
|
|
||||||
msg.set_source_id(settings->get_local_steam_id().ConvertToUint64());
|
|
||||||
msg.set_dest_id(con.remote_identity.GetSteamID64());
|
|
||||||
msg.set_allocated_networking_messages(new Networking_Messages);
|
|
||||||
if (incoming) {
|
|
||||||
msg.mutable_networking_messages()->set_type(Networking_Messages::CONNECTION_ACCEPT);
|
|
||||||
} else {
|
|
||||||
msg.mutable_networking_messages()->set_type(Networking_Messages::CONNECTION_NEW);
|
|
||||||
}
|
|
||||||
msg.mutable_networking_messages()->set_channel(0);
|
|
||||||
msg.mutable_networking_messages()->set_id_from(con.id);
|
|
||||||
network->sendTo(&msg, true);
|
|
||||||
|
|
||||||
conn = connections.find(identityRemote.GetSteamID());
|
|
||||||
|
|
||||||
if (incoming) {
|
|
||||||
SteamNetworkingMessagesSessionRequest_t data;
|
|
||||||
data.m_identityRemote = con.remote_identity;
|
|
||||||
callbacks->addCBResult(data.k_iCallback, &data, sizeof(data));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!incoming) {
|
|
||||||
conn->second.accepted = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return conn;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Sends a message to the specified host. If we don't already have a session with that user,
|
/// Sends a message to the specified host. If we don't already have a session with that user,
|
||||||
/// a session is implicitly created. There might be some handshaking that needs to happen
|
/// a session is implicitly created. There might be some handshaking that needs to happen
|
||||||
/// before we can actually begin sending message data. If this handshaking fails and we can't
|
/// before we can actually begin sending message data. If this handshaking fails and we can't
|
||||||
|
@ -170,57 +106,7 @@ std::map<CSteamID, Steam_Message_Connection>::iterator find_or_create_message_co
|
||||||
EResult SendMessageToUser( const SteamNetworkingIdentity &identityRemote, const void *pubData, uint32 cubData, int nSendFlags, int nRemoteChannel )
|
EResult SendMessageToUser( const SteamNetworkingIdentity &identityRemote, const void *pubData, uint32 cubData, int nSendFlags, int nRemoteChannel )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::SendMessageToUser\n");
|
PRINT_DEBUG("Steam_Networking_Messages::SendMessageToUser\n");
|
||||||
std::lock_guard<std::recursive_mutex> lock(global_mutex);
|
return k_EResultNoConnection;
|
||||||
const SteamNetworkingIPAddr *ip = identityRemote.GetIPAddr();
|
|
||||||
bool reliable = false;
|
|
||||||
if (nSendFlags & k_nSteamNetworkingSend_Reliable) {
|
|
||||||
reliable = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool restart_broken = false;
|
|
||||||
if (nSendFlags & k_nSteamNetworkingSend_AutoRestartBrokenSession) {
|
|
||||||
restart_broken = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (identityRemote.m_eType == k_ESteamNetworkingIdentityType_SteamID) {
|
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::SendMessageToUser %llu\n", identityRemote.GetSteamID64());
|
|
||||||
//steam id identity
|
|
||||||
} else if (ip) {
|
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::SendMessageToUser %u:%u ipv4? %u\n", ip->GetIPv4(), ip->m_port, ip->IsIPv4());
|
|
||||||
//ip addr
|
|
||||||
return k_EResultNoConnection; //TODO
|
|
||||||
} else {
|
|
||||||
return k_EResultNoConnection;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto conn = find_or_create_message_connection(identityRemote, false, restart_broken);
|
|
||||||
if (conn->second.dead) {
|
|
||||||
return k_EResultNoConnection;
|
|
||||||
}
|
|
||||||
|
|
||||||
Common_Message msg;
|
|
||||||
msg.set_source_id(settings->get_local_steam_id().ConvertToUint64());
|
|
||||||
msg.set_dest_id(conn->second.remote_identity.GetSteamID64());
|
|
||||||
msg.set_allocated_networking_messages(new Networking_Messages);
|
|
||||||
msg.mutable_networking_messages()->set_type(Networking_Messages::DATA);
|
|
||||||
msg.mutable_networking_messages()->set_channel(nRemoteChannel);
|
|
||||||
msg.mutable_networking_messages()->set_id_from(conn->second.id);
|
|
||||||
msg.mutable_networking_messages()->set_data(pubData, cubData);
|
|
||||||
|
|
||||||
network->sendTo(&msg, reliable);
|
|
||||||
return k_EResultOK;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void free_steam_message_data(SteamNetworkingMessage_t *pMsg)
|
|
||||||
{
|
|
||||||
free(pMsg->m_pData);
|
|
||||||
pMsg->m_pData = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void delete_steam_message(SteamNetworkingMessage_t *pMsg)
|
|
||||||
{
|
|
||||||
if (pMsg->m_pfnFreeData) pMsg->m_pfnFreeData(pMsg);
|
|
||||||
delete pMsg;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Reads the next message that has been sent from another user via SendMessageToUser() on the given channel.
|
/// Reads the next message that has been sent from another user via SendMessageToUser() on the given channel.
|
||||||
|
@ -230,42 +116,7 @@ static void delete_steam_message(SteamNetworkingMessage_t *pMsg)
|
||||||
int ReceiveMessagesOnChannel( int nLocalChannel, SteamNetworkingMessage_t **ppOutMessages, int nMaxMessages )
|
int ReceiveMessagesOnChannel( int nLocalChannel, SteamNetworkingMessage_t **ppOutMessages, int nMaxMessages )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::ReceiveMessagesOnChannel\n");
|
PRINT_DEBUG("Steam_Networking_Messages::ReceiveMessagesOnChannel\n");
|
||||||
std::lock_guard<std::recursive_mutex> lock(global_mutex);
|
return 0;
|
||||||
int message_counter = 0;
|
|
||||||
|
|
||||||
for (auto & conn : connections) {
|
|
||||||
auto chan = conn.second.data.find(nLocalChannel);
|
|
||||||
if (chan != conn.second.data.end()) {
|
|
||||||
while (!chan->second.empty() && message_counter <= nMaxMessages) {
|
|
||||||
SteamNetworkingMessage_t *pMsg = new SteamNetworkingMessage_t(); //TODO size is wrong
|
|
||||||
unsigned long size = chan->second.front().size();
|
|
||||||
pMsg->m_pData = malloc(size);
|
|
||||||
pMsg->m_cbSize = size;
|
|
||||||
memcpy(pMsg->m_pData, chan->second.front().data(), size);
|
|
||||||
pMsg->m_conn = conn.second.id;
|
|
||||||
pMsg->m_identityPeer = conn.second.remote_identity;
|
|
||||||
pMsg->m_nConnUserData = -1;
|
|
||||||
pMsg->m_usecTimeReceived = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - created).count();
|
|
||||||
//TODO: messagenumber?
|
|
||||||
// pMsg->m_nMessageNumber = connect_socket->second.packet_receive_counter;
|
|
||||||
// ++connect_socket->second.packet_receive_counter;
|
|
||||||
|
|
||||||
pMsg->m_pfnFreeData = &free_steam_message_data;
|
|
||||||
pMsg->m_pfnRelease = &delete_steam_message;
|
|
||||||
pMsg->m_nChannel = nLocalChannel;
|
|
||||||
ppOutMessages[message_counter] = pMsg;
|
|
||||||
++message_counter;
|
|
||||||
chan->second.pop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (message_counter >= nMaxMessages) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::ReceiveMessagesOnChannel got %u\n", message_counter);
|
|
||||||
return message_counter;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// AcceptSessionWithUser() should only be called in response to a SteamP2PSessionRequest_t callback
|
/// AcceptSessionWithUser() should only be called in response to a SteamP2PSessionRequest_t callback
|
||||||
|
@ -278,14 +129,7 @@ int ReceiveMessagesOnChannel( int nLocalChannel, SteamNetworkingMessage_t **ppOu
|
||||||
bool AcceptSessionWithUser( const SteamNetworkingIdentity &identityRemote )
|
bool AcceptSessionWithUser( const SteamNetworkingIdentity &identityRemote )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::AcceptSessionWithUser\n");
|
PRINT_DEBUG("Steam_Networking_Messages::AcceptSessionWithUser\n");
|
||||||
std::lock_guard<std::recursive_mutex> lock(global_mutex);
|
return false;
|
||||||
auto conn = connections.find(identityRemote.GetSteamID());
|
|
||||||
if (conn == connections.end()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
conn->second.accepted = true;
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Call this when you're done talking to a user to immediately free up resources under-the-hood.
|
/// Call this when you're done talking to a user to immediately free up resources under-the-hood.
|
||||||
|
@ -296,23 +140,7 @@ bool AcceptSessionWithUser( const SteamNetworkingIdentity &identityRemote )
|
||||||
bool CloseSessionWithUser( const SteamNetworkingIdentity &identityRemote )
|
bool CloseSessionWithUser( const SteamNetworkingIdentity &identityRemote )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::CloseSessionWithUser\n");
|
PRINT_DEBUG("Steam_Networking_Messages::CloseSessionWithUser\n");
|
||||||
std::lock_guard<std::recursive_mutex> lock(global_mutex);
|
return false;
|
||||||
auto conn = connections.find(identityRemote.GetSteamID());
|
|
||||||
if (conn == connections.end()) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Common_Message msg;
|
|
||||||
msg.set_source_id(settings->get_local_steam_id().ConvertToUint64());
|
|
||||||
msg.set_dest_id(conn->second.remote_identity.GetSteamID64());
|
|
||||||
msg.set_allocated_networking_messages(new Networking_Messages);
|
|
||||||
msg.mutable_networking_messages()->set_type(Networking_Messages::CONNECTION_END);
|
|
||||||
msg.mutable_networking_messages()->set_channel(0);
|
|
||||||
msg.mutable_networking_messages()->set_id_from(conn->second.id);
|
|
||||||
network->sendTo(&msg, true);
|
|
||||||
|
|
||||||
connections.erase(conn);
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Call this when you're done talking to a user on a specific channel. Once all
|
/// Call this when you're done talking to a user on a specific channel. Once all
|
||||||
|
@ -322,7 +150,6 @@ bool CloseSessionWithUser( const SteamNetworkingIdentity &identityRemote )
|
||||||
bool CloseChannelWithUser( const SteamNetworkingIdentity &identityRemote, int nLocalChannel )
|
bool CloseChannelWithUser( const SteamNetworkingIdentity &identityRemote, int nLocalChannel )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::CloseChannelWithUser\n");
|
PRINT_DEBUG("Steam_Networking_Messages::CloseChannelWithUser\n");
|
||||||
std::lock_guard<std::recursive_mutex> lock(global_mutex);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -338,62 +165,12 @@ bool CloseChannelWithUser( const SteamNetworkingIdentity &identityRemote, int nL
|
||||||
ESteamNetworkingConnectionState GetSessionConnectionInfo( const SteamNetworkingIdentity &identityRemote, SteamNetConnectionInfo_t *pConnectionInfo, SteamNetworkingQuickConnectionStatus *pQuickStatus )
|
ESteamNetworkingConnectionState GetSessionConnectionInfo( const SteamNetworkingIdentity &identityRemote, SteamNetConnectionInfo_t *pConnectionInfo, SteamNetworkingQuickConnectionStatus *pQuickStatus )
|
||||||
{
|
{
|
||||||
PRINT_DEBUG("Steam_Networking_Messages::GetSessionConnectionInfo\n");
|
PRINT_DEBUG("Steam_Networking_Messages::GetSessionConnectionInfo\n");
|
||||||
std::lock_guard<std::recursive_mutex> lock(global_mutex);
|
return k_ESteamNetworkingConnectionState_None;
|
||||||
auto conn = connections.find(identityRemote.GetSteamID());
|
|
||||||
if (conn == connections.end()) {
|
|
||||||
return k_ESteamNetworkingConnectionState_None;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pConnectionInfo) {
|
|
||||||
//TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pQuickStatus) {
|
|
||||||
//TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
if (conn->second.remote_id == 0 || !conn->second.accepted) {
|
|
||||||
return k_ESteamNetworkingConnectionState_Connecting;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (conn->second.dead) {
|
|
||||||
return k_ESteamNetworkingConnectionState_ClosedByPeer;
|
|
||||||
}
|
|
||||||
|
|
||||||
return k_ESteamNetworkingConnectionState_Connected;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void end_connection(CSteamID steam_id)
|
|
||||||
{
|
|
||||||
auto conn = connections.find(steam_id);
|
|
||||||
if (conn != connections.end()) {
|
|
||||||
conn->second.dead = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void RunCallbacks()
|
void RunCallbacks()
|
||||||
{
|
{
|
||||||
auto msg = std::begin(incoming_data);
|
|
||||||
while (msg != std::end(incoming_data)) {
|
|
||||||
CSteamID source_id((uint64)msg->source_id());
|
|
||||||
|
|
||||||
auto conn = connections.find(source_id);
|
|
||||||
if (conn != connections.end()) {
|
|
||||||
if (conn->second.remote_id == msg->networking_messages().id_from())
|
|
||||||
conn->second.data[msg->networking_messages().channel()].push(msg->networking_messages().data());
|
|
||||||
}
|
|
||||||
|
|
||||||
msg = incoming_data.erase(msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto conn = std::begin(connections);
|
|
||||||
while (conn != std::end(connections)) {
|
|
||||||
if (!conn->second.accepted && check_timedout(conn->second.created, NETWORKING_MESSAGES_TIMEOUT)) {
|
|
||||||
conn = connections.erase(conn);
|
|
||||||
} else {
|
|
||||||
++conn;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Callback(Common_Message *msg)
|
void Callback(Common_Message *msg)
|
||||||
|
@ -404,33 +181,7 @@ void Callback(Common_Message *msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (msg->low_level().type() == Low_Level::DISCONNECT) {
|
if (msg->low_level().type() == Low_Level::DISCONNECT) {
|
||||||
end_connection((uint64)msg->source_id());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (msg->has_networking_messages()) {
|
|
||||||
PRINT_DEBUG("Steam_Networking_Messages: got network socket msg %u\n", msg->networking_messages().type());
|
|
||||||
if (msg->networking_messages().type() == Networking_Messages::CONNECTION_NEW) {
|
|
||||||
SteamNetworkingIdentity identity;
|
|
||||||
identity.SetSteamID64(msg->source_id());
|
|
||||||
auto conn = find_or_create_message_connection(identity, true, false);
|
|
||||||
conn->second.remote_id = msg->networking_messages().id_from();
|
|
||||||
conn->second.dead = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (msg->networking_messages().type() == Networking_Messages::CONNECTION_ACCEPT) {
|
|
||||||
auto conn = connections.find((uint64)msg->source_id());
|
|
||||||
if (conn != connections.end()) {
|
|
||||||
conn->second.remote_id = msg->networking_messages().id_from();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (msg->networking_messages().type() == Networking_Messages::CONNECTION_END) {
|
|
||||||
end_connection((uint64)msg->source_id());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (msg->networking_messages().type() == Networking_Messages::DATA) {
|
|
||||||
incoming_data.push_back(Common_Message(*msg));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -311,14 +311,14 @@ S_API void S_CALLTYPE SteamAPI_ManualDispatch_RunFrame( HSteamPipe hSteamPipe );
|
||||||
/// Fetch the next pending callback on the given pipe, if any. If a callback is available, true is returned
|
/// Fetch the next pending callback on the given pipe, if any. If a callback is available, true is returned
|
||||||
/// and the structure is populated. In this case, you MUST call SteamAPI_ManualDispatch_FreeLastCallback
|
/// and the structure is populated. In this case, you MUST call SteamAPI_ManualDispatch_FreeLastCallback
|
||||||
/// (after dispatching the callback) before calling SteamAPI_ManualDispatch_GetNextCallback again.
|
/// (after dispatching the callback) before calling SteamAPI_ManualDispatch_GetNextCallback again.
|
||||||
S_API steam_bool S_CALLTYPE SteamAPI_ManualDispatch_GetNextCallback( HSteamPipe hSteamPipe, CallbackMsg_t *pCallbackMsg );
|
S_API bool S_CALLTYPE SteamAPI_ManualDispatch_GetNextCallback( HSteamPipe hSteamPipe, CallbackMsg_t *pCallbackMsg );
|
||||||
|
|
||||||
/// You must call this after dispatching the callback, if SteamAPI_ManualDispatch_GetNextCallback returns true.
|
/// You must call this after dispatching the callback, if SteamAPI_ManualDispatch_GetNextCallback returns true.
|
||||||
S_API void S_CALLTYPE SteamAPI_ManualDispatch_FreeLastCallback( HSteamPipe hSteamPipe );
|
S_API void S_CALLTYPE SteamAPI_ManualDispatch_FreeLastCallback( HSteamPipe hSteamPipe );
|
||||||
|
|
||||||
/// Return the call result for the specified call on the specified pipe. You really should
|
/// Return the call result for the specified call on the specified pipe. You really should
|
||||||
/// only call this in a handler for SteamAPICallCompleted_t callback.
|
/// only call this in a handler for SteamAPICallCompleted_t callback.
|
||||||
S_API steam_bool S_CALLTYPE SteamAPI_ManualDispatch_GetAPICallResult( HSteamPipe hSteamPipe, SteamAPICall_t hSteamAPICall, void *pCallback, int cubCallback, int iCallbackExpected, bool *pbFailed );
|
S_API bool S_CALLTYPE SteamAPI_ManualDispatch_GetAPICallResult( HSteamPipe hSteamPipe, SteamAPICall_t hSteamAPICall, void *pCallback, int cubCallback, int iCallbackExpected, bool *pbFailed );
|
||||||
|
|
||||||
//----------------------------------------------------------------------------------------------------------------------------------------------------------//
|
//----------------------------------------------------------------------------------------------------------------------------------------------------------//
|
||||||
//
|
//
|
||||||
|
|
|
@ -10,12 +10,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
for some dumb reason some games like carrion think a bool is an int and use the whole register as a return value
|
|
||||||
instead of using just al like a normal program.
|
|
||||||
*/
|
|
||||||
typedef unsigned steam_bool;
|
|
||||||
|
|
||||||
#define S_CALLTYPE __cdecl
|
#define S_CALLTYPE __cdecl
|
||||||
|
|
||||||
// Steam-specific types. Defined here so this header file can be included in other code bases.
|
// Steam-specific types. Defined here so this header file can be included in other code bases.
|
||||||
|
|
Loading…
Reference in New Issue