@@ -81,8 +81,13 @@ func (s *Session) Serve() {
8181 s .onAuth (pkt )
8282 case _OPEN :
8383 s .onOpen (pkt )
84- case _OKAY , _WRTE , _CLSE :
84+ case _OKAY , _WRTE :
8585 s .forwardServicePacket (pkt )
86+ case _CLSE :
87+ s .forwardServicePacket (pkt )
88+ s .mu .Lock ()
89+ delete (s .services , pkt .Arg1 )
90+ s .mu .Unlock ()
8691 default :
8792 s .err = errors .New ("unknown cmd: " + pkt .Command )
8893 }
@@ -105,18 +110,22 @@ func (sess *Session) onConnection(pkt Packet) {
105110 sess .maxPayload = maxPayload
106111 // log.Println("MaxPayload:", maxPayload)
107112 sess .err = sess .writePacket (_AUTH , AUTH_TOKEN , 0 , sess .token )
108- pkt .DumpToStdout ()
113+ // pkt.DumpToStdout()
109114}
110115
111116func (sess * Session ) authVerified () {
112117 version := swapUint32 (1 )
113118 // FIXME(ssx): need device.Properties()
114- connProps := []string {
115- "ro.product.name=2014011" ,
116- "ro.product.model=2014011" ,
117- "ro.product.device=HM2014011" ,
119+ props , _ := sess .device .Properties ()
120+ connProps := make ([]string , 0 , 3 )
121+ for _ , propName := range []string {
122+ "ro.product.name" ,
123+ "ro.product.model" ,
124+ "ro.product.device" ,
125+ } {
126+ connProps = append (connProps , fmt .Sprintf ("%s=%s" , propName , props [propName ]))
118127 }
119- // connProps = append(connProps, "features=cmd,stat_v2,shell_v2")
128+ // connProps = append(connProps, "features=cmd") // ,stat_v2,shell_v2")
120129 deviceBanner := "device"
121130 payload := fmt .Sprintf ("%s::%s" , deviceBanner , strings .Join (connProps , ";" ))
122131 // id := "device::;;\x00"
@@ -167,51 +176,26 @@ func (sess *Session) onOpen(pkt Packet) {
167176 name := string (pkt .BodySkipNull ())
168177 log .Infof ("Calling #%s, remoteId: %d, localId: %d" , name , remoteId , localId )
169178
170- if strings .HasPrefix (name , "reverse:" ) {
171- name = "xxxx" + name [4 :]
172- // failMessage := "reverse service not supported"
173- // sess.writePacket(_OKAY, localId, remoteId, nil)
174- // sess.writePacket(_WRTE, localId, remoteId, []byte("FAIL"+fmt.Sprintf(
175- // "%04x%s", len(failMessage), failMessage,
176- // )))
177- // sess.writePacket(_CLSE, localId, remoteId, nil)
178- // return
179- }
180-
181- // Session service
182- // device := NewClient("").Device(AnyUsbDevice())
183- conn , err := sess .device .OpenTransport ()
184- if err != nil {
185- sess .err = err
186- return
187- }
188- conn .Encode (pkt .BodySkipNull ())
189- if err := conn .CheckOKAY (); err != nil {
190- sess .err = errors .Wrap (err , "session.OPEN" )
191- return
192- }
193-
194179 service := & TransportService {
195- localId : localId ,
196- remoteId : remoteId ,
197- sess : sess ,
198- transport : conn ,
180+ localId : localId ,
181+ remoteId : remoteId ,
182+ sess : sess ,
199183 }
200184
201185 sess .mu .Lock ()
202186 sess .services [localId ] = service
203187 sess .mu .Unlock ()
204188
205189 service .handle (pkt )
206- pkt .DumpToStdout ()
190+ // pkt.DumpToStdout()
207191}
208192
209193func (sess * Session ) forwardServicePacket (pkt Packet ) {
210194 sess .mu .Lock ()
211195 service , ok := sess .services [pkt .Arg1 ] // localId
212196 sess .mu .Unlock ()
213197 if ! ok {
214- sess . err = errors . New ( "transport service already closed" )
198+ log . Warnf ( "Receive packet of already closed service: localId: %d" , pkt . Arg1 )
215199 return
216200 }
217201 service .handle (pkt )
@@ -240,9 +224,37 @@ func (t *TransportService) handle(pkt Packet) {
240224 }
241225}
242226
227+ func (t * TransportService ) writeError (message string ) {
228+ t .writePacket (_WRTE , []byte ("FAIL" + fmt .Sprintf (
229+ "%04x%s" , len (message ), message ,
230+ )))
231+ }
232+
243233func (t * TransportService ) handleOpenPacket (pkt Packet ) {
244234 t .writePacket (_OKAY , nil )
245235
236+ serviceName := string (pkt .BodySkipNull ())
237+ if strings .HasPrefix (serviceName , "reverse:" ) {
238+ failMessage := "reverse service not supported"
239+ t .writeError (failMessage )
240+ t .end ()
241+ return
242+ }
243+
244+ var err error
245+ t .transport , err = t .sess .device .OpenTransport ()
246+ if err != nil {
247+ t .end ()
248+ return
249+ }
250+ t .transport .Encode ([]byte (serviceName ))
251+
252+ if err := t .transport .CheckOKAY (); err != nil {
253+ t .writeError (err .Error ())
254+ t .end ()
255+ return
256+ }
257+
246258 go func () {
247259 buf := make ([]byte , t .sess .maxPayload )
248260 for {
@@ -259,8 +271,8 @@ func (t *TransportService) handleOpenPacket(pkt Packet) {
259271}
260272
261273func (t * TransportService ) handleWritePacket (pkt Packet ) {
262- t .transport .Write (pkt .Body )
263274 t .writePacket (_OKAY , nil )
275+ t .transport .Write (pkt .Body )
264276}
265277
266278func (t * TransportService ) handleClosePacket (pkt Packet ) {
@@ -270,7 +282,9 @@ func (t *TransportService) handleClosePacket(pkt Packet) {
270282func (t * TransportService ) end () {
271283 t .once .Do (func () {
272284 t .ended = true
273- t .transport .Close ()
285+ if t .transport != nil {
286+ t .transport .Close ()
287+ }
274288 t .writePacket (_CLSE , nil )
275289 })
276290}
0 commit comments