Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-10-23 13:41:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-874: Adding connection info to remote connectors

Browse Source
This commit is contained in:
d-millar 2021-04-26 10:48:01 -04:00 committed by Dan
parent ac3097a086
commit d1c1d9d5e8
7 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/GdbManager.java
View File

@ -514,4 +514,12 @@ public interface GdbManager extends AutoCloseable, GdbBreakpointInsertions {
* @throws IOException if the filename could not be determined
*/
String getMi2PtyName() throws IOException;
/**
* Get a description for the pty for this GDB session
*
* @return the description
*/
String getPtyDescription();
}

7
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/manager/impl/GdbManagerImpl.java
View File

@ -15,7 +15,7 @@
*/
package agent.gdb.manager.impl;
import static ghidra.async.AsyncUtils.loop;
import static ghidra.async.AsyncUtils.*;
import java.io.*;
import java.util.*;
@ -1616,6 +1616,11 @@ public class GdbManagerImpl implements GdbManager {
return mi2Thread.pty.getChild().nullSession();
}
@Override
public String getPtyDescription() {
return ptyFactory.getDescription();
}
public boolean hasCli() {
return cliThread != null && cliThread.pty != null;
}

3
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/model/impl/GdbModelImpl.java
View File

@ -85,7 +85,8 @@ public class GdbModelImpl extends AbstractDebuggerObjectModel {
@Override
public String getBrief() {
return "GDB@" + Integer.toHexString(System.identityHashCode(this));
return "GDB@" + Integer.toHexString(System.identityHashCode(this)) + " " +
gdb.getPtyDescription();
}
@Override

2
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/PtyFactory.java
View File

@ -29,4 +29,6 @@ public interface PtyFactory {
* @throws IOException for an I/O error, including cancellation
*/
Pty openpty() throws IOException;
String getDescription();
}

5
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/linux/LinuxPtyFactory.java
View File

@ -25,4 +25,9 @@ public class LinuxPtyFactory implements PtyFactory {
public Pty openpty() throws IOException {
return LinuxPty.openpty();
}
@Override
public String getDescription() {
return "local";
}
}

5
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/ssh/GhidraSshPtyFactory.java
View File

@ -131,4 +131,9 @@ public class GhidraSshPtyFactory implements PtyFactory {
}
return new SshPty(sshConn.openSession());
}
@Override
public String getDescription() {
return "ssh:" + hostname + "(user=" + username + ",port=" + port + ")";
}
}

2
Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/client/GadpClient.java
View File

@ -438,7 +438,7 @@ public class GadpClient extends AbstractDebuggerObjectModel
@Override
public String getBrief() {
return description + " via GADP (" + channelState.get().name().toLowerCase() + ")";
return "GADP@" + Integer.toHexString(System.identityHashCode(this)) + " " + description;
}
public CompletableFuture<Void> connect() {