5 files changed, 256 insertions, 0 deletions
diff --git a/src/proto-base/fwd.hpp b/src/proto-base/fwd.hpp
new file mode 100644
index 0000000..1790717
--- /dev/null
+++ b/src/proto-base/fwd.hpp
@@ -0,0 +1,32 @@
+#pragma once
+//    proto-base/fwd.hpp - list of type names for network protocol base
+//
+//    Copyright © 2014 Ben Longbons <b.r.longbons@gmail.com>
+//
+//    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 <http://www.gnu.org/licenses/>.
+
+#include "../sanity.hpp"
+
+#include "../strings/fwd.hpp" // rank 1
+#include "../generic/fwd.hpp" // rank 3
+#include "../mmo/fwd.hpp" // rank 6
+// proto-base/fwd.hpp is rank 7
+
+
+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 <b.r.longbons@gmail.com>
+//
+//    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 <http://www.gnu.org/licenses/>.
+
+#include "fwd.hpp"
+
+#include "../generic/array.hpp"
+
+
+namespace tmwa
+{
+template<class T, size_t N>
+struct NetArray
+{
+    T data[N];
+};
+template<class T, class U, class I>
+bool native_to_network(NetArray<T, I::alloc_size> *network, GenericArray<U, I> 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<class T, class U, class I>
+bool network_to_native(GenericArray<U, I> *native, NetArray<T, I::alloc_size> 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 <b.r.longbons@gmail.com>
+//
+//    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 <http://www.gnu.org/licenses/>.
+
+#include "fwd.hpp"
+
+
+namespace tmwa
+{
+template<class T>
+bool native_to_network(T *network, T native)
+{
+    *network = native;
+    return true;
+}
+template<class T>
+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 <b.r.longbons@gmail.com>
+//
+//    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 <http://www.gnu.org/licenses/>.
+
+#include "fwd.hpp"
+
+#include <cstddef>
+
+
+namespace tmwa
+{
+template<class T, size_t N>
+struct SkewedLength
+{
+    T data;
+};
+template<class T, size_t N, class U>
+bool native_to_network(SkewedLength<T, N> *network, U native)
+{
+    native -= N;
+    return native_to_network(&network->data, native);
+}
+template<class T, size_t N, class U>
+bool network_to_native(U *native, SkewedLength<T, N> 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 <b.r.longbons@gmail.com>
+//
+//    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 <http://www.gnu.org/licenses/>.
+
+#include "fwd.hpp"
+
+#include "../strings/vstring.hpp"
+
+#include "../mmo/strs.hpp"
+
+
+namespace tmwa
+{
+template<size_t N>
+struct NetString
+{
+    char data[N];
+};
+template<size_t N>
+bool native_to_network(NetString<N> *network, VString<N-1> 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<size_t N>
+bool network_to_native(VString<N-1> *native, NetString<N> 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<CharName>(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<MapName>(tmp);
+    return rv;
+}
+} // namespace tmwa