nonoo/kappanhang
1
0
Fork 0
mirror of https://github.com/nonoo/kappanhang.git synced 2026-01-20 15:40:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move disconnect send to the common stream close function

Browse source
This commit is contained in:
Nonoo 2020-10-21 15:42:59 +02:00
parent ee7a180292
commit fc0a7ba29d
3 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
controlstream.go
View file

@ -92,31 +92,21 @@ func (s *controlStream) sendPktReauth(firstReauthSend bool) {
s.authInnerSendSeq++
}
func (s *controlStream) sendDisconnect() {
if s.common.conn == nil {
return
}
// s.common.send([]byte{0x40, 0x00, 0x00, 0x00, 0x00, 0x00, byte(s.authSendSeq), byte(s.authSendSeq >> 8),
// byte(s.common.localSID >> 24), byte(s.common.localSID >> 16), byte(s.common.localSID >> 8), byte(s.common.localSID),
// byte(s.common.remoteSID >> 24), byte(s.common.remoteSID >> 16), byte(s.common.remoteSID >> 8), byte(s.common.remoteSID),
// 0x00, 0x00, 0x00, 0x30, 0x01, 0x01, 0x00, byte(s.authInnerSendSeq),
// byte(s.authInnerSendSeq >> 8), 0x00, s.authID[0], s.authID[1], s.authID[2], s.authID[3], s.authID[4], s.authID[5],
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
s.common.sendDisconnect()
}
func (s *controlStream) sendPkt0() {
p := []byte{0x10, 0x00, 0x00, 0x00, 0x00, 0x00, byte(s.authSendSeq), byte(s.authSendSeq >> 8),
byte(s.common.localSID >> 24), byte(s.common.localSID >> 16), byte(s.common.localSID >> 8), byte(s.common.localSID),
byte(s.common.remoteSID >> 24), byte(s.common.remoteSID >> 16), byte(s.common.remoteSID >> 8), byte(s.common.remoteSID)}
s.common.send(p)
s.common.send(p)
s.authSendSeq++
}
// func (s *controlStream) sendDisconnect() { TODO
// if s.common.conn == nil {
// return
// }
// s.common.send([]byte{0x40, 0x00, 0x00, 0x00, 0x00, 0x00, byte(s.authSendSeq), byte(s.authSendSeq >> 8),
// byte(s.common.localSID >> 24), byte(s.common.localSID >> 16), byte(s.common.localSID >> 8), byte(s.common.localSID),
// byte(s.common.remoteSID >> 24), byte(s.common.remoteSID >> 16), byte(s.common.remoteSID >> 8), byte(s.common.remoteSID),
// 0x00, 0x00, 0x00, 0x30, 0x01, 0x01, 0x00, byte(s.authInnerSendSeq),
// byte(s.authInnerSendSeq >> 8), 0x00, s.authID[0], s.authID[1], s.authID[2], s.authID[3], s.authID[4], s.authID[5],
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
// s.common.sendDisconnect()
// }
func (s *controlStream) sendRequestSerialAndAudio() {
log.Print("requesting serial and audio stream")

6
main.go
View file

@ -19,9 +19,9 @@ func exit(err error) {
log.Error(err.Error())
}
streams.audio.sendDisconnect()
streams.serial.sendDisconnect()
streams.control.sendDisconnect()
streams.audio.common.close()
streams.serial.common.close()
streams.control.common.close()
serialPort.deinit()
audio.deinit()

1
streamcommon.go
View file

@ -108,6 +108,7 @@ func (s *streamCommon) open(name string, portNumber int) {
}
func (s *streamCommon) close() {
s.sendDisconnect()
s.conn.Close()
// Depleting the read channel.