From f6535ea2ae09b3cdca9104fa19dfff39a47271ea Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期三, 21 四月 2021 18:40:47 +0800 Subject: [PATCH] change api, add request remote address. --- api/bhsgo/bhome_node.go | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/api/bhsgo/bhome_node.go b/api/bhsgo/bhome_node.go index c5d4019..7e7bf17 100644 --- a/api/bhsgo/bhome_node.go +++ b/api/bhsgo/bhome_node.go @@ -12,16 +12,23 @@ "unsafe" ) +func getPtr(n *[]byte) unsafe.Pointer { + if len(*n) > 0 { + return unsafe.Pointer(&((*n)[0])) + } else { + return unsafe.Pointer(nil) + } +} + func bhApiIn1Out1(bhfunc C.FBHApiIn1Out1, data []byte, reply *bh.MsgCommonReply, timeout_ms int) bool { creply := unsafe.Pointer(nil) creply_len := C.int(0) defer C.BHFree(creply, creply_len) - r := C.BHApiIn1Out1Proxy(bhfunc, unsafe.Pointer(&data[0]), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0 + r := C.BHApiIn1Out1Proxy(bhfunc, getPtr(&data), C.int(len(data)), &creply, &creply_len, C.int(timeout_ms)) > 0 if r { reply.Unmarshal(C.GoBytes(creply, creply_len)) } return r - } func Register(proc *bh.ProcInfo, reply *bh.MsgCommonReply, timeout_ms int) bool { @@ -50,7 +57,7 @@ func Publish(pub *bh.MsgPublish, timeout_ms int) bool { data, _ := pub.Marshal() - return C.BHPublish(unsafe.Pointer(&data[0]), C.int(len(data)), C.int(timeout_ms)) > 0 + return C.BHPublish(getPtr(&data), C.int(len(data)), C.int(timeout_ms)) > 0 } func ReadSub(proc_id *string, pub *bh.MsgPublish, timeout_ms int) bool { @@ -67,19 +74,21 @@ return r } -func AsyncRequest(req *bh.MsgRequestTopic, msg_id *[]byte) bool { +func AsyncRequest(dest_addr *bh.BHAddress, req *bh.MsgRequestTopic, msg_id *[]byte) bool { + dest, _ := dest_addr.Marshal() data, _ := req.Marshal() creply := unsafe.Pointer(nil) creply_len := C.int(0) defer C.BHFree(creply, creply_len) - r := C.BHAsyncRequest(unsafe.Pointer(&data[0]), C.int(len(data)), &creply, &creply_len) > 0 + r := C.BHAsyncRequest(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &creply, &creply_len) > 0 if r { *msg_id = C.GoBytes(creply, creply_len) } return r } -func Request(req *bh.MsgRequestTopic, proc_id *string, reply *bh.MsgRequestTopicReply, timeout_ms int) bool { +func Request(dest_addr *bh.BHAddress, req *bh.MsgRequestTopic, proc_id *string, reply *bh.MsgRequestTopicReply, timeout_ms int) bool { + dest, _ := dest_addr.Marshal() data, _ := req.Marshal() cpid := unsafe.Pointer(nil) cpid_len := C.int(0) @@ -87,7 +96,7 @@ creply := unsafe.Pointer(nil) creply_len := C.int(0) defer C.BHFree(creply, creply_len) - r := C.BHRequest(unsafe.Pointer(&data[0]), C.int(len(data)), &cpid, &cpid_len, &creply, &creply_len, C.int(timeout_ms)) > 0 + r := C.BHRequest(getPtr(&dest), C.int(len(dest)), getPtr(&data), C.int(len(data)), &cpid, &cpid_len, &creply, &creply_len, C.int(timeout_ms)) > 0 if r { *proc_id = string(C.GoBytes(cpid, cpid_len)) reply.Unmarshal(C.GoBytes(creply, creply_len)) @@ -112,7 +121,7 @@ func SendReply(src unsafe.Pointer, rep *bh.MsgRequestTopicReply) bool { data, _ := rep.Marshal() - return C.BHSendReply(src, unsafe.Pointer(&data[0]), C.int(len(data))) > 0 + return C.BHSendReply(src, getPtr(&data), C.int(len(data))) > 0 } func GetLastError() (int, string) { -- Gitblit v1.8.0