summaryrefslogtreecommitdiff
path: root/src/network/packet.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/network/packet.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/network/packet.cpp b/src/network/packet.cpp
index d6c8dc646..0e22f1eb4 100644
--- a/src/network/packet.cpp
+++ b/src/network/packet.cpp
@@ -65,80 +65,80 @@ Packet::operator bool() const {
65 return is_valid; 65 return is_valid;
66} 66}
67 67
68Packet& Packet::operator>>(bool& out_data) { 68Packet& Packet::Read(bool& out_data) {
69 u8 value{}; 69 u8 value{};
70 if (*this >> value) { 70 if (Read(value)) {
71 out_data = (value != 0); 71 out_data = (value != 0);
72 } 72 }
73 return *this; 73 return *this;
74} 74}
75 75
76Packet& Packet::operator>>(s8& out_data) { 76Packet& Packet::Read(s8& out_data) {
77 Read(&out_data, sizeof(out_data)); 77 Read(&out_data, sizeof(out_data));
78 return *this; 78 return *this;
79} 79}
80 80
81Packet& Packet::operator>>(u8& out_data) { 81Packet& Packet::Read(u8& out_data) {
82 Read(&out_data, sizeof(out_data)); 82 Read(&out_data, sizeof(out_data));
83 return *this; 83 return *this;
84} 84}
85 85
86Packet& Packet::operator>>(s16& out_data) { 86Packet& Packet::Read(s16& out_data) {
87 s16 value{}; 87 s16 value{};
88 Read(&value, sizeof(value)); 88 Read(&value, sizeof(value));
89 out_data = ntohs(value); 89 out_data = ntohs(value);
90 return *this; 90 return *this;
91} 91}
92 92
93Packet& Packet::operator>>(u16& out_data) { 93Packet& Packet::Read(u16& out_data) {
94 u16 value{}; 94 u16 value{};
95 Read(&value, sizeof(value)); 95 Read(&value, sizeof(value));
96 out_data = ntohs(value); 96 out_data = ntohs(value);
97 return *this; 97 return *this;
98} 98}
99 99
100Packet& Packet::operator>>(s32& out_data) { 100Packet& Packet::Read(s32& out_data) {
101 s32 value{}; 101 s32 value{};
102 Read(&value, sizeof(value)); 102 Read(&value, sizeof(value));
103 out_data = ntohl(value); 103 out_data = ntohl(value);
104 return *this; 104 return *this;
105} 105}
106 106
107Packet& Packet::operator>>(u32& out_data) { 107Packet& Packet::Read(u32& out_data) {
108 u32 value{}; 108 u32 value{};
109 Read(&value, sizeof(value)); 109 Read(&value, sizeof(value));
110 out_data = ntohl(value); 110 out_data = ntohl(value);
111 return *this; 111 return *this;
112} 112}
113 113
114Packet& Packet::operator>>(s64& out_data) { 114Packet& Packet::Read(s64& out_data) {
115 s64 value{}; 115 s64 value{};
116 Read(&value, sizeof(value)); 116 Read(&value, sizeof(value));
117 out_data = ntohll(value); 117 out_data = ntohll(value);
118 return *this; 118 return *this;
119} 119}
120 120
121Packet& Packet::operator>>(u64& out_data) { 121Packet& Packet::Read(u64& out_data) {
122 u64 value{}; 122 u64 value{};
123 Read(&value, sizeof(value)); 123 Read(&value, sizeof(value));
124 out_data = ntohll(value); 124 out_data = ntohll(value);
125 return *this; 125 return *this;
126} 126}
127 127
128Packet& Packet::operator>>(float& out_data) { 128Packet& Packet::Read(float& out_data) {
129 Read(&out_data, sizeof(out_data)); 129 Read(&out_data, sizeof(out_data));
130 return *this; 130 return *this;
131} 131}
132 132
133Packet& Packet::operator>>(double& out_data) { 133Packet& Packet::Read(double& out_data) {
134 Read(&out_data, sizeof(out_data)); 134 Read(&out_data, sizeof(out_data));
135 return *this; 135 return *this;
136} 136}
137 137
138Packet& Packet::operator>>(char* out_data) { 138Packet& Packet::Read(char* out_data) {
139 // First extract string length 139 // First extract string length
140 u32 length = 0; 140 u32 length = 0;
141 *this >> length; 141 Read(length);
142 142
143 if ((length > 0) && CheckSize(length)) { 143 if ((length > 0) && CheckSize(length)) {
144 // Then extract characters 144 // Then extract characters
@@ -152,10 +152,10 @@ Packet& Packet::operator>>(char* out_data) {
152 return *this; 152 return *this;
153} 153}
154 154
155Packet& Packet::operator>>(std::string& out_data) { 155Packet& Packet::Read(std::string& out_data) {
156 // First extract string length 156 // First extract string length
157 u32 length = 0; 157 u32 length = 0;
158 *this >> length; 158 Read(length);
159 159
160 out_data.clear(); 160 out_data.clear();
161 if ((length > 0) && CheckSize(length)) { 161 if ((length > 0) && CheckSize(length)) {
@@ -169,71 +169,71 @@ Packet& Packet::operator>>(std::string& out_data) {
169 return *this; 169 return *this;
170} 170}
171 171
172Packet& Packet::operator<<(bool in_data) { 172Packet& Packet::Write(bool in_data) {
173 *this << static_cast<u8>(in_data); 173 Write(static_cast<u8>(in_data));
174 return *this; 174 return *this;
175} 175}
176 176
177Packet& Packet::operator<<(s8 in_data) { 177Packet& Packet::Write(s8 in_data) {
178 Append(&in_data, sizeof(in_data)); 178 Append(&in_data, sizeof(in_data));
179 return *this; 179 return *this;
180} 180}
181 181
182Packet& Packet::operator<<(u8 in_data) { 182Packet& Packet::Write(u8 in_data) {
183 Append(&in_data, sizeof(in_data)); 183 Append(&in_data, sizeof(in_data));
184 return *this; 184 return *this;
185} 185}
186 186
187Packet& Packet::operator<<(s16 in_data) { 187Packet& Packet::Write(s16 in_data) {
188 s16 toWrite = htons(in_data); 188 s16 toWrite = htons(in_data);
189 Append(&toWrite, sizeof(toWrite)); 189 Append(&toWrite, sizeof(toWrite));
190 return *this; 190 return *this;
191} 191}
192 192
193Packet& Packet::operator<<(u16 in_data) { 193Packet& Packet::Write(u16 in_data) {
194 u16 toWrite = htons(in_data); 194 u16 toWrite = htons(in_data);
195 Append(&toWrite, sizeof(toWrite)); 195 Append(&toWrite, sizeof(toWrite));
196 return *this; 196 return *this;
197} 197}
198 198
199Packet& Packet::operator<<(s32 in_data) { 199Packet& Packet::Write(s32 in_data) {
200 s32 toWrite = htonl(in_data); 200 s32 toWrite = htonl(in_data);
201 Append(&toWrite, sizeof(toWrite)); 201 Append(&toWrite, sizeof(toWrite));
202 return *this; 202 return *this;
203} 203}
204 204
205Packet& Packet::operator<<(u32 in_data) { 205Packet& Packet::Write(u32 in_data) {
206 u32 toWrite = htonl(in_data); 206 u32 toWrite = htonl(in_data);
207 Append(&toWrite, sizeof(toWrite)); 207 Append(&toWrite, sizeof(toWrite));
208 return *this; 208 return *this;
209} 209}
210 210
211Packet& Packet::operator<<(s64 in_data) { 211Packet& Packet::Write(s64 in_data) {
212 s64 toWrite = htonll(in_data); 212 s64 toWrite = htonll(in_data);
213 Append(&toWrite, sizeof(toWrite)); 213 Append(&toWrite, sizeof(toWrite));
214 return *this; 214 return *this;
215} 215}
216 216
217Packet& Packet::operator<<(u64 in_data) { 217Packet& Packet::Write(u64 in_data) {
218 u64 toWrite = htonll(in_data); 218 u64 toWrite = htonll(in_data);
219 Append(&toWrite, sizeof(toWrite)); 219 Append(&toWrite, sizeof(toWrite));
220 return *this; 220 return *this;
221} 221}
222 222
223Packet& Packet::operator<<(float in_data) { 223Packet& Packet::Write(float in_data) {
224 Append(&in_data, sizeof(in_data)); 224 Append(&in_data, sizeof(in_data));
225 return *this; 225 return *this;
226} 226}
227 227
228Packet& Packet::operator<<(double in_data) { 228Packet& Packet::Write(double in_data) {
229 Append(&in_data, sizeof(in_data)); 229 Append(&in_data, sizeof(in_data));
230 return *this; 230 return *this;
231} 231}
232 232
233Packet& Packet::operator<<(const char* in_data) { 233Packet& Packet::Write(const char* in_data) {
234 // First insert string length 234 // First insert string length
235 u32 length = static_cast<u32>(std::strlen(in_data)); 235 u32 length = static_cast<u32>(std::strlen(in_data));
236 *this << length; 236 Write(length);
237 237
238 // Then insert characters 238 // Then insert characters
239 Append(in_data, length * sizeof(char)); 239 Append(in_data, length * sizeof(char));
@@ -241,10 +241,10 @@ Packet& Packet::operator<<(const char* in_data) {
241 return *this; 241 return *this;
242} 242}
243 243
244Packet& Packet::operator<<(const std::string& in_data) { 244Packet& Packet::Write(const std::string& in_data) {
245 // First insert string length 245 // First insert string length
246 u32 length = static_cast<u32>(in_data.size()); 246 u32 length = static_cast<u32>(in_data.size());
247 *this << length; 247 Write(length);
248 248
249 // Then insert characters 249 // Then insert characters
250 if (length > 0) 250 if (length > 0)