dummy udp socket

Author: kiwi515

lib/libkiwi/support/kiwiLibSO.cpp

@@ -473,17 +473,17 @@ s32 LibSO::RecvImpl(SOSocket socket, void* dst, u32 len, u32 flags,
 
     // Output vector 2: Source address
     IosObject<SockAddrAny> from;
-    IosVector dummy;
-    if (addr != nullptr) {
-        *from = *addr;
-        output.PushBack(from);
-    } else {
-        output.PushBack(dummy);
-    }
+    output.PushBack(from);
 
     s32 result = sDevNetIpTop.IoctlV(Ioctl_SORecvFrom, input, output);
     sLastError = result >= 0 ? SO_SUCCESS : static_cast<SOResult>(result);
 
+    if (sLastError == SO_SUCCESS) {
+        if (addr != NULL) {
+            *addr = *from;
+        }
+    }
+
     return result;
 }
 

src/core/EchoSocket.cpp

@@ -0,0 +1,56 @@
+#include "core/EchoSocket.h"
+
+#include <libkiwi.h>
+
+K_DYNAMIC_SINGLETON_IMPL(AP::EchoSocket);
+
+namespace AP {
+
+EchoSocket::EchoSocket() {
+    bool success;
+
+    mpSocket = new kiwi::SyncSocket( //
+        SO_PF_INET,                  /* ipv4 */
+        SO_SOCK_DGRAM                /* udp = datagram*/
+    );
+
+    ASSERT_PTR(mpSocket);
+    mpSocket->SetBlocking(false);
+
+    // Packet data buffer
+    mpDataBuffer = new (kiwi::EMemory_MEM2) u8[MAX_PACKET_SIZE];
+    ASSERT_PTR(mpDataBuffer);
+
+    // Bind to any available local address
+    kiwi::SockAddr4 addr(kiwi::port::AP_COMM);
+    success = mpSocket->Bind(addr);
+    ASSERT_EX(success, "Can't bind socket");
+
+    // Host address now has the correct IP
+    u16 port = addr.port;
+    mpSocket->GetHostAddr(addr);
+    addr.port = port;
+
+    kiwi::cout << "Echo socket listening on: " << kiwi::ToString(addr)
+               << kiwi::endl;
+
+    for (;;) {
+        // Receive packet from the peer
+        kiwi::Optional<u32> nrecv =
+            mpSocket->RecvBytesFrom(mpDataBuffer, MAX_PACKET_SIZE, mPeerAddr);
+
+        if (!nrecv) {
+            ASSERT_EX(false, "Socket error (errcode %d)",
+                      kiwi::LibSO::GetLastError());
+        }
+
+        if (*nrecv > 0) {
+            kiwi::cout << "Received data from " << kiwi::ToString(mPeerAddr)
+                       << "(" << *nrecv << " bytes)" << kiwi::endl;
+
+            mpSocket->SendBytesTo(mpDataBuffer, *nrecv, mPeerAddr);
+        }
+    }
+}
+
+} // namespace AP

src/core/EchoSocket.h

@@ -0,0 +1,28 @@
+#ifndef APCLIENT_CORE_ECHO_SOCKET_H
+#define APCLIENT_CORE_ECHO_SOCKET_H
+#include <types.h>
+
+#include <libkiwi.h>
+
+namespace AP {
+
+class EchoSocket : public kiwi::DynamicSingleton<EchoSocket> {
+    friend class kiwi::DynamicSingleton<EchoSocket>;
+
+private:
+    static const u32 MAX_PACKET_SIZE = 256;
+
+private:
+    static void SocketCallbackFunc(SOResult result, void* pArg);
+
+    EchoSocket();
+
+private:
+    kiwi::SyncSocket* mpSocket;
+    u8* mpDataBuffer;
+    kiwi::SockAddr4 mPeerAddr;
+};
+
+} // namespace AP
+
+#endif

src/main.cpp

@@ -1,5 +1,6 @@
 #include "core/CheckMgr.h"
 #include "core/CosmeticMgr.h"
+#include "core/EchoSocket.h"
 #include "core/ItemMgr.h"
 #include "core/const.h"
 #include <Pack/RPSystem.h>
@@ -42,6 +43,8 @@ void KokeshiMain() {
     // Enter first scene
     kiwi::SceneCreator::GetInstance().ChangeBootScene();
 
+    AP::EchoSocket::CreateInstance();
+
     // Enter game loop
     RP_GET_INSTANCE(RPSysSystem)->mainLoop();
 

src/scene/DebugRootScene/SeqSelectPage.cpp

@@ -12,7 +12,7 @@ namespace {
 // clang-format off
 
 // List of all scenes/sequences/stages
-#define USE_GAME_DATA()                                                                \
+#define USE_GAME_DATA                                                                  \
     X(Swf,                                                                             \
         Y(Swf_Vs,  Z(Main))                                                            \
         Y(Swf_Prc, Z(Main))                                                            \
@@ -60,22 +60,22 @@ namespace {
 // Generate gamemode keys
 #define X(S, QT) namespace S { const char* GAMEMODE_KEYS[] = { QT }; }
 #define Y(Q, T) #Q,
-USE_GAME_DATA();
+USE_GAME_DATA;
 #undef X
 #undef Y
 
 // Generate gamemode values
 #define X(S, QT) namespace S { const Sp2::Cmn::ESeq GAMEMODE_VALUES[] = { QT }; }
 #define Y(Q, T) Sp2::Cmn::ESeq_##Q,
-USE_GAME_DATA();
+USE_GAME_DATA;
 #undef X
 #undef Y
 
 // Generate stage keys
 #define X(S, QT) QT
 #define Y(Q, T) namespace Q { const char* STAGENO_KEYS[] = { T }; }
 #define Z(T) #T,
-USE_GAME_DATA();
+USE_GAME_DATA;
 #undef X
 #undef Y
 #undef Z
@@ -84,7 +84,7 @@ USE_GAME_DATA();
 #define X(S, QT) QT
 #define Y(Q, T) namespace Q { enum STAGENO_ENUM { T }; const u32 STAGENO_VALUES[] = { T }; }
 #define Z(T) T,
-USE_GAME_DATA();
+USE_GAME_DATA;
 #undef X
 #undef Y
 #undef Z
@@ -221,7 +221,7 @@ void SeqSelectPage::CalcOption() {
         break;                                                                 \
     }
 
-    switch (mNextScene) { USE_GAME_DATA(); }
+    switch (mNextScene) { USE_GAME_DATA; }
 #undef X
 
     // Setup StageNo option by the selected sequence
@@ -239,7 +239,7 @@ void SeqSelectPage::CalcOption() {
         break;                                                                 \
     }
 
-    switch (mNextScene) { USE_GAME_DATA(); }
+    switch (mNextScene) { USE_GAME_DATA; }
 #undef X
 #undef Y
 }
@@ -259,7 +259,7 @@ void SeqSelectPage::SetupGame() {
         seq = S::GAMEMODE_VALUES[mGameMode.GetValue()];                        \
         break;                                                                 \
     }
-    switch (mNextScene) { USE_GAME_DATA(); }
+    switch (mNextScene) { USE_GAME_DATA; }
 #undef X
 #undef Y
 
@@ -276,7 +276,7 @@ void SeqSelectPage::SetupGame() {
         break;                                                                 \
     }
 
-    switch (mNextScene) { USE_GAME_DATA(); }
+    switch (mNextScene) { USE_GAME_DATA; }
 #undef X
 #undef Y