etc
/
SuperMarioOdysseyOnline
mirror of https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git
0
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/CraftyBoss/SuperMarioOdysseyOnline into dev

This commit is contained in:
CraftyBoss 2022-08-10 14:12:00 -07:00
parent 8f4fac417f 5f1a91161f
commit dc0930063d
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/server/Client.cpp
View File

@ -250,30 +250,34 @@ bool Client::startConnection() {
Logger::log("Sucessful Connection. Waiting to recieve init packet.\n");
bool waitingForInitPacket = true;
// wait for client init packet
while (true) {
while (waitingForInitPacket) {
if (mSocket->RECV()) {
Packet* curPacket = mSocket->mPacketQueue.popFront();
if(!mSocket->mPacketQueue.isEmpty()){
if (curPacket->mType == PacketType::CLIENTINIT) {
InitPacket* initPacket = (InitPacket*)curPacket;
Packet* curPacket = mSocket->mPacketQueue.popFront();
Logger::log("Server Max Player Size: %d\n", initPacket->maxPlayers);
if (curPacket->mType == PacketType::CLIENTINIT) {
InitPacket* initPacket = (InitPacket*)curPacket;
maxPuppets = initPacket->maxPlayers - 1;
} else {
Logger::log("First Packet was not Init!\n");
mIsConnectionActive = false;
Logger::log("Server Max Player Size: %d\n", initPacket->maxPlayers);
maxPuppets = initPacket->maxPlayers - 1;
} else {
Logger::log("First Packet was not Init!\n");
mIsConnectionActive = false;
}
free(curPacket);
waitingForInitPacket = false;
}
free(curPacket);
} else {
Logger::log("Recieve failed! Stopping Connection.\n");
mIsConnectionActive = false;
waitingForInitPacket = false;
}
break;
}
}

2
source/server/SocketBase.cpp
View File

@ -7,7 +7,7 @@ SocketBase::SocketBase(const char *name)
{
strcpy(this->sockName, name);
this->sock_flags = 0;
this->sock_flags = 0x80;
}
const char *SocketBase::getStateChar() {

12
source/server/SocketClient.cpp
View File

@ -84,7 +84,7 @@ bool SocketClient::SEND(Packet *packet) {
if (packet->mType != PLAYERINF && packet->mType != HACKCAPINF)
Logger::log("Sending packet: %s\n", packetNames[packet->mType]);
if ((valread = nn::socket::Send(this->socket_log_socket, buffer, packet->mPacketSize + sizeof(Packet), this->sock_flags) > 0)) {
if ((valread = nn::socket::Send(this->socket_log_socket, buffer, packet->mPacketSize + sizeof(Packet), 0) > 0)) {
return true;
} else {
Logger::log("Failed to Fully Send Packet! Result: %d Type: %s Packet Size: %d\n", valread, packetNames[packet->mType], packet->mPacketSize);
@ -117,9 +117,13 @@ bool SocketClient::RECV() {
if(result > 0) {
valread += result;
} else {
Logger::log("Header Read Failed! Value: %d Total Read: %d\n", result, valread);
this->closeSocket();
return false;
if(this->socket_errno==11){
return true;
} else {
Logger::log("Header Read Failed! Value: %d Total Read: %d\n", result, valread);
this->closeSocket();
return false;
}
}
}