From f552a0ea788225d8fe80942d6e8bd6500f788393 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 11 四月 2022 09:08:20 +0800
Subject: [PATCH] add log
---
src/bn_api.cpp | 106 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/src/bn_api.cpp b/src/bn_api.cpp
index ca3f3fc..d63e96c 100644
--- a/src/bn_api.cpp
+++ b/src/bn_api.cpp
@@ -42,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);
@@ -52,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;
}
@@ -96,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)){
@@ -129,16 +134,19 @@
if (!topic || topic_len <= 0) return false;
auto url(get_url(URLQueryTopic));
-
- 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());
- }
- }
+ 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);
}
@@ -155,16 +163,20 @@
// if (!query || query_len <= 0) return false;
auto url(get_url(URLQueryProcs));
-
- 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());
- }
- }
+ 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);
}
@@ -192,14 +204,16 @@
newPub.set_data(string{(const char*)msgpub, (const size_t)msgpub_len});
string msg(newPub.SerializeAsString());
+ 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;
@@ -217,17 +231,33 @@
// 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);
+
+ 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
@@ -318,26 +348,27 @@
{
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)){
- return false;
+ 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;
}
-
- auto url("ipc:///tmp/" + 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());
+ url = "tcp://" + addr.ip() + ":" + to_string(addr.port());
+ // printf("======>> BHRequest use remote address %s\n", url.c_str());
}
}
}
- // 浣跨敤procid浣滀负ipc閫氫俊
- // printf("BHRequest procid %s\n", procid.c_str());
-
+ if (url.empty()) {
+ set_last_error("BHRequest url empty");
+ return false;
+ }
int rc = request2(url, request, request_len, reply, reply_len, timeout_ms);
if (rc < 0) return false;
@@ -359,11 +390,10 @@
if (ret != 0) return false;
string procid{};
- if (!get_proc_id_from_MsgRequestTopic(msg.data(), msg.size(), timeout_ms, &procid)){
- return false;
+ 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;
--
Gitblit v1.8.0