From c873e9dd6873786eaf19a9328ece81d8c2bf89a5 Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 13 Apr 2015 11:38:23 -0400 Subject: [PATCH] don't send reset message due problem at other side --- Streaming.cpp | 6 +++--- Streaming.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Streaming.cpp b/Streaming.cpp index a8f5a919..c26c6b40 100644 --- a/Streaming.cpp +++ b/Streaming.cpp @@ -487,7 +487,7 @@ namespace stream LogPrint (eLogInfo, "Trying to send stream data before closing"); break; case eStreamStatusReset: - SendClose (true); // send reset + SendClose (); Terminate (); m_LocalDestination.DeleteStream (shared_from_this ()); break; @@ -510,7 +510,7 @@ namespace stream }; } - void Stream::SendClose (bool reset) + void Stream::SendClose () { Packet * p = new Packet (); uint8_t * packet = p->GetBuffer (); @@ -526,7 +526,7 @@ namespace stream packet[size] = 0; size++; // NACK count size++; // resend delay - htobe16buf (packet + size, (reset ? PACKET_FLAG_RESET : PACKET_FLAG_CLOSE) | PACKET_FLAG_SIGNATURE_INCLUDED); + htobe16buf (packet + size, PACKET_FLAG_CLOSE | PACKET_FLAG_SIGNATURE_INCLUDED); size += 2; // flags size_t signatureLen = m_LocalDestination.GetOwner ().GetIdentity ().GetSignatureLen (); htobe16buf (packet + size, signatureLen); // signature only diff --git a/Streaming.h b/Streaming.h index 9c32a3c2..5e397c62 100644 --- a/Streaming.h +++ b/Streaming.h @@ -138,7 +138,7 @@ namespace stream void SendBuffer (); void SendQuickAck (); - void SendClose (bool reset = false); + void SendClose (); bool SendPacket (Packet * packet); void SendPackets (const std::vector& packets);