etc/SuperMarioOdysseyOnline
0
0
Fork 0
mirror of https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git synced 2024-11-22 03:05:16 +00:00
Code Issues Projects Releases Wiki Activity

Refactor member variable names

Browse source
This commit is contained in:
Jack Garrard 2022-10-27 00:25:37 -07:00
parent 4a5a10f910
commit 28c7f92453
2 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/server/SocketClient.hpp
View file

@ -44,8 +44,8 @@ class SocketClient : public SocketBase {
void printPacket(Packet* packet); void printPacket(Packet* packet);
bool isConnected() { return socket_log_state == SOCKET_LOG_CONNECTED; } bool isConnected() { return socket_log_state == SOCKET_LOG_CONNECTED; }
u16 getLocalUdpPort(); u16 getLocalUdpPort();
s32 setPeerUdpPort(u16 port); s32 setPeerUdpPort(u16 port);
const char* getUdpStateChar(); const char* getUdpStateChar();
u32 getSendCount() { return mSendQueue.getCount(); } u32 getSendCount() { return mSendQueue.getCount(); }
@ -66,12 +66,11 @@ class SocketClient : public SocketBase {
sead::MessageQueue mSendQueue; sead::MessageQueue mSendQueue;
char* recvBuf = nullptr; char* recvBuf = nullptr;
int maxBufSize = 100; int mMaxBufSize = 100;
bool mIsFirstConnect = true;
bool has_recv_udp; bool mHasRecvUdp;
s32 udp_socket; s32 mUdpSocket;
sockaddr udp_addr; sockaddr mUdpAddress;
/** /**

28
source/server/SocketClient.cpp
View file

@ -81,7 +81,7 @@ nn::Result SocketClient::init(const char* ip, u16 port) {
return result; return result;
} }
if ((this->udp_socket = nn::socket::Socket(2, 2, 17)) < 0) { if ((this->ket = nn::socket::Socket(2, 2, 17)) < 0) {
Logger::log("Udp Socket failed to create"); Logger::log("Udp Socket failed to create");
this->socket_errno = nn::socket::GetLastErrno(); this->socket_errno = nn::socket::GetLastErrno();
this->socket_log_state = SOCKET_LOG_UNAVAILABLE; this->socket_log_state = SOCKET_LOG_UNAVAILABLE;
@ -91,8 +91,8 @@ nn::Result SocketClient::init(const char* ip, u16 port) {
udpAddress.address = hostAddress; udpAddress.address = hostAddress;
udpAddress.port = 0; udpAddress.port = 0;
udpAddress.family = 2; udpAddress.family = 2;
this->udp_addr = udpAddress; this->mUdpAddress = udpAddress;
this->has_recv_udp = false; this->mHasRecvUdp = false;
this->socket_log_state = SOCKET_LOG_CONNECTED; this->socket_log_state = SOCKET_LOG_CONNECTED;
@ -124,7 +124,7 @@ u16 SocketClient::getLocalUdpPort() {
u32 size = sizeof(udpAddress); u32 size = sizeof(udpAddress);
nn::Result result; nn::Result result;
if((result = nn::socket::GetSockName(this->udp_socket, &udpAddress, &size)).isFailure()) { if((result = nn::socket::GetSockName(this->ket, &udpAddress, &size)).isFailure()) {
this->socket_errno = nn::socket::GetLastErrno(); this->socket_errno = nn::socket::GetLastErrno();
return 0; return 0;
} }
@ -135,10 +135,10 @@ u16 SocketClient::getLocalUdpPort() {
s32 SocketClient::setPeerUdpPort(u16 port) { s32 SocketClient::setPeerUdpPort(u16 port) {
u16 net_port = nn::socket::InetHtons(port); u16 net_port = nn::socket::InetHtons(port);
this->udp_addr.port = net_port; this->mUdpAddress.port = net_port;
nn::Result result; nn::Result result;
if((result = nn::socket::Connect(this->udp_socket, &this->udp_addr, sizeof(this->udp_addr))).isFailure()) { if((result = nn::socket::Connect(this->ket, &this->mUdpAddress, sizeof(this->mUdpAddress))).isFailure()) {
Logger::log("Udp Socket Connection Failed!\n"); Logger::log("Udp Socket Connection Failed!\n");
this->socket_errno = nn::socket::GetLastErrno(); this->socket_errno = nn::socket::GetLastErrno();
this->socket_log_state = SOCKET_LOG_UNAVAILABLE; this->socket_log_state = SOCKET_LOG_UNAVAILABLE;
@ -150,11 +150,11 @@ s32 SocketClient::setPeerUdpPort(u16 port) {
} }
const char* SocketClient::getUdpStateChar() { const char* SocketClient::getUdpStateChar() {
if (this->udp_addr.port == 0) { if (this->mUdpAddress.port == 0) {
return "Waiting for handshake"; return "Waiting for handshake";
} }
if (!this->has_recv_udp) { if (!this->mHasRecvUdp) {
return "Waiting for holepunch"; return "Waiting for holepunch";
} }
@ -170,12 +170,12 @@ bool SocketClient::send(Packet *packet) {
int valread = 0; int valread = 0;
int fd = -1; int fd = -1;
if ((packet->mType != PLAYERINF && packet->mType != HACKCAPINF && packet->mType != HOLEPUNCH) || !this->has_recv_udp) { if ((packet->mType != PLAYERINF && packet->mType != HACKCAPINF && packet->mType != HOLEPUNCH) || !this->mHasRecvUdp) {
Logger::log("Sending packet: %s\n", packetNames[packet->mType]); Logger::log("Sending packet: %s\n", packetNames[packet->mType]);
fd = this->socket_log_socket; fd = this->socket_log_socket;
} else { } else {
fd = this->udp_socket; fd = this->ket;
} }
@ -206,7 +206,7 @@ bool SocketClient::recv() {
pfds[0].fd = this->socket_log_socket; pfds[0].fd = this->socket_log_socket;
pfds[0].events = 1; pfds[0].events = 1;
pfds[0].revents = 0; pfds[0].revents = 0;
pfds[1].fd = this->udp_socket; pfds[1].fd = this->ket;
pfds[1].events = 1; pfds[1].events = 1;
pfds[1].revents = 0; pfds[1].revents = 0;
@ -247,7 +247,7 @@ bool SocketClient::recv() {
return true; return true;
} }
this->has_recv_udp = true; this->mHasRecvUdp = true;
char* packetBuf = (char*)mHeap->alloc(fullSize); char* packetBuf = (char*)mHeap->alloc(fullSize);
if (packetBuf){ if (packetBuf){
@ -385,8 +385,8 @@ bool SocketClient::closeSocket() {
Logger::log("Closing Socket.\n"); Logger::log("Closing Socket.\n");
has_recv_udp = false; mHasRecvUdp = false;
udp_addr.port = 0; mUdpAddress.port = 0;
bool result = false; bool result = false;
if (!(result = SocketBase::closeSocket())) { if (!(result = SocketBase::closeSocket())) {