Skip to content

Commit d48255d

Browse files
author
hzsunshx
committed
run one shell now supported
1 parent 094a2f6 commit d48255d

3 files changed

Lines changed: 121 additions & 11 deletions

File tree

‎adb/client.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ type Client struct {
1919
}
2020

2121
func NewClient(addr string) *Client {
22+
if addr == "" {
23+
addr = "127.0.0.1:5037"
24+
}
2225
return &Client{
2326
Addr: addr,
2427
}

‎adb/tcpusb.go‎

Lines changed: 109 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,45 @@ package adb
55
import (
66
"crypto/rand"
77
"encoding/base64"
8-
"errors"
98
"fmt"
10-
"log"
119
"net"
1210
"strings"
11+
"sync"
12+
13+
"github.com/pkg/errors"
14+
"github.com/qiniu/log"
1315
)
1416

17+
type TransportService struct {
18+
opened bool
19+
sess *Session
20+
device *Device
21+
localId, remoteId uint32
22+
transport *ADBConn
23+
}
24+
25+
func (t *TransportService) handle(pkt Packet) {
26+
switch pkt.Command {
27+
// case _OPEN:
28+
// t.handleOpenPacket(pkt)
29+
case _OKAY:
30+
t.handleOkayPacket(pkt)
31+
}
32+
}
33+
34+
// func (t *TransportService) handleOpenPacket(pkt Packet){
35+
36+
// }
37+
38+
func (t *TransportService) handleOkayPacket(pkt Packet) {
39+
buf := make([]byte, 1024)
40+
n, err := t.transport.Read(buf)
41+
if err != nil {
42+
t.sess.err = errors.Wrap(err, "copy data")
43+
}
44+
t.sess.writePacket(_WRTE, t.localId, t.remoteId, buf[0:n])
45+
}
46+
1547
type Session struct {
1648
conn net.Conn
1749
signature []byte
@@ -20,6 +52,11 @@ type Session struct {
2052
version uint32
2153
maxPayload uint32
2254
remoteAddress string
55+
services map[uint32]*TransportService
56+
57+
mu sync.Mutex
58+
tmpLocalIdLock sync.Mutex
59+
tmpLocalId uint32
2360
}
2461

2562
func NewSession(conn net.Conn) *Session {
@@ -33,9 +70,17 @@ func NewSession(conn net.Conn) *Session {
3370
token: token,
3471
version: 1,
3572
remoteAddress: conn.RemoteAddr().String(),
73+
services: make(map[uint32]*TransportService),
3674
}
3775
}
3876

77+
func (s *Session) nextLocalId() uint32 {
78+
s.tmpLocalIdLock.Lock()
79+
defer s.tmpLocalIdLock.Unlock()
80+
s.tmpLocalId += 1
81+
return s.tmpLocalId
82+
}
83+
3984
func (s *Session) writePacket(cmd string, arg0, arg1 uint32, body []byte) error {
4085
_, err := Packet{
4186
Command: cmd,
@@ -58,9 +103,10 @@ func (s *Session) Serve() {
58103
s.onAuth(pkt)
59104
case _OPEN:
60105
s.onOpen(pkt)
106+
case _OKAY, _WRTE, _CLSE:
107+
s.forwardServicePacket(pkt)
61108
default:
62-
log.Printf("unknown cmd: %s", pkt.Command)
63-
return
109+
s.err = errors.New("unknown cmd: " + pkt.Command)
64110
}
65111
if s.err != nil {
66112
log.Printf("unexpect err: %v", s.err)
@@ -135,9 +181,68 @@ func (sess *Session) onAuth(pkt Packet) {
135181
}
136182

137183
func (sess *Session) onOpen(pkt Packet) {
184+
remoteId := pkt.Arg0
185+
localId := sess.nextLocalId()
186+
if len(pkt.Body) < 2 {
187+
sess.err = errors.New("empty service name")
188+
return // Not throw error ?
189+
}
190+
name := string(pkt.BodySkipNull())
191+
log.Infof("Calling #%s, remoteId: %d, localId: %d", name, remoteId, localId)
192+
193+
// Session service
194+
device := NewClient("").Device(AnyUsbDevice())
195+
conn, err := device.OpenTransport()
196+
if err != nil {
197+
sess.err = err
198+
return
199+
}
200+
conn.Encode(pkt.BodySkipNull())
201+
if err := conn.CheckOKAY(); err != nil {
202+
sess.err = errors.Wrap(err, "session.OPEN")
203+
return
204+
}
205+
206+
sess.writePacket(_OKAY, localId, remoteId, nil)
207+
208+
service := &TransportService{
209+
localId: localId,
210+
remoteId: remoteId,
211+
sess: sess,
212+
opened: false,
213+
transport: conn,
214+
}
215+
216+
sess.mu.Lock()
217+
sess.services[localId] = service
218+
sess.mu.Unlock()
219+
220+
go func() {
221+
buf := make([]byte, 1024)
222+
for sess.err == nil {
223+
n, err := conn.Read(buf)
224+
if err != nil {
225+
sess.err = errors.Wrap(err, "copy data")
226+
}
227+
sess.writePacket(_WRTE, localId, remoteId, buf[0:n])
228+
}
229+
}()
230+
// sess.writePacket(_OKAY)
231+
// Packet{}
232+
138233
pkt.DumpToStdout()
139234
}
140235

236+
func (sess *Session) forwardServicePacket(pkt Packet) {
237+
sess.mu.Lock()
238+
service, ok := sess.services[pkt.Arg1] // localId
239+
sess.mu.Unlock()
240+
if !ok {
241+
sess.err = errors.New("transport service already closed")
242+
}
243+
service.handle(pkt)
244+
}
245+
141246
// RunAdbServer listen for a address for command `adb connect`
142247
func RunAdbServer(serial string) error {
143248
lis, err := net.Listen("tcp", ":9000")

‎adb/tcpusb_test.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package adb
22

3-
// func TestTcpUsb(t *testing.T) {
4-
// t.Log("adb connect localhost:9000")
5-
// err := RunAdbServer("12345678")
6-
// if err != nil {
7-
// t.Fatal(err)
8-
// }
9-
// }
3+
import "testing"
4+
5+
func TestTcpUsb(t *testing.T) {
6+
t.Log("adb connect localhost:9000")
7+
err := RunAdbServer("12345678")
8+
if err != nil {
9+
t.Fatal(err)
10+
}
11+
}
1012

1113
// func TestSliceBytes(t *testing.T) {
1214
// buf := make([]byte, 0)

0 commit comments

Comments
 (0)
⌂ 换网址