From a92502ebf69c011c0ee487921b2829686be60e15 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 15 Oct 2014 22:54:47 -0700 Subject: Split protocol generation headers --- src/proto-base/fwd.hpp | 27 +++++++++++ src/proto-base/net-array.hpp | 53 ++++++++++++++++++++++ src/proto-base/net-neutral.hpp | 38 ++++++++++++++++ src/proto-base/net-skewed-length.hpp | 46 +++++++++++++++++++ src/proto-base/net-string.hpp | 87 ++++++++++++++++++++++++++++++++++++ 5 files changed, 251 insertions(+) create mode 100644 src/proto-base/fwd.hpp create mode 100644 src/proto-base/net-array.hpp create mode 100644 src/proto-base/net-neutral.hpp create mode 100644 src/proto-base/net-skewed-length.hpp create mode 100644 src/proto-base/net-string.hpp (limited to 'src/proto-base') diff --git a/src/proto-base/fwd.hpp b/src/proto-base/fwd.hpp new file mode 100644 index 0000000..560f7fc --- /dev/null +++ b/src/proto-base/fwd.hpp @@ -0,0 +1,27 @@ +#pragma once +// proto-base/fwd.hpp - list of type names for network protocol base +// +// Copyright © 2014 Ben Longbons +// +// This file is part of The Mana World (Athena server) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +#include "../sanity.hpp" + + +namespace tmwa +{ +// meh, add more when I feel like it +} // namespace tmwa diff --git a/src/proto-base/net-array.hpp b/src/proto-base/net-array.hpp new file mode 100644 index 0000000..814d257 --- /dev/null +++ b/src/proto-base/net-array.hpp @@ -0,0 +1,53 @@ +#pragma once +// proto2/net-array.hpp - Special logic for fixed-size arrays in packets. +// +// Copyright © 2014 Ben Longbons +// +// This file is part of The Mana World (Athena server) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +#include "fwd.hpp" + +#include "../generic/array.hpp" + + +namespace tmwa +{ +template +struct NetArray +{ + T data[N]; +}; +template +bool native_to_network(NetArray *network, GenericArray native) +{ + for (size_t i = 0; i < I::alloc_size; ++i) + { + if (!native_to_network(&(*network).data[i], native[I::offset_to_index(i)])) + return false; + } + return true; +} +template +bool network_to_native(GenericArray *native, NetArray network) +{ + for (size_t i = 0; i < I::alloc_size; ++i) + { + if (!network_to_native(&(*native)[I::offset_to_index(i)], network.data[i])) + return false; + } + return true; +} +} // namespace tmwa diff --git a/src/proto-base/net-neutral.hpp b/src/proto-base/net-neutral.hpp new file mode 100644 index 0000000..523748c --- /dev/null +++ b/src/proto-base/net-neutral.hpp @@ -0,0 +1,38 @@ +#pragma once +// proto2/net-neutral.hpp - Convert nothing across the network +// +// Copyright © 2014 Ben Longbons +// +// This file is part of The Mana World (Athena server) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +#include "fwd.hpp" + + +namespace tmwa +{ +template +bool native_to_network(T *network, T native) +{ + *network = native; + return true; +} +template +bool network_to_native(T *native, T network) +{ + *native = network; + return true; +} +} // namespace tmwa diff --git a/src/proto-base/net-skewed-length.hpp b/src/proto-base/net-skewed-length.hpp new file mode 100644 index 0000000..84af508 --- /dev/null +++ b/src/proto-base/net-skewed-length.hpp @@ -0,0 +1,46 @@ +#pragma once +// proto2/net-skewed-length.hpp - Deprecated logic for skewed-size packets. +// +// Copyright © 2014 Ben Longbons +// +// This file is part of The Mana World (Athena server) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +#include "fwd.hpp" + +#include + + +namespace tmwa +{ +template +struct SkewedLength +{ + T data; +}; +template +bool native_to_network(SkewedLength *network, U native) +{ + native -= N; + return native_to_network(&network->data, native); +} +template +bool network_to_native(U *native, SkewedLength network) +{ + bool rv = network_to_native(native, network.data); + *native += N; + return rv; +} +} // namespace tmwa diff --git a/src/proto-base/net-string.hpp b/src/proto-base/net-string.hpp new file mode 100644 index 0000000..a9a120d --- /dev/null +++ b/src/proto-base/net-string.hpp @@ -0,0 +1,87 @@ +#pragma once +// proto2/net-string.hpp - Special logic for fixed-size strings in packets. +// +// Copyright © 2014 Ben Longbons +// +// This file is part of The Mana World (Athena server) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +#include "fwd.hpp" + +#include "../strings/vstring.hpp" + +#include "../mmo/strs.hpp" + + +namespace tmwa +{ +template +struct NetString +{ + char data[N]; +}; +template +bool native_to_network(NetString *network, VString native) +{ + // basically WBUF_STRING + char *const begin = network->data; + char *const end = begin + N; + char *const mid = std::copy(native.begin(), native.end(), begin); + std::fill(mid, end, '\0'); + return true; +} +template +bool network_to_native(VString *native, NetString network) +{ + // basically RBUF_STRING + const char *const begin = network.data; + const char *const end = begin + N; + const char *const mid = std::find(begin, end, '\0'); + *native = XString(begin, mid, nullptr); + return true; +} + +inline +bool native_to_network(NetString<24> *network, CharName native) +{ + VString<23> tmp = native.to__actual(); + bool rv = native_to_network(network, tmp); + return rv; +} +inline +bool network_to_native(CharName *native, NetString<24> network) +{ + VString<23> tmp; + bool rv = network_to_native(&tmp, network); + *native = stringish(tmp); + return rv; +} + +inline +bool native_to_network(NetString<16> *network, MapName native) +{ + XString tmp = native; + bool rv = native_to_network(network, VString<15>(tmp)); + return rv; +} +inline +bool network_to_native(MapName *native, NetString<16> network) +{ + VString<15> tmp; + bool rv = network_to_native(&tmp, network); + *native = stringish(tmp); + return rv; +} +} // namespace tmwa -- cgit v1.2.3-60-g2f50