OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-05 06:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from dongresource/work

Browse Source 
-Wall, #pragma once, nanoSummonHandler() cleanup, verbosity levels
This commit is contained in:
CPunch 2020-08-23 16:57:58 -05:00 committed by GitHub
commit 55add82843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 62 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,6 +1,6 @@
CXX=clang++
# -w suppresses all warnings (the part that's commented out helps me find memory leaks, it ruins performance though!)
CXXFLAGS=-std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
CXXFLAGS=-Wall -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
LDFLAGS=-lpthread
# specifies the name of our exectuable
SERVER=bin/fusion
@ -11,7 +11,7 @@ PROTOCOL_VERSION?=104
# Windows-specific
WIN_CXX=x86_64-w64-mingw32-g++
WIN_CXXFLAGS=-std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
WIN_CXXFLAGS=-Wall -std=c++17 -O3 -DPROTOCOL_VERSION=$(PROTOCOL_VERSION) #-g3 -fsanitize=address
WIN_LDFLAGS=-static -lws2_32 -lwsock32
WIN_SERVER=bin/winfusion.exe

8
config.ini
View File

@ -1,5 +1,9 @@
# should the server print every packet it receives?
verbose=false
# verbosity level
# 0 = mostly silence
# 1 = debug prints and unknown packets
# 2 = print all packets except LIVE_CHECK and movement
# 3 = print all packets
verbosity=1
# Login Server configuration
[login]

7
src/CNLoginServer.cpp
View File

@ -17,8 +17,7 @@ CNLoginServer::CNLoginServer(uint16_t p) {
}
void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
if (settings::VERBOSE)
std::cout << "OpenFusion: received " << Defines::p2str(CL2LS, data->type) << " (" << data->type << ")" << std::endl;
printPacket(data, CL2LS);
switch (data->type) {
case P_CL2LS_REQ_LOGIN: {
@ -27,7 +26,6 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
sP_CL2LS_REQ_LOGIN* login = (sP_CL2LS_REQ_LOGIN*)data->buf;
INITSTRUCT(sP_LS2CL_REP_LOGIN_SUCC, resp);
uint64_t cachedKey = sock->getEKey(); // so we can still send the resp packet with the correct key
int charCount = 2; // send 4 randomly generated characters for now
DEBUGLOG(
@ -281,7 +279,8 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
break;
}
default:
std::cerr << "OpenFusion: LOGIN UNIMPLM ERR. PacketType: " << Defines::p2str(CL2LS, data->type) << " (" << data->type << ")" << std::endl;
if (settings::VERBOSITY)
std::cerr << "OpenFusion: LOGIN UNIMPLM ERR. PacketType: " << Defines::p2str(CL2LS, data->type) << " (" << data->type << ")" << std::endl;
break;
}
}

5
src/CNLoginServer.hpp
View File

@ -1,5 +1,4 @@
#ifndef _CNLS_HPP
#define _CNLS_HPP
#pragma once
#include "CNProtocol.hpp"
#include "Defines.hpp"
@ -24,5 +23,3 @@ public:
void newConnection(CNSocket* cns);
void killConnection(CNSocket* cns);
};
#endif

24
src/CNProtocol.cpp
View File

@ -63,7 +63,7 @@ int CNSocketEncryption::decryptData(uint8_t* buffer, uint8_t* key, int size) {
// ========================================================[[ CNPacketData ]]========================================================
CNPacketData::CNPacketData(void* b, uint32_t t, int l): buf(b), type(t), size(l) {}
CNPacketData::CNPacketData(void* b, uint32_t t, int l): buf(b), size(l), type(t) {}
// ========================================================[[ CNSocket ]]========================================================
@ -361,6 +361,28 @@ void CNServer::kill() {
connections.clear();
}
void CNServer::printPacket(CNPacketData *data, int type) {
if (settings::VERBOSITY < 2)
return;
if (settings::VERBOSITY < 3) switch (data->type) {
case P_CL2LS_REP_LIVE_CHECK:
case P_CL2FE_REP_LIVE_CHECK:
case P_CL2FE_REQ_PC_MOVE:
case P_CL2FE_REQ_PC_JUMP:
case P_CL2FE_REQ_PC_SLOPE:
case P_CL2FE_REQ_PC_MOVEPLATFORM:
case P_CL2FE_REQ_PC_MOVETRANSPORTATION:
case P_CL2FE_REQ_PC_ZIPLINE:
case P_CL2FE_REQ_PC_JUMPPAD:
case P_CL2FE_REQ_PC_LAUNCHER:
case P_CL2FE_REQ_PC_STOP:
return;
}
std::cout << "OpenFusion: received " << Defines::p2str(type, data->type) << " (" << data->type << ")" << std::endl;
}
void CNServer::newConnection(CNSocket* cns) {} // stubbed
void CNServer::killConnection(CNSocket* cns) {} // stubbed
void CNServer::onTimer() {} // stubbed

11
src/CNProtocol.hpp
View File

@ -1,8 +1,7 @@
#ifndef _CNP_HPP
#define _CNP_HPP
#pragma once
#define MAX_PACKETSIZE 8192
#define DEBUGLOG(x) x
#define DEBUGLOG(x) if (settings::VERBOSITY) {x};
#include <iostream>
#include <stdio.h>
@ -39,6 +38,9 @@
#include <list>
#include <queue>
#include "Defines.hpp"
#include "settings.hpp"
#if defined(__MINGW32__) && !defined(_GLIBCXX_HAS_GTHREADS)
#include "mingw/mingw.mutex.h"
#else
@ -148,9 +150,8 @@ public:
void start();
void kill();
static void printPacket(CNPacketData *data, int type);
virtual void newConnection(CNSocket* cns);
virtual void killConnection(CNSocket* cns);
virtual void onTimer(); // called every 2 seconds
};
#endif

6
src/CNShardServer.cpp
View File

@ -18,13 +18,11 @@ CNShardServer::CNShardServer(uint16_t p) {
}
void CNShardServer::handlePacket(CNSocket* sock, CNPacketData* data) {
if (settings::VERBOSE)
std::cout << "OpenFusion: received " << Defines::p2str(CL2FE, data->type) << " (" << data->type << ")" << std::endl;
printPacket(data, CL2FE);
if (ShardPackets.find(data->type) != ShardPackets.end())
ShardPackets[data->type](sock, data);
else
else if (settings::VERBOSITY)
std::cerr << "OpenFusion: SHARD UNIMPLM ERR. PacketType: " << Defines::p2str(CL2FE, data->type) << " (" << data->type << ")" << std::endl;
}

5
src/CNShardServer.hpp
View File

@ -1,5 +1,4 @@
#ifndef _CNSS_HPP
#define _CNSS_HPP
#pragma once
#include "CNProtocol.hpp"
#include "Defines.hpp"
@ -21,5 +20,3 @@ public:
void killConnection(CNSocket* cns);
void onTimer();
};
#endif

5
src/CNShared.hpp
View File

@ -3,8 +3,7 @@
There's some data shared between the Login Server and the Shard Server. Of course all of this needs to be thread-safe. No mucking about on this one!
*/
#ifndef _CNSD_HPP
#define _CNSD_HPP
#pragma once
#include <map>
#include <string>
@ -19,5 +18,3 @@ namespace CNSharedData {
Player getPlayer(int64_t sk);
void erasePlayer(int64_t sk);
}
#endif

5
src/CNStructs.hpp
View File

@ -2,8 +2,7 @@
CNStructs.hpp - defines some basic structs & useful methods for packets used by FusionFall based on the version defined
*/
#ifndef _CNS_HPP
#define _CNS_HPP
#pragma once
#ifdef _MSC_VER
// codecvt_* is deprecated in C++17 and MSVC will throw an annoying warning because of that.
@ -45,5 +44,3 @@ uint64_t getTime();
#else
#error Invalid PROTOCOL_VERSION
#endif
#endif

5
src/ChatManager.hpp
View File

@ -1,5 +1,4 @@
#ifndef _CM_HPP
#define _CM_HPP
#pragma once
#include "CNShardServer.hpp"
@ -10,5 +9,3 @@ namespace ChatManager {
void emoteHandler(CNSocket* sock, CNPacketData* data);
void menuChatHandler(CNSocket* sock, CNPacketData* data);
}
#endif

5
src/ItemManager.hpp
View File

@ -1,5 +1,4 @@
#ifndef _IM_HPP
#define _IM_HPP
#pragma once
#include "CNShardServer.hpp"
@ -9,5 +8,3 @@ namespace ItemManager {
void itemDeleteHandler(CNSocket* sock, CNPacketData* data);
void itemGMGiveHandler(CNSocket* sock, CNPacketData* data);
}
#endif

5
src/NPCManager.hpp
View File

@ -1,5 +1,4 @@
#ifndef _NPCMANAGER_HPP
#define _NPCMANAGER_HPP
#pragma once
#include "CNProtocol.hpp"
#include "PlayerManager.hpp"
@ -20,5 +19,3 @@ namespace NPCManager {
void npcWarpManager(CNSocket* sock, CNPacketData* data);
}
#endif

15
src/NanoManager.cpp
View File

@ -93,14 +93,13 @@ void NanoManager::nanoSummonHandler(CNSocket* sock, CNPacketData* data) {
sNano nano = plr.plr.Nanos[nanoId];
// Send to other players
for (CNSocket *s : PlayerManager::players[sock].viewable) {
INITSTRUCT(sP_FE2CL_NANO_ACTIVE, pkt);
INITSTRUCT(sP_FE2CL_NANO_ACTIVE, pkt1);
pkt.iPC_ID = plr.plr.iID;
pkt.Nano = nano;
pkt1.iPC_ID = plr.plr.iID;
pkt1.Nano = nano;
s->sendPacket((void*)&pkt, P_FE2CL_NANO_ACTIVE, sizeof(sP_FE2CL_NANO_ACTIVE));
}
for (CNSocket *s : PlayerManager::players[sock].viewable)
s->sendPacket((void*)&pkt1, P_FE2CL_NANO_ACTIVE, sizeof(sP_FE2CL_NANO_ACTIVE));
// update player
plr.plr.nano = nanoId;
@ -184,8 +183,8 @@ void NanoManager::setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId)
std::cout << U16toU8(plr.PCStyle.szFirstName) << U16toU8(plr.PCStyle.szLastName) << " set skill id " << skillId << " for nano: " << nanoId << std::endl;
)
// Update the player
PlayerManager::updatePlayer(sock, plr);
// Update the player
PlayerManager::updatePlayer(sock, plr);
}
void NanoManager::resetNanoSkill(CNSocket* sock, int16_t nanoId) {

5
src/NanoManager.hpp
View File

@ -1,5 +1,4 @@
#ifndef _NM_HPP
#define _NM_HPP
#pragma once
#include "CNShardServer.hpp"
@ -17,5 +16,3 @@ namespace NanoManager {
void setNanoSkill(CNSocket* sock, int16_t nanoId, int16_t skillId);
void resetNanoSkill(CNSocket* sock, int16_t nanoId);
}
#endif

5
src/PlayerManager.hpp
View File

@ -1,5 +1,4 @@
#ifndef _PM_HPP
#define _PM_HPP
#pragma once
#include "Player.hpp"
#include "CNProtocol.hpp"
@ -44,5 +43,3 @@ namespace PlayerManager {
void heartbeatPlayer(CNSocket* sock, CNPacketData* data);
void exitGame(CNSocket* sock, CNPacketData* data);
}
#endif

4
src/settings.cpp
View File

@ -3,7 +3,7 @@
#include "contrib/INIReader.hpp"
// defaults :)
bool settings::VERBOSE = false;
int settings::VERBOSITY = 1;
int settings::LOGINPORT = 8001;
bool settings::LOGINRANDCHARACTERS = false;
@ -32,7 +32,7 @@ void settings::init() {
return;
}
VERBOSE = reader.GetBoolean("", "verbose", VERBOSE);
VERBOSITY = reader.GetInteger("", "verbosity", VERBOSITY);
LOGINPORT = reader.GetInteger("login", "port", LOGINPORT);
LOGINRANDCHARACTERS = reader.GetBoolean("login", "randomcharacters", LOGINRANDCHARACTERS);
SHARDPORT = reader.GetInteger("shard", "port", SHARDPORT);

7
src/settings.hpp
View File

@ -1,8 +1,7 @@
#ifndef _SETT_HPP
#define _SETT_HPP
#pragma once
namespace settings {
extern bool VERBOSE;
extern int VERBOSITY;
extern int LOGINPORT;
extern bool LOGINRANDCHARACTERS;
extern int SHARDPORT;
@ -17,5 +16,3 @@ namespace settings {
void init();
}
#endif