Skip to content

feat: Extend tcpForward to support more socket domains. #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Extend tcpForward to support more socket domains. #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dadb/src/main/kotlin/dadb/Dadb.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,11 @@ interface Dadb : AutoCloseable {

@Throws(InterruptedException::class)
fun tcpForward(hostPort: Int, targetPort: Int): AutoCloseable {
return tcpForward(hostPort, "tcp:$targetPort")
}

@Throws(InterruptedException::class)
fun tcpForward(hostPort: Int, targetPort: String): AutoCloseable {
val forwarder = TcpForwarder(this, hostPort, targetPort)
forwarder.start()

Expand Down
4 changes: 2 additions & 2 deletions dadb/src/main/kotlin/dadb/forwarding/TcpForwarder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import kotlin.concurrent.thread
internal class TcpForwarder(
private val dadb: Dadb,
private val hostPort: Int,
private val targetPort: Int,
private val targetPort: String,
) : AutoCloseable {

private var state: State = State.STOPPED
Expand Down Expand Up @@ -61,7 +61,7 @@ internal class TcpForwarder(
val client = serverRef.accept()

clientExecutor?.execute {
val adbStream = dadb.open("tcp:$targetPort")
val adbStream = dadb.open(targetPort)

val readerThread = thread {
forward(
Expand Down