From ab3ee691b81c03348c5fd7dabd78128f77a7de85 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 09 六月 2022 10:44:54 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/bus_nng into master
---
src/interface_bus_api.cpp | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/interface_bus_api.cpp b/src/interface_bus_api.cpp
index 60c195d..638f31a 100644
--- a/src/interface_bus_api.cpp
+++ b/src/interface_bus_api.cpp
@@ -108,8 +108,12 @@
}
string msg(mtl2.SerializeAsString());
-
- return simple_request(get_url(URLRegTopic), msg.data(), msg.size(), reply, reply_len, timeout_ms);
+ const auto& url = get_url(URLRegTopic);
+ if (url.empty()) {
+ set_last_error("bus_register_topics url empty");
+ return false;
+ }
+ return simple_request(url, msg.data(), msg.size(), reply, reply_len, timeout_ms);
}
int bus_query_topic_address(void* handle, const void *remote,
@@ -132,6 +136,10 @@
}
auto url(get_url(URLQueryTopic));
+ if (url.empty()) {
+ set_last_error("bus_query_topic_address url empty");
+ return false;
+ }
// if (remote && remote_len > 0){
// BHAddress addr;
@@ -166,7 +174,10 @@
}
auto url(get_url(URLQueryProcs));
-
+ if (url.empty()) {
+ set_last_error("bus_query_procs url empty");
+ return false;
+ }
// if (remote && remote_len > 0){
// BHAddress addr;
// if (addr.ParseFromArray(remote, remote_len)){
@@ -180,12 +191,12 @@
return simple_request(url, query, query_len, reply, reply_len, timeout_ms);
}
-int bus_subscribe_topics(void* handle, const void *topics,
+static int sub(const string& url,void* handle, const void *topics,
const int topics_len,
void **reply,
int *reply_len,
- const int timeout_ms)
-{
+ const int timeout_ms){
+
TAG;
bus* b = get(handle);
if (!b){
@@ -211,10 +222,8 @@
subscribe_topic(mtl.topic_list(i), &get<2>(*b));
}
- 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("bus_subscribe_topics simple_request failed\n");
}
@@ -222,13 +231,22 @@
}
+
+int bus_subscribe_topics(void* handle, const void *topics,
+ const int topics_len,
+ void **reply,
+ int *reply_len,
+ const int timeout_ms)
+{
+ return sub(get_url(URLSubLocal), handle, topics, topics_len, reply, reply_len, timeout_ms);
+}
int bus_subscribe_topics_net(void* handle, const void *topics,
const int topics_len,
void **reply,
int *reply_len,
const int timeout_ms)
{
- return bus_subscribe_topics(handle, topics, topics_len, reply, reply_len, timeout_ms);
+ return sub(get_url(URLSubNet), handle, topics, topics_len, reply, reply_len, timeout_ms);
}
int bus_heartbeat_easy(void* handle, const int timeout_ms){ return 1; }
@@ -259,6 +277,7 @@
return false;
}
+ // msgpublish(msgpublish(msg))
MsgPublish newPub;
newPub.set_topic(get<8>(*b));
newPub.set_data(string{(const char*)msgpub, (const size_t)msgpub_len});
@@ -319,25 +338,27 @@
return false;
}
+ string url{};
// BHQueryTopicAddress鑾峰彇proc_id
string procid{};
- if (!get_proc_id_from_MsgRequestTopic(request, request_len, timeout_ms, &procid)){
- PRNTVITAG("get_proc_id_from_MsgRequestTopic failed");
- 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());
}
}
}
-
+ if (url.empty()) {
+ set_last_error("bus_request url empty");
+ return false;
+ }
int rc = request2(url, request, request_len, reply, reply_len, timeout_ms);
if (rc < 0) return false;
copy_memory(proc_id, proc_id_len, procid.data(), procid.size());
@@ -361,15 +382,16 @@
string msg;
auto ret = read_request(src, &msg, timeout_ms, &get<6>(*b));
+ // printf("bus_recv_request read_request ret %d msg %s\n", ret, msg.c_str());
if (ret != 0) return false;
string procid{};
- if (!get_proc_id_from_MsgRequestTopic(msg.data(), msg.size(), timeout_ms, &procid)){
- PRNTVITAG("get_proc_id_from_MsgRequestTopic failed");
- return false;
+ if (get_proc_id_from_MsgRequestTopic(msg.data(), msg.size(), timeout_ms, &procid)){
+ // PRNTVITAG("get_proc_id_from_MsgRequestTopic failed");
+ // return false;
+ 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