Blunkall-Technologies/Archimedes
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

segfault

Browse Source
This commit is contained in:
Nathan
2025-05-02 01:16:38 -05:00
parent 6f322cadb8
commit 74b82845b5
7 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/ServerModule/src/ServerModule.cpp
View File

@@ -6,9 +6,9 @@ ServerModule::ServerModule(Archimedes::App* a, void* h) : Archimedes::Module(a,
ServerModule::~ServerModule() {
if(app) {
app->unregisterEvent(SMEvent::DataRecievedEvent());
app->unregisterEvent(SMEvent::DataSentEvent());
app->unregisterEvent(SMEvent::ConnectionStatusChangedEvent());
app->unregisterEvent(Archimedes::DataRecievedEvent());
app->unregisterEvent(Archimedes::DataSentEvent());
app->unregisterEvent(Archimedes::ConnectionStatusChangedEvent());
GameNetworkingSockets_Kill();
}
@@ -16,9 +16,9 @@ ServerModule::~ServerModule() {
void ServerModule::onLoad() {
app->registerEvent(SMEvent::DataRecievedEvent());
app->registerEvent(SMEvent::DataSentEvent());
app->registerEvent(SMEvent::ConnectionStatusChangedEvent());
app->registerEvent(Archimedes::DataRecievedEvent());
app->registerEvent(Archimedes::DataSentEvent());
app->registerEvent(Archimedes::ConnectionStatusChangedEvent());
SteamDatagramErrMsg errMsg;
@@ -80,9 +80,9 @@ bool ServerModule::onEvent(const Archimedes::Event& event) {
unsigned int type = app->getEventType(event);
if(eventsToHandle & SMEventEnum::ConnectionStatusChanged && type == app->getEventType(SMEvent::ConnectionStatusChangedEvent())) {
if(eventsToHandle & SMEventEnum::ConnectionStatusChanged && type == app->getEventType(Archimedes::ConnectionStatusChangedEvent())) {
SMEvent::ConnectionStatusChangedEvent& e = (SMEvent::ConnectionStatusChangedEvent&) event;
Archimedes::ConnectionStatusChangedEvent& e = (Archimedes::ConnectionStatusChangedEvent&) event;
switch(e.info->m_info.m_eState) {
@@ -194,9 +194,9 @@ bool ServerModule::onEvent(const Archimedes::Event& event) {
}
return true;
} else if(eventsToHandle & SMEventEnum::DataRecieved && type == app->getEventType(SMEvent::DataRecievedEvent())) {
} else if(eventsToHandle & SMEventEnum::DataRecieved && type == app->getEventType(Archimedes::DataRecievedEvent())) {
return true;
} else if(eventsToHandle & SMEventEnum::DataSent && type == app->getEventType(SMEvent::DataSentEvent())) {
} else if(eventsToHandle & SMEventEnum::DataSent && type == app->getEventType(Archimedes::DataSentEvent())) {
return true;
}
@@ -217,6 +217,6 @@ void ServerModule::pollIncomingData() {
auto itClient = clients.find( pIncomingMsg->m_conn );
assert( itClient != clients.end() );
app->emitEvent(new SMEvent::DataRecievedEvent(pIncomingMsg));
app->emitEvent(new Archimedes::DataRecievedEvent(pIncomingMsg));
}
}

4
modules/ServerModule/src/ServerModule.h
View File

@@ -6,7 +6,7 @@
#include <steam/steamnetworkingsockets.h>
#include <steam/isteamnetworkingutils.h>
#include "ServerEvents.h"
#include "utils/Events/NetworkEvents.h"
class ServerModule : public Archimedes::Module {
@@ -76,7 +76,7 @@ class ServerModule : public Archimedes::Module {
}
void OnSteamNetConnectionStatusChanged( SteamNetConnectionStatusChangedCallback_t *pInfo ) {
app->emitEvent(new SMEvent::ConnectionStatusChangedEvent(pInfo));
app->emitEvent(new Archimedes::ConnectionStatusChangedEvent(pInfo));
}
std::map<HSteamNetConnection, unsigned int> clients;