Serialisation: Adjust method names/types

src/network/core/udp.cpp

@@ -97,7 +97,7 @@ void NetworkUDPSocketHandler::SendPacket(Packet *p, NetworkAddress *recv, bool a
 			frag.Send_uint8 (current_frag);
 			frag.Send_uint8 (frag_count);
 			frag.Send_uint16 (payload_size);
-			frag.Send_binary((const char *) p->GetBufferData() + offset, payload_size);
+			frag.Send_binary(p->GetBufferData() + offset, payload_size);
 			current_frag++;
 			offset += payload_size;
 			this->SendPacket(&frag, recv, all, broadcast, short_mtu);
@@ -239,7 +239,7 @@ void NetworkUDPSocketHandler::Receive_EX_MULTI(Packet *p, NetworkAddress *client
 		Packet merged(this, SHRT_MAX, 0);
 		merged.ReserveBuffer(total_payload);
 		for (auto &frag : fs.fragments) {
-			merged.Send_binary(frag.data(), frag.size());
+			merged.Send_binary((const byte *)frag.data(), frag.size());
 		}
 		merged.ParsePacketSize();
 		merged.PrepareToRead();

src/network/network.cpp

@@ -223,15 +223,6 @@ std::string GenerateCompanyPasswordHash(const std::string &password, const std::
 	return hashed_password.str();
 }
 
-struct HashBuffer : public BufferSerialisationHelper<HashBuffer> {
-	std::vector<byte> &buffer;
-
-	HashBuffer(std::vector<byte> &buffer) : buffer(buffer) {}
-
-	std::vector<byte> &GetSerialisationBuffer() { return this->buffer; }
-	size_t GetSerialisationLimit() const { return UINT32_MAX; }
-};
-
 /**
  * Hash the given password using server ID and game seed.
  * @param password Password to hash.
@@ -245,7 +236,7 @@ std::vector<uint8> GenerateGeneralPasswordHash(const std::string &password, cons
 
 	std::vector<byte> data;
 	data.reserve(password.size() + password_server_id.size() + 6);
-	HashBuffer buffer(data);
+	BufferSerialiser buffer(data);
 
 	/* key field */
 	buffer.Send_uint64(password_game_seed);

src/network/network_client.cpp

@@ -557,7 +557,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::SendDesyncLog(const std::strin
 		Packet *p = new Packet(PACKET_CLIENT_DESYNC_LOG, SHRT_MAX);
 		size_t size = std::min<size_t>(log.size() - offset, SHRT_MAX - 2 - p->Size());
 		p->Send_uint16((uint16)size);
-		p->Send_binary(log.data() + offset, size);
+		p->Send_binary((const byte *)(log.data() + offset), size);
 		my_client->SendPacket(p);
 
 		offset += size;
@@ -1175,7 +1175,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_DESYNC_LOG(Pack
 {
 	uint size = p->Recv_uint16();
 	this->server_desync_log.resize(this->server_desync_log.size() + size);
-	p->Recv_binary(this->server_desync_log.data() + this->server_desync_log.size() - size, size);
+	p->Recv_binary((byte *)(this->server_desync_log.data() + this->server_desync_log.size() - size), size);
 	DEBUG(net, 2, "Received %u bytes of server desync log", size);
 	return NETWORK_RECV_STATUS_OKAY;
 }

src/network/network_command.cpp

@@ -343,7 +343,7 @@ const char *NetworkGameSocketHandler::ReceiveCommand(Packet *p, CommandPacket *c
 		CommandAuxiliarySerialised *aux_data = new CommandAuxiliarySerialised();
 		cp->aux_data.reset(aux_data);
 		aux_data->serialised_data.resize(aux_data_size);
-		p->Recv_binary((char *)(aux_data->serialised_data.data()), aux_data_size);
+		p->Recv_binary((aux_data->serialised_data.data()), aux_data_size);
 	}
 
 	return nullptr;

src/network/network_server.cpp

@@ -160,7 +160,7 @@ struct PacketWriter : SaveFilter {
 
 		byte *bufe = buf + size;
 		while (buf != bufe) {
-			size_t written = this->current->Send_bytes(buf, bufe);
+			size_t written = this->current->Send_binary_until_full(buf, bufe);
 			buf += written;
 
 			if (!this->current->CanWriteToPacket(1)) {
@@ -452,7 +452,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendDesyncLog(const std::strin
 		Packet *p = new Packet(PACKET_SERVER_DESYNC_LOG, SHRT_MAX);
 		size_t size = std::min<size_t>(log.size() - offset, SHRT_MAX - 2 - p->Size());
 		p->Send_uint16(static_cast<uint16>(size));
-		p->Send_binary(log.data() + offset, size);
+		p->Send_binary((const byte *)(log.data() + offset), size);
 		this->SendPacket(p);
 
 		offset += size;
@@ -1246,7 +1246,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_DESYNC_LOG(Pack
 {
 	uint size = p->Recv_uint16();
 	this->desync_log.resize(this->desync_log.size() + size);
-	p->Recv_binary(this->desync_log.data() + this->desync_log.size() - size, size);
+	p->Recv_binary((byte *)(this->desync_log.data() + this->desync_log.size() - size), size);
 	DEBUG(net, 2, "Received %u bytes of client desync log", size);
 	this->receive_limit += p->Size();
 	return NETWORK_RECV_STATUS_OKAY;