Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 16:03:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Atlante45 2015-07-27 20:45:47 -07:00
commit 6577845d3f
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/networking/src/udt/Connection.cpp
View file

@ -167,6 +167,9 @@ void Connection::processControl(unique_ptr<ControlPacket> controlPacket) {
break;
}
case ControlPacket::ACK2: {
// change the type of the packet to an ACK2 and send it back
controlPacket->setType(ControlPacket::ACK2);
_sendQueue->sendPacket(*controlPacket);
break;
}

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

@ -94,12 +94,24 @@ ControlPacket& ControlPacket::operator=(ControlPacket&& other) {
static const uint32_t CONTROL_BIT_MASK = 1 << (sizeof(ControlPacket::ControlBitAndType) - 1);
void ControlPacket::setType(udt::ControlPacket::Type type) {
_type = type;
writeType();
}
void ControlPacket::writeControlBitAndType() {
ControlBitAndType* bitAndType = reinterpret_cast<ControlBitAndType*>(_packet.get());
// write the control bit by OR'ing the current value with the CONTROL_BIT_MASK
*bitAndType = (*bitAndType | CONTROL_BIT_MASK);
// write the type by OR'ing the type with the current value & CONTROL_BIT_MASK
writeType();
}
void ControlPacket::writeType() {
ControlBitAndType* bitAndType = reinterpret_cast<ControlBitAndType*>(_packet.get());
// write the type by OR'ing the new type with the current value & CONTROL_BIT_MASK
*bitAndType = (*bitAndType & CONTROL_BIT_MASK) | (_type << sizeof((ControlPacket::Type) - 1));
}

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

@ -41,6 +41,7 @@ public:
virtual qint64 totalHeadersSize() const; // Cumulated size of all the headers
Type getType() const { return _type; }
void setType(Type type);
private:
ControlPacket(Type type);
@ -54,6 +55,7 @@ private:
// Header writers
void writeControlBitAndType();
void writeType();
Type _type;
};