From 0d03ce2f1493d1c276b9e317cdbabc4e6b31de3d Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Mon, 4 Dec 2023 10:43:06 -0500 Subject: [PATCH] GP-0: Fix forgotten Client() description parameter. --- .../src/main/py/src/ghidradbg/commands.py | 2 +- .../Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py | 3 ++- .../src/main/py/src/ghidralldb/commands.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py index 50106b3367..81ce49f254 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py @@ -174,7 +174,7 @@ def ghidra_trace_listen(address='0.0.0.0:0'): c, (chost, cport) = s.accept() s.close() print("Connection from {}:{}\n".format(chost, cport)) - STATE.client = Client(c, "TBD", methods.REGISTRY) + STATE.client = Client(c, "dbgeng.dll", methods.REGISTRY) except ValueError: raise RuntimeError("port must be numeric") diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py index 521021d1e7..3f90891766 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py +++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/py/src/ghidragdb/commands.py @@ -240,7 +240,8 @@ def ghidra_trace_listen(address=None, *, is_mi, **kwargs): c, (chost, cport) = s.accept() s.close() gdb.write("Connection from {}:{}\n".format(chost, cport)) - STATE.client = Client(c, "TBD", methods.REGISTRY) + STATE.client = Client( + c, "gdb-" + util.GDB_VERSION.full, methods.REGISTRY) except ValueError: raise gdb.GdbError("port must be numeric") diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py index b158fba5a8..48213a432f 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py +++ b/Ghidra/Debug/Debugger-agent-lldb/src/main/py/src/ghidralldb/commands.py @@ -191,7 +191,7 @@ def ghidra_trace_connect(debugger, command, result, internal_dict): try: c = socket.socket() c.connect((host, int(port))) - STATE.client = Client(c, "TBD", methods.REGISTRY) + STATE.client = Client(c, "lldb-" + util.LLDB_VERSION.full, methods.REGISTRY) except ValueError: raise RuntimeError("port must be numeric") @@ -228,7 +228,7 @@ def ghidra_trace_listen(debugger, command, result, internal_dict): c, (chost, cport) = s.accept() s.close() print("Connection from {}:{}\n".format(chost, cport)) - STATE.client = Client(c, "TBD", methods.REGISTRY) + STATE.client = Client(c, "lldb-" + util.LLDB_VERSION.full, methods.REGISTRY) except ValueError: raise RuntimeError("port must be numeric")