nonoo/kappanhang
1
0
Fork 0
mirror of https://github.com/nonoo/kappanhang.git synced 2026-04-05 06:25:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Further tweaks on making the login process more reliable

Browse source
This commit is contained in:
Nonoo 2020-10-28 22:13:29 +01:00
parent d0d7d1ff5a
commit a812b02321
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
controlstream.go
View file

@ -166,7 +166,11 @@ func (s *controlStream) handleRead(r []byte) error {
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
if bytes.Equal(r[48:51], []byte{0xff, 0xff, 0xff}) {
return errors.New("auth failed")
if !s.serialAndAudioStreamOpened {
return errors.New("auth failed, try rebooting the radio")
} else {
return errors.New("auth failed")
}
}
if bytes.Equal(r[48:51], []byte{0x00, 0x00, 0x00}) && r[64] == 0x01 {
return errors.New("got radio disconnected")
@ -224,7 +228,7 @@ func (s *controlStream) handleRead(r []byte) error {
func (s *controlStream) loop() {
netstat.reset()
s.secondAuthTimer = time.NewTimer(200 * time.Millisecond)
s.secondAuthTimer = time.NewTimer(time.Second)
s.reauthTimeoutTimer = time.NewTimer(0)
<-s.reauthTimeoutTimer.C
@ -269,6 +273,8 @@ func (s *controlStream) init() error {
return err
}
s.common.pkt7.startPeriodicSend(&s.common, 2, false)
s.common.pkt0.init(&s.common)
if err := s.sendPktLogin(); err != nil {
return err
@ -302,7 +308,6 @@ func (s *controlStream) init() error {
}
log.Debug("login ok, first auth sent...")
s.common.pkt7.startPeriodicSend(&s.common, 2, false)
s.common.pkt0.startPeriodicSend(&s.common)
s.requestSerialAndAudioTimeout = time.AfterFunc(5*time.Second, func() {