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

Always send a control stream deauth if we can on deinit

Browse source
This commit is contained in:
Nonoo 2020-10-24 09:29:56 +02:00
parent c2a62fada1
commit 3521a26908
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
controlstream.go
View file

@ -22,6 +22,7 @@ type controlStream struct {
authInnerSendSeq uint16
authID [6]byte
gotAuthID bool
serialAndAudioStreamOpened bool
deinitializing bool
@ -221,6 +222,7 @@ func (s *controlStream) handleRead(r []byte) error {
s.common.remoteSID = binary.BigEndian.Uint32(r[8:12])
s.common.localSID = binary.BigEndian.Uint32(r[12:16])
copy(s.authID[:], r[26:32])
s.gotAuthID = true
if err := s.serial.start(devName); err != nil {
return errors.New("serial/" + err.Error())
@ -271,9 +273,6 @@ func (s *controlStream) loop() {
log.Print("running for ", time.Since(startTime), " roundtrip latency ", s.common.pkt7.latency)
}
case <-s.deinitNeededChan:
if err := s.sendPktAuth(0x01); err != nil {
reportError(err)
}
s.deinitFinishedChan <- true
return
}
@ -327,6 +326,7 @@ func (s *controlStream) start() error {
}
copy(s.authID[:], r[26:32])
s.gotAuthID = true
if err := s.sendPktAuth(0x02); err != nil {
reportError(err)
}
@ -366,6 +366,12 @@ func (s *controlStream) deinit() {
s.requestSerialAndAudioTimeout.Stop()
s.requestSerialAndAudioTimeout = nil
}
if s.gotAuthID && s.common.gotRemoteSID && s.common.conn != nil {
log.Print("sending deauth")
_ = s.sendPktAuth(0x01)
}
s.common.deinit()
s.audio.deinit()
s.serial.deinit()