From f93a93f959c77aaeaf9154a7d8950691b91e1009 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 20 三月 2023 13:31:33 +0800
Subject: [PATCH] bug fixed
---
src/bn_api.cpp | 191 +++++++++++++++++++++++++----------------------
1 files changed, 102 insertions(+), 89 deletions(-)
diff --git a/src/bn_api.cpp b/src/bn_api.cpp
index 292ef4b..50aec06 100644
--- a/src/bn_api.cpp
+++ b/src/bn_api.cpp
@@ -1,62 +1,16 @@
#include "bn_api.h"
#include <string.h>
-#include <string>
-#include <unordered_map>
-#include <memory>
-#include <thread>
-using namespace std;
#include "nng_wrap.h"
using namespace nng_wrap;
+#include "common.h"
+using namespace std;
+
#include "bhome_msg.pb.h"
#include "bhome_msg_api.pb.h"
using namespace bhome_msg;
-
-enum{
- URLReg,
- URLDeReg,
- URLRegTopic,
- URLQueryTopic,
- URLQueryProcs,
- URLSubLocal,
- URLSubNet,
- URLPubProxy,
- URLSubQueue,
- URLHeartBeat,
-};
-
-static char* IPC_REGISTER = (char*)"ipc:///tmp/bhnng-center-reg.ipc"; //杩涚▼娉ㄥ唽
-static char* IPC_UNREGISTER = (char*)"ipc:///tmp/bhnng-center-unregister.ipc"; //娉ㄩ攢
-static char* IPC_REGTOPIC = (char*)"ipc:///tmp/bhnng-center-regtopic.ipc"; //娉ㄥ唽涓婚
-static char* IPC_QUERYTOPIC = (char*)"ipc:///tmp/bhnng-center-querytopic.ipc"; //鏌ヨ鎸囧畾鐨勪富棰�
-static char* IPC_QUERYPROC = (char*)"ipc:///tmp/bhnng-center-queryproc.ipc"; //鏌ヨ鎵�鏈夋敞鍐岀殑杩涚▼
-static char* IPC_SUBLOCALTOPIC = (char*)"ipc:///tmp/bhnng-center-sublocaltopic.ipc"; //璁㈤槄鏈湴涓婚
-static char* IPC_SUBNETTOPIC = (char*)"ipc:///tmp/bhnng-center-subnettopic.ipc"; //璁㈤槄缃戠粶涓婚
-static char* IPC_HEARTBEAT = (char*)"ipc:///tmp/bhnng-center-hb.ipc";
-static char* IPC_PUB_PROXY = (char*)"ipc:///tmp/bhnng-center-pub-proxy.ipc"; //杩欎釜鏄唬鐞嗕腑蹇冿紝鐢ㄤ簬鎺ユ敹寰呭彂甯冪殑娑堟伅
-static char* IPC_SUB_QUEUE = (char*)"ipc:///tmp/bhnng-center-sub-queue.ipc"; //杩欎釜鏄鎴风浠巆enter璁㈤槄鐨勯�氶亾
-
-static const unordered_map<int, string> map_url{
- {URLReg, IPC_REGISTER},
- {URLDeReg, IPC_UNREGISTER},
- {URLRegTopic, IPC_REGTOPIC},
- {URLQueryTopic, IPC_QUERYTOPIC},
- {URLQueryProcs, IPC_QUERYPROC},
- {URLSubLocal, IPC_SUBLOCALTOPIC},
- {URLSubNet, IPC_SUBNETTOPIC},
- {URLPubProxy, IPC_PUB_PROXY},
- {URLSubQueue, IPC_SUB_QUEUE},
- {URLHeartBeat, IPC_HEARTBEAT},
-};
-static string get_url(const int type){
- auto iter = map_url.find(type);
- if (iter != map_url.end()){
- return iter->second;
- }
- return {};
-}
static void fetch_set_proc_id(std::string& pid){
static string cur_proc_id{};
@@ -66,8 +20,6 @@
pid = cur_proc_id;
}
}
-
-/////////////////////////////////////////////
int BHRegister(const void *proc_info, const int proc_info_len, void **reply, int *reply_len, const int timeout_ms)
{
@@ -90,6 +42,7 @@
unsigned short port = *(unsigned short*)(out);
copy_memory(reply, reply_len, (char*)out + port_size, out_len - port_size);
BHFree(out, out_len);
+ printf("======>> recv port %d\n", port);
/////////////////////////////////////////////////////////////////////////
const auto& url_pub_proxy = get_url(URLPubProxy);
@@ -100,7 +53,7 @@
const auto& url_hb = get_url(URLHeartBeat);
respond_survey(url_hb, string{(const char*)proc_info, (const size_t)proc_info_len});
- start_reply(pi.proc_id(), 0);
+ start_reply(pi.proc_id(), port);
}
return ret;
}
@@ -144,6 +97,10 @@
if (!topics || topics_len <= 0) return false;
const auto& url = get_url(URLRegTopic);
+ if (url.empty()) {
+ set_last_error("BHRegisterTopics url empty");
+ return false;
+ }
bhome_msg::MsgTopicList mtl;
if (!mtl.ParseFromArray(topics, topics_len)){
@@ -159,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());
@@ -176,7 +135,22 @@
{
if (!topic || topic_len <= 0) return false;
- return simple_request(get_url(URLQueryTopic), topic, topic_len, reply, reply_len, timeout_ms);
+ const auto& url = get_url(URLQueryTopic);
+ if (url.empty()) {
+ set_last_error("BHQueryTopicAddress url empty");
+ return false;
+ }
+ // if (remote && remote_len > 0){
+ // BHAddress addr;
+ // if (addr.ParseFromArray(remote, remote_len)){
+ // if (!addr.ip().empty() && addr.port() > 0){
+ // // url = "tcp://" + addr.ip() + ":" + to_string(addr.port());
+ // printf("======>> BHQueryTopicAddress use remote address %s\n", url.c_str());
+ // }
+ // }
+ // }
+
+ return simple_request(url, topic, topic_len, reply, reply_len, timeout_ms);
}
// 璇锋眰鍦ㄧ嚎杩涚▼ request
@@ -188,11 +162,25 @@
int *reply_len,
const int timeout_ms)
{
- if (!query || query_len <= 0) return false;
+ // if (!query || query_len <= 0) return false;
- auto ret = simple_request(get_url(URLQueryProcs), query, query_len, reply, reply_len, timeout_ms);
- // printf("======>> BHQueryProcs *reply %p reply_len %d\n", *reply, *reply_len);
- return ret;
+ const auto& url = get_url(URLQueryProcs);
+ if (url.empty()) {
+ set_last_error("BHQueryProcs url empty");
+ return false;
+ }
+
+ // if (remote && remote_len > 0){
+ // BHAddress addr;
+ // if (addr.ParseFromArray(remote, remote_len)){
+ // if (!addr.ip().empty() && addr.port() > 0){
+ // // url = "tcp://" + addr.ip() + ":" + to_string(addr.port());
+ // printf("======>> BHQueryProcs use remote address %s\n", url.c_str());
+ // }
+ // }
+ // }
+
+ return simple_request(url, query, query_len, reply, reply_len, timeout_ms);
}
// above communicate with center
@@ -218,14 +206,18 @@
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;
+ }
auto ret = publish(pub.topic(), msg.data(), msg.size());
if (ret == 0) return false;
return true;
}
-// 璁㈤槄
-int BHSubscribeTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
-{
+static int sub(const string& url, const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms){
if (!topics || topics_len <= 0) return false;
bhome_msg::MsgTopicList mtl;
@@ -243,17 +235,34 @@
// printf("BHSubscribeTopics %s\n", t.c_str());
subscribe_topic(t);
}
- return true;
- auto ret = simple_request(get_url(URLSubLocal), topics, topics_len, reply, reply_len, timeout_ms);
+ std::move(mtl);
+
+ auto ret = simple_request(url, topics, topics_len, reply, reply_len, timeout_ms);
if (!ret){
printf("BHSubscribeTopics simple_request failed\n");
}
return ret;
}
+// 璁㈤槄
+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()) {
+ set_last_error("BHSubscribeTopics url empty");
+ return false;
+ }
+ return sub(url, topics, topics_len, reply, reply_len, timeout_ms);
+}
// 璁㈤槄缃戠粶,涓嶅疄鐜�
int BHSubscribeNetTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
{
- return BHSubscribeTopics(topics, topics_len, reply, reply_len, timeout_ms);
+ const auto& url = get_url(URLSubNet);
+ if (url.empty()) {
+ set_last_error("BHSubscribeNetTopics url empty");
+ return false;
+ }
+
+ return sub(url, topics, topics_len, reply, reply_len, timeout_ms);
}
// 璇诲彇璁㈤槄娑堟伅,proc_id鏆傛椂娌＄敤锛岃繑鍥瀎ake msg
@@ -291,9 +300,9 @@
// return true;
}
-static int get_proc_id_from_MsgRequestTopic(
- const void* request, const int request_len, const int timeout_ms,
- string* proc_id){
+int get_proc_id_from_MsgRequestTopic(
+ const void* request, const int request_len, const int timeout_ms, string* proc_id)
+{
// BHQueryTopicAddress鑾峰彇proc_id
bhome_msg::MsgRequestTopic req;
@@ -303,8 +312,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;
@@ -312,7 +323,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)){
@@ -325,9 +335,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;
}
@@ -344,24 +353,28 @@
{
if (!request || request_len <= 0) return false;
+ string url{};
// BHQueryTopicAddress鑾峰彇proc_id
string procid{};
- if (!get_proc_id_from_MsgRequestTopic(request, request_len, timeout_ms, &procid)){
+
+ if (remote && remote_len > 0){
+ BHAddress addr;
+ if (addr.ParseFromArray(remote, remote_len)){
+ if (!addr.ip().empty() && addr.port() > 0){
+ url = "tcp://" + addr.ip() + ":" + to_string(addr.port());
+ // printf("======>> BHRequest use remote address %s\n", url.c_str());
+ }
+ }
+ } else if (get_proc_id_from_MsgRequestTopic(request, request_len, timeout_ms, &procid)){
+ // PRNTVITAG("get_proc_id_from_MsgRequestTopic failed");
+ // return false;
+ url = "ipc:///tmp/" + procid;
+ }
+
+ if (url.empty()) {
+ set_last_error("BHRequest url empty");
return false;
}
-
- auto url("ipc:///tmp/" + procid);
-
- BHAddress addr;
- if (addr.ParseFromArray(remote, remote_len)){
- if (!addr.ip().empty() && addr.port() > 0){
- url = "tcp://" + addr.ip() + ":" + to_string(addr.port());
- printf("======>>use remote address %s\n", url.c_str());
- }
- }
- // 浣跨敤procid浣滀负ipc閫氫俊
- // printf("BHRequest procid %s\n", procid.c_str());
-
int rc = request2(url, request, request_len, reply, reply_len, timeout_ms);
if (rc < 0) return false;
@@ -380,14 +393,15 @@
{
string msg;
auto ret = read_request(src, &msg, timeout_ms);
- if (ret != 0) return false;
+ if (ret < 0) return false;
- string procid{};
- if (!get_proc_id_from_MsgRequestTopic(msg.data(), msg.size(), timeout_ms, &procid)){
- return false;
+ if (ret == REPLY_IPC){
+ string procid{};
+ if (get_proc_id_from_MsgRequestTopic(msg.data(), msg.size(), timeout_ms, &procid)){
+ copy_memory(proc_id, proc_id_len, procid.data(), procid.size());
+ }
}
- copy_memory(proc_id, proc_id_len, procid.data(), procid.size());
copy_memory(request, request_len, msg.data(), msg.size());
return true;
@@ -491,7 +505,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