From af4acff261d579428e8eef042cc5359fa392f725 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 27 May 2014 13:33:54 -0700 Subject: Generate the char server protocol --- src/net/fwd.hpp | 2 + src/net/packets.hpp | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 2 deletions(-) (limited to 'src/net') diff --git a/src/net/fwd.hpp b/src/net/fwd.hpp index ca54e8d..109aeed 100644 --- a/src/net/fwd.hpp +++ b/src/net/fwd.hpp @@ -27,4 +27,6 @@ class IP4Address; class TimerData; +enum class RecvResult; + #endif // TMWA_NET_FWD_HPP diff --git a/src/net/packets.hpp b/src/net/packets.hpp index 6146b90..293aed8 100644 --- a/src/net/packets.hpp +++ b/src/net/packets.hpp @@ -77,6 +77,14 @@ SendResult net_send_fpacket(Session *s, const NetPacket_Fixed& fixed) return ok ? SendResult::Success : SendResult::Fail; } +template +__attribute__((warn_unused_result)) +SendResult net_send_ppacket(Session *s, const NetPacket_Payload& payload) +{ + bool ok = packet_send(s, reinterpret_cast(&payload), sizeof(NetPacket_Payload)); + return ok ? SendResult::Success : SendResult::Fail; +} + template __attribute__((warn_unused_result)) SendResult net_send_vpacket(Session *s, const NetPacket_Head& head, const std::vector>& repeat) @@ -86,6 +94,18 @@ SendResult net_send_vpacket(Session *s, const NetPacket_Head& head, const st return ok ? SendResult::Success : SendResult::Fail; } +template +__attribute__((warn_unused_result)) +SendResult net_send_opacket(Session *s, const NetPacket_Head& head, bool has_opt, const NetPacket_Option& opt) +{ + bool ok = packet_send(s, reinterpret_cast(&head), sizeof(NetPacket_Head)); + if (has_opt) + { + ok &= packet_send(s, reinterpret_cast(&opt), sizeof(NetPacket_Option)); + } + return ok ? SendResult::Success : SendResult::Fail; +} + template __attribute__((warn_unused_result)) RecvResult net_recv_fpacket(Session *s, NetPacket_Fixed& fixed) @@ -99,6 +119,19 @@ RecvResult net_recv_fpacket(Session *s, NetPacket_Fixed& fixed) return RecvResult::Incomplete; } +template +__attribute__((warn_unused_result)) +RecvResult net_recv_ppacket(Session *s, NetPacket_Payload& payload) +{ + bool ok = packet_fetch(s, 0, reinterpret_cast(&payload), sizeof(NetPacket_Payload)); + if (ok) + { + packet_discard(s, sizeof(NetPacket_Payload)); + return RecvResult::Complete; + } + return RecvResult::Incomplete; +} + template __attribute__((warn_unused_result)) RecvResult net_recv_vpacket(Session *s, NetPacket_Head& head, std::vector>& repeat) @@ -127,6 +160,37 @@ RecvResult net_recv_vpacket(Session *s, NetPacket_Head& head, std::vector +__attribute__((warn_unused_result)) +RecvResult net_recv_opacket(Session *s, NetPacket_Head& head, bool *has_opt, NetPacket_Option& opt) +{ + bool ok = packet_fetch(s, 0, reinterpret_cast(&head), sizeof(NetPacket_Head)); + if (ok) + { + Packet_Head nat; + if (!network_to_native(&nat, head)) + return RecvResult::Error; + if (packet_avail(s) < nat.magic_packet_length) + return RecvResult::Incomplete; + if (nat.magic_packet_length < sizeof(NetPacket_Head)) + return RecvResult::Error; + size_t bytes_repeat = nat.magic_packet_length - sizeof(NetPacket_Head); + if (bytes_repeat % sizeof(NetPacket_Repeat)) + return RecvResult::Error; + size_t has_opt_pls = bytes_repeat / sizeof(NetPacket_Option); + if (has_opt_pls > 1) + return RecvResult::Error; + *has_opt = has_opt_pls; + if (!*has_opt || packet_fetch(s, sizeof(NetPacket_Head), reinterpret_cast(&opt), sizeof(NetPacket_Option))) + { + packet_discard(s, nat.magic_packet_length); + return RecvResult::Complete; + } + return RecvResult::Incomplete; + } + return RecvResult::Incomplete; +} + template void send_fpacket(Session *s, const Packet_Fixed& fixed) @@ -145,6 +209,23 @@ void send_fpacket(Session *s, const Packet_Fixed& fixed) s->set_eof(); } +template +void send_ppacket(Session *s, Packet_Payload& payload) +{ + static_assert(id == Packet_Payload::PACKET_ID, "Packet_Payload::PACKET_ID"); + + NetPacket_Payload net_payload; + payload.magic_packet_length = sizeof(NetPacket_Payload); + if (!native_to_network(&net_payload, payload)) + { + s->set_eof(); + return; + } + SendResult rv = net_send_ppacket(s, net_payload); + if (rv != SendResult::Success) + s->set_eof(); +} + template void send_vpacket(Session *s, Packet_Head& head, const std::vector>& repeat) { @@ -183,6 +264,43 @@ void send_vpacket(Session *s, Packet_Head& head, const std::vectorset_eof(); } +template +void send_opacket(Session *s, Packet_Head& head, bool has_opt, const Packet_Option& opt) +{ + static_assert(id == Packet_Head::PACKET_ID, "Packet_Head::PACKET_ID"); + static_assert(headsize == sizeof(NetPacket_Head), "sizeof(NetPacket_Head)"); + static_assert(id == Packet_Option::PACKET_ID, "Packet_Option::PACKET_ID"); + static_assert(optsize == sizeof(NetPacket_Option), "sizeof(NetPacket_Option)"); + + NetPacket_Head net_head; + // since these are already allocated, can't overflow address space + size_t total_size = sizeof(NetPacket_Head) + has_opt * sizeof(NetPacket_Option); + // truncates + head.magic_packet_length = total_size; + if (head.magic_packet_length != total_size) + { + s->set_eof(); + return; + } + NetPacket_Option net_opt; + if (!native_to_network(&net_head, head)) + { + s->set_eof(); + return; + } + if (has_opt) + { + if (!native_to_network(&net_opt, opt)) + { + s->set_eof(); + return; + } + } + SendResult rv = net_send_opacket(s, net_head, has_opt, net_opt); + if (rv != SendResult::Success) + s->set_eof(); +} + template __attribute__((warn_unused_result)) RecvResult recv_fpacket(Session *s, Packet_Fixed& fixed) @@ -192,11 +310,30 @@ RecvResult recv_fpacket(Session *s, Packet_Fixed& fixed) NetPacket_Fixed net_fixed; RecvResult rv = net_recv_fpacket(s, net_fixed); - assert (fixed.magic_packet_id == Packet_Fixed::PACKET_ID); if (rv == RecvResult::Complete) { if (!network_to_native(&fixed, net_fixed)) return RecvResult::Error; + assert (fixed.magic_packet_id == Packet_Fixed::PACKET_ID); + } + return rv; +} + +template +__attribute__((warn_unused_result)) +RecvResult recv_ppacket(Session *s, Packet_Payload& payload) +{ + static_assert(id == Packet_Payload::PACKET_ID, "Packet_Payload::PACKET_ID"); + + NetPacket_Payload net_payload; + RecvResult rv = net_recv_ppacket(s, net_payload); + if (rv == RecvResult::Complete) + { + if (!network_to_native(&payload, net_payload)) + return RecvResult::Error; + assert (payload.magic_packet_id == Packet_Payload::PACKET_ID); + if (payload.magic_packet_length != sizeof(net_payload)) + return RecvResult::Error; } return rv; } @@ -213,11 +350,12 @@ RecvResult recv_vpacket(Session *s, Packet_Head& head, std::vector net_head; std::vector> net_repeat; RecvResult rv = net_recv_vpacket(s, net_head, net_repeat); - assert (head.magic_packet_id == Packet_Head::PACKET_ID); if (rv == RecvResult::Complete) { if (!network_to_native(&head, net_head)) return RecvResult::Error; + assert (head.magic_packet_id == Packet_Head::PACKET_ID); + repeat.resize(net_repeat.size()); for (size_t i = 0; i < net_repeat.size(); ++i) { @@ -228,6 +366,33 @@ RecvResult recv_vpacket(Session *s, Packet_Head& head, std::vector +__attribute__((warn_unused_result)) +RecvResult recv_opacket(Session *s, Packet_Head& head, bool *has_opt, Packet_Option& opt) +{ + static_assert(id == Packet_Head::PACKET_ID, "Packet_Head::PACKET_ID"); + static_assert(headsize == sizeof(NetPacket_Head), "NetPacket_Head"); + static_assert(id == Packet_Option::PACKET_ID, "Packet_Option::PACKET_ID"); + static_assert(optsize == sizeof(NetPacket_Option), "NetPacket_Option"); + + NetPacket_Head net_head; + NetPacket_Option net_opt; + RecvResult rv = net_recv_opacket(s, net_head, has_opt, net_opt); + if (rv == RecvResult::Complete) + { + if (!network_to_native(&head, net_head)) + return RecvResult::Error; + assert (head.magic_packet_id == Packet_Head::PACKET_ID); + + if (*has_opt) + { + if (!network_to_native(&opt, net_opt)) + return RecvResult::Error; + } + } + return rv; +} + // convenience for trailing strings -- cgit v1.2.3-60-g2f50