Yeehaw.
This commit is contained in:
@@ -196,52 +196,53 @@ void Server::Run() {
|
||||
if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
|
||||
Packet pck = getPack(&m_buf);
|
||||
switch (pck.type) {
|
||||
case netprot::PACKET_TYPE::ERR:
|
||||
using enum netprot::PACKET_TYPE;
|
||||
case ERR:
|
||||
std::cout << "ERROR!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::INPUT:
|
||||
case INPUT:
|
||||
std::cout << "INPUT!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::OUTPUT:
|
||||
case OUTPUT:
|
||||
std::cout << "OUTPUT!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::SYNC:
|
||||
case SYNC:
|
||||
std::cout << "SYNC!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::TEAMINF:
|
||||
case TEAMINF:
|
||||
std::cout << "TEAMINF!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::SELFINF:
|
||||
case SELFINF:
|
||||
std::cout << "SELFINF!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::PLAYINF:
|
||||
case PLAYINF:
|
||||
std::cout << "PLAYINF!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::LOGINF:
|
||||
case LOGINF:
|
||||
std::cout << "LOGINF!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::CHUNKMOD:
|
||||
case CHUNKMOD:
|
||||
std::cout << "CHUNKMOD!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::PLAYERMOD:
|
||||
case PLAYERMOD:
|
||||
std::cout << "PLAYERMOD!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::PICKUPMOD:
|
||||
case PICKUPMOD:
|
||||
std::cout << "PICKUPMOD!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::GAMEINFO:
|
||||
case GAMEINFO:
|
||||
std::cout << "GAMEINFO!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::ENDINFO:
|
||||
case ENDINFO:
|
||||
std::cout << "ENDINFO!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::CHAT:
|
||||
case CHAT:
|
||||
std::cout << "CHAT!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::ERRLOG:
|
||||
case ERRLOG:
|
||||
std::cout << "ERRLOG!" << std::endl;
|
||||
break;
|
||||
case netprot::PACKET_TYPE::LAST_PACK:
|
||||
case LAST_PACK:
|
||||
std::cout << "wtf?!" << std::endl;
|
||||
break;
|
||||
}
|
||||
@@ -271,14 +272,14 @@ inline std::string Server::LogTimestamp() {
|
||||
|
||||
void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
|
||||
switch (m_log) {
|
||||
using enum LOG_DEST; // C++20!
|
||||
case LOGFILE:
|
||||
m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
||||
break;
|
||||
case CONSOLE:
|
||||
default:
|
||||
std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
||||
break;
|
||||
using enum LOG_DEST; // C++20!
|
||||
case LOGFILE:
|
||||
m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
||||
break;
|
||||
case CONSOLE: [[fallthrough]]; // Pour dire que c'est voulu que ça traverse vers le case en dessous (C++17!)
|
||||
default:
|
||||
std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
||||
break;
|
||||
}
|
||||
|
||||
if (is_fatal) {
|
||||
@@ -315,23 +316,3 @@ uint64_t Server::getUniqueId() {
|
||||
m_ids.pop_back();
|
||||
return id;
|
||||
}
|
||||
|
||||
// Test serialize/deserialize:
|
||||
/*
|
||||
netprot::LoginInfo log, log2;
|
||||
std::cout << "Nom? ";
|
||||
std::cin.getline(log.name, 32); // NO! STD::CIN >> VARIABLE;! EVEEEEEERRRR!!!
|
||||
log.sid = 12345;
|
||||
char* buf = new char[150];
|
||||
uint32_t buflen = 150;
|
||||
|
||||
netprot::Serialize(&log, &buf, &buflen);
|
||||
|
||||
bool is_work = netprot::Deserialize(&log2, buf, buflen);
|
||||
|
||||
std::string str;
|
||||
str.append(is_work ? "Y " : "N ").append(log2.name).append(": ").append(std::to_string(log2.sid));
|
||||
|
||||
Log(str, false, false);
|
||||
*/
|
||||
|
||||
|
Reference in New Issue
Block a user