From 59a5482473f04e62e853141d4e610c2b8dee8f9a Mon Sep 17 00:00:00 2001
From: Bryan Biedenkapp <gatekeep@gmail.com>
Date: Thu, 25 Jul 2024 15:30:08 -0400
Subject: [PATCH] silence "Failed writing data to the network" messages;
 silence out-of-sequence warnings if the pktSeq is 0; when the master reports
 it is closing, have peers restart their connection states;

---
 src/common/network/FrameQueue.cpp    | 2 +-
 src/common/network/RawFrameQueue.cpp | 4 ++--
 src/fne/network/FNENetwork.cpp       | 2 +-
 src/host/network/Network.cpp         | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/common/network/FrameQueue.cpp b/src/common/network/FrameQueue.cpp
index 08ae5d72..c1daca3c 100644
--- a/src/common/network/FrameQueue.cpp
+++ b/src/common/network/FrameQueue.cpp
@@ -130,7 +130,7 @@ bool FrameQueue::write(const uint8_t* message, uint32_t length, uint32_t streamI
 
     bool ret = true;
     if (!m_socket->write(buffer, bufferLen, addr, addrLen)) {
-        LogError(LOG_NET, "Failed writing data to the network");
+        // LogError(LOG_NET, "Failed writing data to the network");
         ret = false;
     }
 
diff --git a/src/common/network/RawFrameQueue.cpp b/src/common/network/RawFrameQueue.cpp
index 40bf0fe2..f5a9f9e8 100644
--- a/src/common/network/RawFrameQueue.cpp
+++ b/src/common/network/RawFrameQueue.cpp
@@ -91,7 +91,7 @@ bool RawFrameQueue::write(const uint8_t* message, uint32_t length, sockaddr_stor
 
     bool ret = true;
     if (!m_socket->write(buffer, length, addr, addrLen)) {
-        LogError(LOG_NET, "Failed writing data to the network");
+        // LogError(LOG_NET, "Failed writing data to the network");
         ret = false;
     }
 
@@ -142,7 +142,7 @@ bool RawFrameQueue::flushQueue()
 
     ret = true;
     if (!m_socket->write(m_buffers)) {
-        LogError(LOG_NET, "Failed writing data to the network");
+        // LogError(LOG_NET, "Failed writing data to the network");
         ret = false;
     }
 
diff --git a/src/fne/network/FNENetwork.cpp b/src/fne/network/FNENetwork.cpp
index 41f71cc6..32b2eba5 100644
--- a/src/fne/network/FNENetwork.cpp
+++ b/src/fne/network/FNENetwork.cpp
@@ -421,7 +421,7 @@ void* FNENetwork::threadedNetworkRx(void* arg)
                             connection->pktNextSeq(0U);
                         }
                     } else {
-                        if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) {
+                        if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U)) && pktSeq != 0U) {
                             LogWarning(LOG_NET, "PEER %u (%s) stream %u out-of-sequence; %u != %u", peerId, connection->identity().c_str(),
                                 streamId, pktSeq, connection->pktNextSeq());
                         }
diff --git a/src/host/network/Network.cpp b/src/host/network/Network.cpp
index 6597ac2d..bcb29adc 100644
--- a/src/host/network/Network.cpp
+++ b/src/host/network/Network.cpp
@@ -583,6 +583,7 @@ void Network::clock(uint32_t ms)
         case NET_FUNC::MST_CLOSING:                                                                 // Master Shutdown
             {
                 LogError(LOG_NET, "PEER %u master is closing down, remotePeerId = %u", m_peerId, m_remotePeerId);
+                m_status = NET_STAT_WAITING_CONNECT;
                 close();
                 open();
             }