Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-22 04:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-1976: Accept only the first GADP connection

Browse Source
This commit is contained in:
Dan 2023-03-16 14:51:26 -04:00
parent 738e662e82
commit 9774aa9f0e
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/gadp/GdbGadpDebuggerModelFactory.java
View File

@ -89,7 +89,7 @@ public class GdbGadpDebuggerModelFactory extends AbstractGadpLocalDebuggerModelF
if (!existing && gdbCmdLine.size() >= 2) {
cmd.addAll(gdbCmdLine.subList(1, gdbCmdLine.size()));
}
cmd.add("--gadp-args");
cmd.add("--agent-args");
cmd.addAll(List.of("-H", host));
cmd.addAll(List.of("-p", Integer.toString(port))); // Available ephemeral port
if (!existing && gdbCmdLine.size() >= 1) {

18
Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpServer.java
View File

@ -61,9 +61,27 @@ public abstract class AbstractGadpServer
@Override
protected GadpClientHandler newHandler(AsynchronousSocketChannel sock) {
try {
// Accept only the first connection
closeServerSocket();
}
catch (IOException e) {
Msg.error(this, "Could not close server socket", e);
}
return new GadpClientHandler(this, sock);
}
@Override
protected void removeHandler(GadpClientHandler handler) {
super.removeHandler(handler);
try {
terminate();
}
catch (IOException e) {
Msg.error(this, "Could not terminate upon disconnect");
}
}
protected AddressRange getAddressRange(Gadp.AddressRange range) {
AddressSpace space = model.getAddressSpace(range.getSpace());
if (space == null) {

9
Ghidra/Debug/Framework-AsyncComm/src/main/java/ghidra/comm/service/AbstractAsyncServer.java
View File

@ -129,6 +129,15 @@ public abstract class AbstractAsyncServer<S extends AbstractAsyncServer<S, H>, H
}
}
/**
* Accept no more connections, but continue servicing existing connections
*
* @throws IOException if an I/O error occurs
*/
protected void closeServerSocket() throws IOException {
ssock.close();
}
protected CompletableFuture<Void> allHandlers(Function<H, CompletableFuture<?>> action) {
AsyncFence fence = new AsyncFence();
for (H h : handlers) {