From b81a481a423bf1b833ed72c0a7634db873e6d922 Mon Sep 17 00:00:00 2001
From: Saravana Perumal Shanmugam <perusworld@linux.com>
Date: Tue, 8 Jun 2021 18:17:36 -0700
Subject: [PATCH] Add ValidateFirstOutboundMessage just before DeFramer (#2391)

This takes care of the current requirements as well as provide the possibility of adding other channel handlers before that like for example a TLS handler

Signed-off-by: Saravana Perumal Shanmugam <perusworld@linux.com>
---
 .../p2p/rlpx/connections/netty/AbstractHandshakeHandler.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java
index 735c586489..2b97963687 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java
@@ -114,8 +114,8 @@ abstract class AbstractHandshakeHandler extends SimpleChannelInboundHandler<Byte
 
       ctx.channel()
           .pipeline()
-          .addFirst(new ValidateFirstOutboundMessage(framer))
-          .replace(this, "DeFramer", deFramer);
+          .replace(this, "DeFramer", deFramer)
+          .addBefore("DeFramer", "validate", new ValidateFirstOutboundMessage(framer));
 
       ctx.writeAndFlush(new OutboundMessage(null, HelloMessage.create(localNode.getPeerInfo())))
           .addListener(