From 971bad82b23354e06fd10520fcc433c7de7132dc Mon Sep 17 00:00:00 2001
From: axd1x8a <sign@axd1x8a.me>
Date: Fri, 26 Jun 2026 01:53:22 +0300
Subject: [PATCH] Remove explicit socket buffer locks in remote block stream
 handles

---
 .../server/stream/RemoteBlockStreamHandle.java       | 12 ++----------
 .../server/stream/RemoteInputBlockStreamHandle.java  |  3 ---
 .../server/stream/RemoteOutputBlockStreamHandle.java |  3 ---
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteBlockStreamHandle.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteBlockStreamHandle.java
index acf3a080c1..e8a5f2d532 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteBlockStreamHandle.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteBlockStreamHandle.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -133,14 +133,6 @@ public abstract class RemoteBlockStreamHandle<T extends BlockStream> implements
 		return blockSize;
 	}
 
-	/**
-	 * Get the preferred socket send/receive buffer size to be used
-	 * @return preferred socket send/receive buffer size
-	 */
-	protected int getPreferredBufferSize() {
-		return (getBlockSize() + 4) * 12;
-	}
-
 	/**
 	 * Generate a random number for use as a block stream authentication token.
 	 * @return random value
diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteInputBlockStreamHandle.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteInputBlockStreamHandle.java
index e18501ef83..f98e8b9d32 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteInputBlockStreamHandle.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteInputBlockStreamHandle.java
@@ -124,7 +124,6 @@ public class RemoteInputBlockStreamHandle extends RemoteBlockStreamHandle<InputB
 	public InputBlockStream openBlockStream() throws IOException {
 
 		Socket socket = connect();
-		socket.setReceiveBufferSize(getPreferredBufferSize());
 
 		return new ClientInputBlockStream(socket);
 	}
@@ -135,8 +134,6 @@ public class RemoteInputBlockStreamHandle extends RemoteBlockStreamHandle<InputB
 			throw new IllegalArgumentException("expected InputBlockStream");
 		}
 
-		socket.setSendBufferSize(getPreferredBufferSize());
-
 		InputBlockStream inputBlockStream = (InputBlockStream) blockStream;
 		try (OutputStream out = getBlockInputStream(socket)) {
 
diff --git a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteOutputBlockStreamHandle.java b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteOutputBlockStreamHandle.java
index 9cc1a5b6e3..ae83a34e94 100644
--- a/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteOutputBlockStreamHandle.java
+++ b/Ghidra/Features/GhidraServer/src/main/java/ghidra/server/stream/RemoteOutputBlockStreamHandle.java
@@ -109,7 +109,6 @@ public class RemoteOutputBlockStreamHandle extends RemoteBlockStreamHandle<Outpu
 	public OutputBlockStream openBlockStream() throws IOException {
 
 		Socket socket = connect();
-		socket.setSendBufferSize(getPreferredBufferSize());
 
 		return new ClientOutputBlockStream(socket);
 	}
@@ -121,8 +120,6 @@ public class RemoteOutputBlockStreamHandle extends RemoteBlockStreamHandle<Outpu
 			throw new IllegalArgumentException("expected OutputBlockStream");
 		}
 
-		socket.setReceiveBufferSize(getPreferredBufferSize());
-
 		OutputBlockStream outputBlockStream = (OutputBlockStream) blockStream;
 		try (InputStream in = getBlockInputStream(socket)) {