Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-14 13:26:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp

Browse source
This commit is contained in:
Stephen Birarda 2015-07-31 17:19:23 -07:00
commit ea5da73683
2 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libraries/networking/src/udt/ControlPacket.cpp
View file

@ -42,32 +42,11 @@ std::unique_ptr<ControlPacket> ControlPacket::fromReceivedPacket(std::unique_ptr
}
std::unique_ptr<ControlPacket> ControlPacket::create(Type type, qint64 size) {
std::unique_ptr<ControlPacket> controlPacket;
if (size == -1) {
return std::unique_ptr<ControlPacket>(new ControlPacket(type));
} else {
// Fail with invalid size
Q_ASSERT(size >= 0);
return std::unique_ptr<ControlPacket>(new ControlPacket(type, size));
}
}
ControlPacket::ControlPacket(Type type) :
BasePacket(-1),
_type(type)
{
adjustPayloadStartAndCapacity(ControlPacket::localHeaderSize());
open(QIODevice::ReadWrite);
writeType();
return std::unique_ptr<ControlPacket>(new ControlPacket(type, size));
}
ControlPacket::ControlPacket(Type type, qint64 size) :
BasePacket(ControlPacket::localHeaderSize() + size),
BasePacket((size == -1) ? -1 : ControlPacket::localHeaderSize() + size),
_type(type)
{
adjustPayloadStartAndCapacity(ControlPacket::localHeaderSize());

3
libraries/networking/src/udt/ControlPacket.h
View file

@ -47,8 +47,7 @@ public:
void setType(Type type);
private:
ControlPacket(Type type);
ControlPacket(Type type, qint64 size);
ControlPacket(Type type, qint64 size = -1);
ControlPacket(std::unique_ptr<char> data, qint64 size, const HifiSockAddr& senderSockAddr);
ControlPacket(ControlPacket&& other);
ControlPacket(const ControlPacket& other) = delete;