From 78991e66400350bf3bd6f383a00173aa47b9c139 Mon Sep 17 00:00:00 2001
From: Jacob Molin <jacob.cb.molin@gmail.com>
Date: Fri, 10 Jun 2022 17:00:46 -0600
Subject: [PATCH] Changes name on SIMP mesage type Disconnection to
 InternalDisconnection (diconnection should only be used internally)

---
 modules/softwareintegration/network/networkengine.cpp      | 4 ++--
 modules/softwareintegration/network/softwareconnection.cpp | 2 +-
 modules/softwareintegration/utils.h                        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/softwareintegration/network/networkengine.cpp b/modules/softwareintegration/network/networkengine.cpp
index 26bc50596a..9ba58cddd0 100644
--- a/modules/softwareintegration/network/networkengine.cpp
+++ b/modules/softwareintegration/network/networkengine.cpp
@@ -122,7 +122,7 @@ void NetworkEngine::peerEventLoop(size_t connection_id) {
 				LDEBUG(fmt::format("Connection lost to {}: {}", connection_id, err.message));
 				_incomingMessages.push({
 					connection_id,
-					SoftwareConnection::Message{ simp::MessageType::Disconnection }
+					SoftwareConnection::Message{ simp::MessageType::InternalDisconnection }
 				});
 			}
 			break;
@@ -222,7 +222,7 @@ void NetworkEngine::handleIncomingMessage(IncomingMessage incomingMessage) {
 			_pointDataMessageHandler.handleVisibilityMessage(message, connectionPtr);
 			break;
 		}
-		case simp::MessageType::Disconnection: {
+		case simp::MessageType::InternalDisconnection: {
 			LDEBUG(fmt::format("Message recieved.. Disconnect software connection: {}", incomingMessage.connection_id));
 			std::lock_guard guard(_softwareConnectionsMutex);
 			if (_softwareConnections.count(incomingMessage.connection_id)) {
diff --git a/modules/softwareintegration/network/softwareconnection.cpp b/modules/softwareintegration/network/softwareconnection.cpp
index 7e767383f1..3f992e2205 100644
--- a/modules/softwareintegration/network/softwareconnection.cpp
+++ b/modules/softwareintegration/network/softwareconnection.cpp
@@ -335,7 +335,7 @@ SoftwareConnection::Message SoftwareConnection::receiveMessageFromSoftware() {
     auto typeEnum = softwareintegration::simp::getMessageType(type);
 
     // Receive the message data
-    if (typeEnum != softwareintegration::simp::MessageType::Disconnection && typeEnum != softwareintegration::simp::MessageType::Unknown) {
+    if (typeEnum != softwareintegration::simp::MessageType::InternalDisconnection && typeEnum != softwareintegration::simp::MessageType::Unknown) {
         subjectBuffer.resize(subjectSize);
         if (!_socket->get(subjectBuffer.data(), subjectSize)) {
             throw SoftwareConnectionLostError("Failed to read message from socket. Disconnecting.");
diff --git a/modules/softwareintegration/utils.h b/modules/softwareintegration/utils.h
index 2458126308..4f9bd0f42a 100644
--- a/modules/softwareintegration/utils.h
+++ b/modules/softwareintegration/utils.h
@@ -76,7 +76,7 @@ enum class MessageType : uint32_t {
     FixedSize,
     LinearSize,
     Visibility,
-    Disconnection,
+    InternalDisconnection,
     Unknown
 };
 
@@ -107,7 +107,7 @@ const std::unordered_map<std::string, MessageType> _messageTypeFromSIMPType {
     {"FPSI", MessageType::FixedSize},
     {"LPSI", MessageType::LinearSize},
     {"TOVI", MessageType::Visibility},
-    {"DISC", MessageType::Disconnection},
+    {"DISC", MessageType::InternalDisconnection},
 };
 
 const std::unordered_map<std::string, CmapNaNMode> _cmapNaNModeFromString {