From 43bfd28bcdc1465c0cb9a172364d2a72047082c1 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Mon, 30 May 2022 21:46:16 +0200
Subject: [PATCH] Revert "Discard unsupported messages instead of disconnecting
 the peer."

This reverts commit d086ade91f3afd0a72c10ed9b395980884474dad.
---
 src/main/java/org/qortal/network/Peer.java    |  8 +-------
 .../org/qortal/network/message/Message.java   |  2 +-
 .../message/UnsupportedMessageException.java  | 19 -------------------
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 src/main/java/org/qortal/network/message/UnsupportedMessageException.java

diff --git a/src/main/java/org/qortal/network/Peer.java b/src/main/java/org/qortal/network/Peer.java
index d572609e..7e51dc36 100644
--- a/src/main/java/org/qortal/network/Peer.java
+++ b/src/main/java/org/qortal/network/Peer.java
@@ -12,7 +12,6 @@ import org.qortal.data.network.PeerData;
 import org.qortal.network.message.ChallengeMessage;
 import org.qortal.network.message.Message;
 import org.qortal.network.message.MessageException;
-import org.qortal.network.message.UnsupportedMessageException;
 import org.qortal.network.task.MessageTask;
 import org.qortal.network.task.PingTask;
 import org.qortal.settings.Settings;
@@ -511,13 +510,8 @@ public class Peer {
                     ByteBuffer readOnlyBuffer = this.byteBuffer.asReadOnlyBuffer().flip();
                     try {
                         message = Message.fromByteBuffer(readOnlyBuffer);
-                    } catch (UnsupportedMessageException e) {
-                        // Unsupported message - discard it without disconnecting
-                        LOGGER.debug("[{}] {}, from peer {} - discarding...", this.peerConnectionId, e.getMessage(), this);
-                        return;
                     } catch (MessageException e) {
-                        // Any other message exception - disconnect the peer
-                        LOGGER.debug("[{}] {}, from peer {} - forcing disconnection...", this.peerConnectionId, e.getMessage(), this);
+                        LOGGER.debug("[{}] {}, from peer {}", this.peerConnectionId, e.getMessage(), this);
                         this.disconnect(e.getMessage());
                         return;
                     }
diff --git a/src/main/java/org/qortal/network/message/Message.java b/src/main/java/org/qortal/network/message/Message.java
index fc6087d6..e92aca89 100644
--- a/src/main/java/org/qortal/network/message/Message.java
+++ b/src/main/java/org/qortal/network/message/Message.java
@@ -104,7 +104,7 @@ public abstract class Message {
 			MessageType messageType = MessageType.valueOf(typeValue);
 			if (messageType == null)
 				// Unrecognised message type
-				throw new UnsupportedMessageException(String.format("Received unknown message type [%d]", typeValue));
+				throw new MessageException(String.format("Received unknown message type [%d]", typeValue));
 
 			// Optional message ID
 			byte hasId = readOnlyBuffer.get();
diff --git a/src/main/java/org/qortal/network/message/UnsupportedMessageException.java b/src/main/java/org/qortal/network/message/UnsupportedMessageException.java
deleted file mode 100644
index c30d6cc7..00000000
--- a/src/main/java/org/qortal/network/message/UnsupportedMessageException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.qortal.network.message;
-
-@SuppressWarnings("serial")
-public class UnsupportedMessageException extends MessageException {
-    public UnsupportedMessageException() {
-    }
-
-    public UnsupportedMessageException(String message) {
-        super(message);
-    }
-
-    public UnsupportedMessageException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public UnsupportedMessageException(Throwable cause) {
-        super(cause);
-    }
-}