From 34a9fdb8d76e73e2f671c25197f0424d84838938 Mon Sep 17 00:00:00 2001
From: Alexey Genus <genus.alexey@gmail.com>
Date: Mon, 20 Jul 2020 19:01:02 +0300
Subject: [PATCH] Fix echo request identification and support all ISO-8583
 versions

---
 .../jreactive8583/netty/pipeline/EchoMessageListener.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/kpavlov/jreactive8583/netty/pipeline/EchoMessageListener.java b/src/main/java/com/github/kpavlov/jreactive8583/netty/pipeline/EchoMessageListener.java
index b04147e..2631593 100644
--- a/src/main/java/com/github/kpavlov/jreactive8583/netty/pipeline/EchoMessageListener.java
+++ b/src/main/java/com/github/kpavlov/jreactive8583/netty/pipeline/EchoMessageListener.java
@@ -1,6 +1,7 @@
 package com.github.kpavlov.jreactive8583.netty.pipeline;
 
 import com.github.kpavlov.jreactive8583.IsoMessageListener;
+import com.github.kpavlov.jreactive8583.iso.MessageClass;
 import com.github.kpavlov.jreactive8583.iso.MessageFactory;
 import com.solab.iso8583.IsoMessage;
 import io.netty.channel.ChannelHandlerContext;
@@ -18,7 +19,7 @@ public EchoMessageListener(final MessageFactory<T> isoMessageFactory) {
 
     @Override
     public boolean applies(final IsoMessage isoMessage) {
-        return isoMessage != null && isoMessage.getType() == 0x800;
+        return isoMessage != null && (isoMessage.getType() & MessageClass.NETWORK_MANAGEMENT.value()) != 0;
     }
 
     /**