From b1d5ff8898c1cca680842848586251c6f64b6932 Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Tue, 28 Feb 2023 16:46:41 -0400 Subject: TTcpSocket: Start work on `TTcpSocket` I've done most of it, still have to do `test_connection()`, and `open()`. --- context.h | 190 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 116 insertions(+), 74 deletions(-) (limited to 'context.h') diff --git a/context.h b/context.h index 52f9bb8..8851136 100644 --- a/context.h +++ b/context.h @@ -88,6 +88,7 @@ typedef long ptrdiff_t; #define FOREACH_NODE_NODECL_MULTI_ITER(type, first, varname, ...) for (varname = (type *)(first); varname != NULL; varname = (type *)(varname->next()), __VA_ARGS__) #define __packed__ +#define WEAK_FUNC __declspec(weak) #define PRIVATE_MEMBER_GETTER(type, name) \ type name() { \ @@ -118,6 +119,14 @@ typedef long ptrdiff_t; PRIVATE_MEMBER_GETTER(type, name); \ PRIVATE_MEMBER_SETTER(type, name) +#define PRIVATE_MEMBER_ACCESSORS(type, name) \ + PRIVATE_MEMBER_GETTER(type &, name); \ + PRIVATE_MEMBER_SETTER(type, name) + +#define PRIVATE_MEMBER_ACCESSORS_NON_REF(type, name) \ + PRIVATE_MEMBER_GETTER(type, name); \ + PRIVATE_MEMBER_SETTER(type, name) + #define PRIVATE_MEMBER_ACCESSORS_ARRAY(type, name, size) \ PRIVATE_MEMBER_GETTER_ARRAY(type, name, size) @@ -148,6 +157,9 @@ typedef long ptrdiff_t; // pso/forward.h // Class forward. +class TTcpSocket; +class PSOV3EncryptionTCP; +class TSocket; class THeap; class TObject; class TMainTask; @@ -434,8 +446,12 @@ TMenuListEntry &TMenuListEntry::operator=(const TMenuListEntry &src) { // Const defs. static const int tl_object_count = 20; -// TObject.cpp +// TTcpSocket.cpp // Extern defs. +EXTERN_OBJECT_NAME(TTcpSocket); +extern TTcpSocket *tcp_socket_table[16]; + +// TObject.cpp #define o(name) extern const char *name##_name; OBJECT_NAMES #undef o @@ -568,77 +584,6 @@ private: u32 m_seed; }; -// pso/TSocket.h -class TSocket : public TObject { -private: - void set_flags(u8 flags) { - m_sock_flags |= flags; - }; - - void clear_flags(u8 flags) { - m_sock_flags &= ~flags; - }; - - void toggle_flags(u8 flags) { - m_sock_flags ^= flags; - }; - - u8 get_flags(u8 flags) { - return m_sock_flags & flags; - }; - - ipv4_addr m_dst_addr; - u16 m_dst_port; - u16 m_src_port; - ipv4_addr m_src_addr; - s16 m_sock_fd; - u8 m_sock_flags; - bool m_buffer_cleared; - s16 m_size; - s16 m_buffer_offset; - u32 m_unused; - TArray m_unused2; - TArray m_packet_buffer; - s16 m_stat; - u16 m_unused3; - u32 m_send_window; - u32 m_recv_window; - void (*m_callback)(TSocket *socket); -public: - TSocket(TObject *parent); - virtual ~TSocket(); - - virtual int open() = 0; - virtual int close() = 0; - virtual void recv() = 0; - virtual int send(u8 *data) = 0; - virtual int send(u8 *data, size_t size) = 0; - - int resolve_domain(char *domain); - void set_ip_address(u32 addr); - void set_port(u32 port); - const u8 next(); - int is_empty(); - - PRIVATE_MEMBER_ACCESSORS(ipv4_addr, dst_addr); - PRIVATE_MEMBER_ACCESSORS(u16, dst_port); - PRIVATE_MEMBER_ACCESSORS(u16, src_port); - PRIVATE_MEMBER_ACCESSORS(ipv4_addr, src_addr); - PRIVATE_MEMBER_ACCESSORS(s16, sock_fd); - PRIVATE_MEMBER_ACCESSORS(u8, sock_flags); - PRIVATE_MEMBER_ACCESSORS(bool, buffer_cleared); - PRIVATE_MEMBER_ACCESSORS(s16, size); - PRIVATE_MEMBER_ACCESSORS(s16, buffer_offset); - PRIVATE_MEMBER_ACCESSORS(u32, unused); - PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, unused2, 64); - PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, packet_buffer, 2048); - PRIVATE_MEMBER_ACCESSORS(s16, stat); - PRIVATE_MEMBER_ACCESSORS(u16, unused3); - PRIVATE_MEMBER_ACCESSORS(u32, send_window); - PRIVATE_MEMBER_ACCESSORS(u32, recv_window); - PRIVATE_MEMBER_ACCESSORS_FUNC(void, callback, TSocket *socket); -}; - // pso/THeap.h class THeap { public: @@ -798,6 +743,103 @@ public: bool toggle_flag_9_if_flag_10_is_clear(); }; +// pso/TSocket.h +class TSocket : public TObject { +private: + ipv4_addr m_dst_addr; + u16 m_dst_port; + u16 m_src_port; + ipv4_addr m_src_addr; + s16 m_sock_fd; + u8 m_sock_flags; + bool m_buffer_cleared; + s16 m_size; + s16 m_buffer_offset; + u32 m_unused; + TArray m_unused2; + TArray m_packet_buffer; + s16 m_stat_val; + u16 m_unused3; + u32 m_send_window; + u32 m_recv_window; + void (*m_callback)(TSocket *socket); +public: + TSocket(TObject *parent); + virtual ~TSocket(); + + virtual short open() = 0; + virtual short close() = 0; + virtual void recv() = 0; + virtual short send(u8 *data) = 0; + virtual int send(u8 *data, size_t size) = 0; + + int resolve_domain(char *domain); + void set_ip_address(u32 addr); + void set_port(u32 port); + const u8 next(); + int is_empty(); + + void set_flags(u8 flags) { + m_sock_flags |= flags; + }; + + void clear_flags(u8 flags) { + m_sock_flags &= ~flags; + }; + + void toggle_flags(u8 flags) { + m_sock_flags ^= flags; + }; + + u8 get_flags(u8 flags) { + return m_sock_flags & flags; + }; + + PRIVATE_MEMBER_ACCESSORS(ipv4_addr, dst_addr); + PRIVATE_MEMBER_ACCESSORS(u16, dst_port); + PRIVATE_MEMBER_ACCESSORS(u16, src_port); + PRIVATE_MEMBER_ACCESSORS(ipv4_addr, src_addr); + PRIVATE_MEMBER_ACCESSORS(s16, sock_fd); + PRIVATE_MEMBER_ACCESSORS(u8, sock_flags); + PRIVATE_MEMBER_ACCESSORS(bool, buffer_cleared); + PRIVATE_MEMBER_ACCESSORS(s16, size); + PRIVATE_MEMBER_ACCESSORS(s16, buffer_offset); + PRIVATE_MEMBER_ACCESSORS(u32, unused); + PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, unused2, 64); + PRIVATE_MEMBER_ACCESSORS_ARRAY(u8, packet_buffer, 2048); + PRIVATE_MEMBER_ACCESSORS(s16, stat_val); + PRIVATE_MEMBER_ACCESSORS(u16, unused3); + PRIVATE_MEMBER_ACCESSORS(u32, send_window); + PRIVATE_MEMBER_ACCESSORS(u32, recv_window); + PRIVATE_MEMBER_ACCESSORS_FUNC(void, callback, TSocket *socket); +}; + +// pso/TTcpSocket.h +class TTcpSocket : public TSocket { +private: + PSOV3EncryptionTCP m_send_crypt; + PSOV3EncryptionTCP m_recv_crypt; + int m_is_encrypted; +public: + WEAK_FUNC TTcpSocket(TObject *parent = nullptr); + virtual ~TTcpSocket(); + + virtual short open() override; + virtual short close() override; + virtual void recv() override; + virtual short send(u8 *data) override; + virtual int send(u8 *data, size_t size) override; + + int stat(); + int test_connection(); + + static void notify(short size, short sock_fd); + + PRIVATE_MEMBER_ACCESSORS(PSOV3EncryptionTCP, send_crypt); + PRIVATE_MEMBER_ACCESSORS(PSOV3EncryptionTCP, recv_crypt); + PRIVATE_MEMBER_ACCESSORS(int, is_encrypted); +}; + // pso/TMainTask.h class TMainTask : public TObject { public: @@ -864,8 +906,8 @@ public: virtual u32 next() override; PRIVATE_MEMBER_ACCESSORS_ARRAY(u32, buffer, 522); - PRIVATE_MEMBER_ACCESSORS(u32 *, buffer_start); - PRIVATE_MEMBER_ACCESSORS(u32 *, buffer_end); + PRIVATE_MEMBER_ACCESSORS_NON_REF(u32 *, buffer_start); + PRIVATE_MEMBER_ACCESSORS_NON_REF(u32 *, buffer_end); private: TArray m_buffer; -- cgit v1.2.3-13-gbd6f