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

libraries/networking/src/ThreadedAssignment.cpp

@@ -70,10 +70,11 @@ void ThreadedAssignment::commonInit(const QString& targetName, NodeType_t nodeTy
     _domainServerTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
 
     if (shouldSendStats) {
-        // send a stats packet every 1 second
-        _statsTimer = new QTimer();
-        connect(_statsTimer, &QTimer::timeout, this, &ThreadedAssignment::sendStatsPacket);
-        _statsTimer->start(1000);
+        // start sending stats packet once we connect to the domain
+        connect(&nodeList->getDomainHandler(), &DomainHandler::connectedToDomain, this, &ThreadedAssignment::startSendingStats);
+        
+        // stop sending stats if we disconnect
+        connect(&nodeList->getDomainHandler(), &DomainHandler::disconnectedFromDomain, this, &ThreadedAssignment::stopSendingStats);
     }
 }
 
@@ -96,6 +97,21 @@ void ThreadedAssignment::sendStatsPacket() {
     addPacketStatsAndSendStatsPacket(statsObject);
 }
 
+void ThreadedAssignment::startSendingStats() {
+    // send the stats packet every 1s
+    if (!_statsTimer) {
+        _statsTimer = new QTimer();
+        connect(_statsTimer, &QTimer::timeout, this, &ThreadedAssignment::sendStatsPacket);
+    }
+    
+    _statsTimer->start(1000);
+}
+
+void ThreadedAssignment::stopSendingStats() {
+    // stop sending stats, we just disconnected from domain
+    _statsTimer->stop();
+}
+
 void ThreadedAssignment::checkInWithDomainServerOrExit() {
     if (DependencyManager::get<NodeList>()->getNumNoReplyDomainCheckIns() == MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
         setFinished(true);

libraries/networking/src/ThreadedAssignment.h

@@ -42,6 +42,8 @@ protected:
     QTimer* _statsTimer = nullptr;
 
 private slots:
+    void startSendingStats();
+    void stopSendingStats();
     void checkInWithDomainServerOrExit();
 };
 

libraries/networking/src/udt/ControlPacket.cpp

@@ -81,7 +81,7 @@ ControlPacket::ControlPacket(std::unique_ptr<char> data, qint64 size, const Hifi
     // sanity check before we decrease the payloadSize with the payloadCapacity
     Q_ASSERT(_payloadSize == _payloadCapacity);
     
-    adjustPayloadStartAndCapacity(_payloadSize > 0);
+    adjustPayloadStartAndCapacity(localHeaderSize(), _payloadSize > 0);
     
     readType();
 }

libraries/networking/src/udt/Packet.cpp

@@ -73,7 +73,7 @@ Packet::Packet(std::unique_ptr<char> data, qint64 size, const HifiSockAddr& send
 {
     readHeader();
 
-    adjustPayloadStartAndCapacity(_payloadSize > 0);
+    adjustPayloadStartAndCapacity(localHeaderSize(), _payloadSize > 0);
 }
 
 Packet::Packet(const Packet& other) :

libraries/networking/src/udt/Socket.cpp

@@ -140,8 +140,6 @@ void Socket::readPendingDatagrams() {
         // check if this was a control packet or a data packet
         bool isControlPacket = *buffer & CONTROL_BIT_MASK;
         
-        qDebug() << "IS CONTROL" << isControlPacket;
-        
         if (isControlPacket) {
             // setup a control packet from the data we just read
             auto controlPacket = ControlPacket::fromReceivedPacket(std::move(buffer), packetSizeWithHeader, senderSockAddr);