temp

Author: kiwi515

lib/libkiwi/libkiwi.h

@@ -50,13 +50,16 @@
 #include <libkiwi/net/kiwiAsyncSocket.h>
 #include <libkiwi/net/kiwiEmuRichPresenceClient.h>
 #include <libkiwi/net/kiwiHttpRequest.h>
+#include <libkiwi/net/kiwiIPacket.h>
 #include <libkiwi/net/kiwiIRichPresenceClient.h>
-#include <libkiwi/net/kiwiPacket.h>
+#include <libkiwi/net/kiwiNetClient.h>
+#include <libkiwi/net/kiwiNetServer.h>
 #include <libkiwi/net/kiwiPortRegistry.h>
 #include <libkiwi/net/kiwiReliableClient.h>
 #include <libkiwi/net/kiwiReliablePacket.h>
 #include <libkiwi/net/kiwiReliableSocket.h>
 #include <libkiwi/net/kiwiRichPresenceMgr.h>
+#include <libkiwi/net/kiwiSizedPacket.h>
 #include <libkiwi/net/kiwiSocketBase.h>
 #include <libkiwi/net/kiwiSyncSocket.h>
 #include <libkiwi/net/kiwiWebSocket.h>

lib/libkiwi/net/kiwiAsyncSocket.cpp

@@ -406,6 +406,7 @@ SOResult AsyncSocket::RecvImpl(void* pDst, u32 len, u32& rRecv,
                                void* pArg) {
     K_ASSERT(IsOpen());
     K_ASSERT_PTR(pDst);
+    K_ASSERT_PTR(pCallback);
     K_ASSERT(OSIsMEM2Region(pDst));
 
     // Packet to hold incoming data
@@ -438,6 +439,7 @@ SOResult AsyncSocket::SendImpl(const void* pSrc, u32 len, u32& rSend,
                                void* pArg) {
     K_ASSERT(IsOpen());
     K_ASSERT_PTR(pSrc);
+    K_ASSERT_PTR(pCallback);
     K_ASSERT(OSIsMEM2Region(pSrc));
 
     // Packet to hold incoming data

lib/libkiwi/net/kiwiIPacket.h

@@ -0,0 +1,23 @@
+#ifndef LIBKIWI_NET_I_PACKET_H
+#define LIBKIWI_NET_I_PACKET_H
+#include <libkiwi/k_types.h>
+
+namespace kiwi {
+//! @addtogroup libkiwi_net
+//! @{
+
+/**
+ * @brief Network packet interface
+ */
+class IPacket {
+public:
+    /**
+     * @brief Destructor
+     */
+    virtual ~IPacket() {}
+};
+
+//! @}
+} // namespace kiwi
+
+#endif

lib/libkiwi/net/kiwiIPacketFactory.h

@@ -0,0 +1,31 @@
+#ifndef LIBKIWI_NET_I_PACKET_FACTORY_H
+#define LIBKIWI_NET_I_PACKET_FACTORY_H
+#include <libkiwi/k_types.h>
+
+namespace kiwi {
+//! @addtogroup libkiwi_net
+//! @{
+
+// Forward declarations
+class IPacket;
+
+/**
+ * @brief Packet factory interface
+ */
+class IPacketFactory {
+public:
+    /**
+     * @brief Destructor
+     */
+    virtual ~IPacketFactory() {}
+
+    /**
+     * @brief Creates a new packet object
+     */
+    virtual IPacket* Create() = 0;
+};
+
+//! @}
+} // namespace kiwi
+
+#endif

lib/libkiwi/net/kiwiNetClient.h

@@ -0,0 +1,55 @@
+#ifndef LIBKIWI_NET_NET_CLIENT_H
+#define LIBKIWI_NET_NET_CLIENT_H
+#include <libkiwi/k_types.h>
+
+#include <revolution/SO.h>
+
+namespace kiwi {
+//! @addtogroup libkiwi_net
+//! @{
+
+// Forward declarations
+class IPacket;
+class IPacketFactory;
+class SocketBase;
+
+/**
+ * @brief Network client
+ */
+class NetClient {
+public:
+    /**
+     * @brief Message receive callback
+     *
+     * @param pPacket Incoming packet (NULL if error occurred)
+     * @param result Socket operation result
+     * @param pArg Callback user argument
+     */
+    typedef void (*RecvCallback)(IPacket* pPacket, SOResult result, void* pArg);
+
+public:
+    /**
+     * @brief Constructor
+     *
+     * @param pSocket Network socket
+     * @param pPacketFactory Packet factory
+     */
+    NetClient(SocketBase* pSocket, IPacketFactory* pPacketFactory)
+        : mpSocket(pSocket), mpPacketFactory(pPacketFactory) {}
+
+    /**
+     * @brief Attempts to receive a message over the network
+     */
+    IPacket* Recv();
+
+private:
+    //! Network socket
+    SocketBase* mpSocket;
+    //! Packet factory
+    IPacketFactory* mpPacketFactory;
+};
+
+//! @}
+} // namespace kiwi
+
+#endif

lib/libkiwi/net/kiwiNetServer.h

@@ -0,0 +1,26 @@
+#ifndef LIBKIWI_NET_NET_SERVER_H
+#define LIBKIWI_NET_NET_SERVER_H
+#include <libkiwi/k_types.h>
+
+#include <revolution/SO.h>
+
+namespace kiwi {
+//! @addtogroup libkiwi_net
+//! @{
+
+// Forward declarations
+class IPacket;
+class IPacketFactory;
+class SocketBase;
+
+/**
+ * @brief Network server
+ */
+class NetServer {
+public:
+};
+
+//! @}
+} // namespace kiwi
+
+#endif

lib/libkiwi/net/kiwiPacketFactory.h

@@ -0,0 +1,27 @@
+#ifndef LIBKIWI_NET_PACKET_FACTORY_H
+#define LIBKIWI_NET_PACKET_FACTORY_H
+#include <libkiwi/k_types.h>
+#include <libkiwi/net/kiwiIPacketFactory.h>
+
+namespace kiwi {
+//! @addtogroup libkiwi_net
+//! @{
+
+/**
+ * @brief Generic packet factory implementation
+ *
+ * @tparam T Packet class type
+ */
+template <typename T = Packet> class TPacketFactory : public IPacketFactory {
+    /**
+     * @brief Creates a new network packet
+     */
+    virtual Packet* Create() {
+        return new T();
+    }
+};
+
+//! @}
+} // namespace kiwi
+
+#endif

lib/libkiwi/net/kiwiPacket.cpp lib/libkiwi/net/kiwiRawPacket.cpplib/libkiwi/net/kiwiPacket.cpp renamed to lib/libkiwi/net/kiwiRawPacket.cpp

@@ -44,6 +44,13 @@ class Packet {
         Free();
     }
 
+    /**
+     * @brief Allocates message buffer of the specified size
+     *
+     * @param size Packet size
+     */
+    virtual void Alloc(u32 size);
+
     /**
      * @brief Gets the current size of the message buffer
      */
@@ -124,13 +131,6 @@ class Packet {
         return mAddress;
     }
 
-    /**
-     * @brief Allocates message buffer of the specified size
-     *
-     * @param size Packet size
-     */
-    void Alloc(u32 size);
-
     /**
      * @brief Reads data from message buffer
      *