From 2cb19ab53912d3beb4c56eb9b2a399002d685983 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 25 十二月 2020 19:25:16 +0800
Subject: [PATCH] --
---
hbusc.go | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/hbusc.go b/hbusc.go
index c79f3cb..d450112 100644
--- a/hbusc.go
+++ b/hbusc.go
@@ -146,39 +146,33 @@
Key: handle.conf.regKey,
})
}
- for i:=0;i<10;i++{
- time.Sleep(500 * time.Millisecond)
- handle.printLog("i:", i)
- if i == 9 {
- break loop
+
+ var rMsg []bhomebus.Mesg
+ n := regSock.Sendandrecv(regAddr, msg, &rMsg) //n浠ｈ〃鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
+ handle.printLog("regSock.Sendandrecv n:", n, "len(rMsg):", len(rMsg))
+ if n == 1 && len(rMsg) == 1 {
+ var cr CommonReply
+ if err = json.Unmarshal(rMsg[0].Data, &cr);err != nil {
+ handle.printLog("unmarshal regReply err:", err)
+ return nil, errors.New("unmarshal regReply err:"+err.Error())
+ } else {
+ if cr.Status == REPLY_SUCCESS {
+ var rr RegisterReply
+ if err = json.Unmarshal(cr.Body, &rr);err ==nil {
+ regR = &rr
+ break loop
+ } else {
+ handle.printLog("unmarshal RegisterReply err:", err)
+ }
+
+ } else {
+ handle.printLog("cr.Status:", cr.Status, "Desc:", cr.Desc)
+ }
+
}
+ } else {
+ time.Sleep(100 * time.Millisecond)
}
- //var rMsg []bhomebus.Mesg
- //n := regSock.Sendandrecv(regAddr, msg, &rMsg) //n浠ｈ〃鎴愬姛鍙戦�佺殑鑺傜偣鐨勪釜鏁�
- //handle.printLog("regSock.Sendandrecv n:", n, "len(rMsg):", len(rMsg))
- //if n == 1 && len(rMsg) == 1 {
- // var cr CommonReply
- // if err = json.Unmarshal(rMsg[0].Data, &cr);err != nil {
- // handle.printLog("unmarshal regReply err:", err)
- // return nil, errors.New("unmarshal regReply err:"+err.Error())
- // } else {
- // if cr.Status == REPLY_SUCCESS {
- // var rr RegisterReply
- // if err = json.Unmarshal(cr.Body, &rr);err ==nil {
- // regR = &rr
- // break loop
- // } else {
- // handle.printLog("unmarshal RegisterReply err:", err)
- // }
- //
- // } else {
- // handle.printLog("cr.Status:", cr.Status, "Desc:", cr.Desc)
- // }
- //
- // }
- //} else {
- // time.Sleep(100 * time.Millisecond)
- //}
}
}
--
Gitblit v1.8.0