forked from skylot/jadx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(debugger): improve code and add details to error messages (PR s…
…kylot#1982) * chore: created list entry getter getRegListEntry for problematic code; use specific containers/fields instead of SimpleEntry; * chore: include details on the used ArtAdapter in error message * add device info to registers exception --------- Co-authored-by: Skylot <[email protected]>
- Loading branch information
Showing
6 changed files
with
296 additions
and
189 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
158 changes: 158 additions & 0 deletions
158
jadx-gui/src/main/java/jadx/gui/device/debugger/DebugSettings.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| package jadx.gui.device.debugger; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import jadx.core.utils.StringUtils; | ||
| import jadx.gui.device.protocol.ADB; | ||
| import jadx.gui.device.protocol.ADBDevice; | ||
| import jadx.gui.utils.NLS; | ||
|
|
||
| public class DebugSettings { | ||
| private static final Logger LOG = LoggerFactory.getLogger(DebugSettings.class); | ||
|
|
||
| private static final int FORWARD_TCP_PORT = 33233; | ||
|
|
||
| public static final DebugSettings INSTANCE = new DebugSettings(); | ||
|
|
||
| private int ver; | ||
| private String pid; | ||
| private String name; | ||
| private ADBDevice device; | ||
| private int forwardTcpPort = FORWARD_TCP_PORT; | ||
| private String expectPkg = ""; | ||
| private boolean autoAttachPkg = false; | ||
|
|
||
| private DebugSettings() { | ||
| } | ||
|
|
||
| public void set(ADBDevice device, int ver, String pid, String name) { | ||
| this.ver = ver; | ||
| this.pid = pid; | ||
| this.name = name; | ||
| this.device = device; | ||
| this.autoAttachPkg = false; | ||
| this.expectPkg = ""; | ||
| } | ||
|
|
||
| public DebugSettings setPid(String pid) { | ||
| this.pid = pid; | ||
| return this; | ||
| } | ||
|
|
||
| public DebugSettings setName(String name) { | ||
| this.name = name; | ||
| return this; | ||
| } | ||
|
|
||
| public String forwardJDWP() { | ||
| int localPort = forwardTcpPort; | ||
| String resultDesc = ""; | ||
| try { | ||
| do { | ||
| ADBDevice.ForwardResult rst = device.forwardJDWP(localPort + "", pid); | ||
| if (rst.state == 0) { | ||
| forwardTcpPort = localPort; | ||
| return ""; | ||
| } | ||
| if (rst.state == 1) { | ||
| if (rst.desc.contains("Only one usage of each socket address")) { // port is taken by other process | ||
| if (localPort < 65536) { | ||
| localPort++; // retry | ||
| continue; | ||
| } | ||
| } | ||
| } | ||
| resultDesc = rst.desc; | ||
| break; | ||
| } while (true); | ||
| } catch (Exception e) { | ||
| LOG.error("JDWP forward error", e); | ||
| } | ||
| if (StringUtils.isEmpty(resultDesc)) { | ||
| resultDesc = NLS.str("adb_dialog.forward_fail"); | ||
| } | ||
| return resultDesc; | ||
| } | ||
|
|
||
| // we have to remove all ports that forwarding the jdwp:pid, otherwise our JDWP handshake may fail. | ||
| public void clearForward() { | ||
| String jdwpPid = " jdwp:" + pid; | ||
| String tcpPort = " tcp:" + forwardTcpPort; | ||
| try { | ||
| List<String> list = ADB.listForward(device.getDeviceInfo().getAdbHost(), | ||
| device.getDeviceInfo().getAdbPort()); | ||
| for (String s : list) { | ||
| if (s.startsWith(device.getSerial()) && s.endsWith(jdwpPid) && !s.contains(tcpPort)) { | ||
| String[] fields = s.split("\\s+"); | ||
| for (String field : fields) { | ||
| if (field.startsWith("tcp:")) { | ||
| try { | ||
| device.removeForward(field.substring("tcp:".length())); | ||
| } catch (Exception e) { | ||
| LOG.error("JDWP remove forward error", e); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } catch (Exception e) { | ||
| LOG.error("JDWP clear forward error", e); | ||
| } | ||
| } | ||
|
|
||
| public boolean isBeingDebugged() { | ||
| String jdwpPid = " jdwp:" + pid; | ||
| String tcpPort = " tcp:" + forwardTcpPort; | ||
| try { | ||
| List<String> list = ADB.listForward(device.getDeviceInfo().getAdbHost(), | ||
| device.getDeviceInfo().getAdbPort()); | ||
| for (String s : list) { | ||
| if (s.startsWith(device.getSerial()) && s.endsWith(jdwpPid)) { | ||
| return !s.contains(tcpPort); | ||
| } | ||
| } | ||
| } catch (Exception e) { | ||
| LOG.error("ADB list forward error", e); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| public int getVer() { | ||
| return ver; | ||
| } | ||
|
|
||
| public String getPid() { | ||
| return pid; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public ADBDevice getDevice() { | ||
| return device; | ||
| } | ||
|
|
||
| public int getForwardTcpPort() { | ||
| return forwardTcpPort; | ||
| } | ||
|
|
||
| public String getExpectPkg() { | ||
| return expectPkg; | ||
| } | ||
|
|
||
| public void setExpectPkg(String expectPkg) { | ||
| this.expectPkg = expectPkg; | ||
| } | ||
|
|
||
| public boolean isAutoAttachPkg() { | ||
| return autoAttachPkg; | ||
| } | ||
|
|
||
| public void setAutoAttachPkg(boolean autoAttachPkg) { | ||
| this.autoAttachPkg = autoAttachPkg; | ||
| } | ||
| } |
Oops, something went wrong.