From 16935f4aebffdd1b6580b844391a0aa0f4f3012b Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 22 四月 2024 10:29:12 +0800
Subject: [PATCH] bug fixed

---
 src/bn_api.cpp |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/bn_api.cpp b/src/bn_api.cpp
index 39866a8..0b39f61 100644
--- a/src/bn_api.cpp
+++ b/src/bn_api.cpp
@@ -97,7 +97,7 @@
     if (!topics || topics_len <= 0) return false;
 
     const auto& url = get_url(URLRegTopic);
-    if (url.empty()) {
+    if (!url) {
         set_last_error("BHRegisterTopics url empty");
         return false;
     }
@@ -116,8 +116,10 @@
         // printf("======>> BHRegisterTopics topic %s\n", mtl.topic_list(i).c_str());
         mtl2.add_topic_list(mtl.topic_list(i));
     }
+    std::move(mtl);
 
     string msg(mtl2.SerializeAsString());
+    std::move(mtl2);
 
     auto ret = simple_request(url, msg.data(), msg.size(), reply, reply_len, timeout_ms);
     // printf("======>> BHRegisterTopics return value %d msg size %lu\n", ret, msg.size());
@@ -133,8 +135,8 @@
 {
     if (!topic || topic_len <= 0) return false;
 
-    auto url(get_url(URLQueryTopic));
-    if (url.empty()) {
+    const auto& url = get_url(URLQueryTopic);
+    if (!url) {
         set_last_error("BHQueryTopicAddress url empty");
         return false;
     }
@@ -162,8 +164,8 @@
 {
     // if (!query || query_len <= 0) return false;
 
-    auto url(get_url(URLQueryProcs));
-    if (url.empty()) {
+    const auto& url = get_url(URLQueryProcs);
+    if (!url) {
         set_last_error("BHQueryProcs url empty");
         return false;
     }
@@ -204,6 +206,8 @@
     newPub.set_data(string{(const char*)msgpub, (const size_t)msgpub_len});
 
     string msg(newPub.SerializeAsString());
+    std::move(newPub);
+
     if (pub.topic().empty()) {
         set_last_error("BHPublish topic empty");
         return false;
@@ -231,6 +235,7 @@
         // printf("BHSubscribeTopics %s\n", t.c_str());
         subscribe_topic(t);
     }
+    std::move(mtl);
 
     auto ret = simple_request(url, topics, topics_len, reply, reply_len, timeout_ms);
     if (!ret){
@@ -242,7 +247,7 @@
 int BHSubscribeTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
 {
     const auto& url = get_url(URLSubLocal);
-    if (url.empty()) {
+    if (!url) {
         set_last_error("BHSubscribeTopics url empty");
         return false;
     }
@@ -252,7 +257,7 @@
 int BHSubscribeNetTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
 {
     const auto& url = get_url(URLSubNet);
-    if (url.empty()) {
+    if (!url) {
         set_last_error("BHSubscribeNetTopics url empty");
         return false;
     }
@@ -267,6 +272,9 @@
               int *msgpub_len,
               const int timeout_ms)
 {
+    if (!proc_id && !proc_id_len && !msgpub && !msgpub_len)
+        return subscribe_read(NULL, NULL, timeout_ms) == 0;
+
     string topic, msg;
     auto ret = subscribe_read(&topic, &msg, timeout_ms);
     // printf("BHReadSub msg topic %s length %lu\n", topic.c_str(), msg.length());
@@ -307,8 +315,10 @@
 
     bhome_msg::MsgQueryTopic msg;
     msg.set_topic(req.topic());
+    std::move(req);
 
     string s(msg.SerializeAsString());
+    std::move(msg);
 
     void* reply2;
     int reply_len2;
@@ -316,7 +326,6 @@
     int ret = BHQueryTopicAddress(remote.c_str(), remote.length(), s.data(), s.size(),
         &reply2, &reply_len2, timeout_ms);
     if (!ret) return false;
-
 
     bhome_msg::MsgQueryTopicReply mr;
     if (!mr.ParseFromArray(reply2, reply_len2)){
@@ -329,9 +338,8 @@
     }
 
     auto& node_addr = mr.node_address(0);
-    auto& procid = node_addr.proc_id();
+    *proc_id = node_addr.proc_id();
 
-    *proc_id = procid;
     return true;
 }
 
@@ -386,6 +394,9 @@
                   void **src,
                   const int timeout_ms)
 {
+    if (!proc_id && !proc_id_len && !request && !request_len && !src)
+        return read_request(NULL, NULL, timeout_ms) == 0;
+
     string msg;
     auto ret = read_request(src, &msg, timeout_ms);
     if (ret < 0) return false;
@@ -500,7 +511,6 @@
 
     auto back_msg = "back:" + msg;
     BHSendReply(src, back_msg.c_str(), back_msg.size());
-    BHFree(src, 0);
 }
 
 void TestPub(const char* t, const int t_l, const char* d, const int d_l){

--
Gitblit v1.8.0