From 3c7339498c5a47e912f6e6009c197291acd7e1fd Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 03 六月 2021 11:27:39 +0800
Subject: [PATCH] change mq shm name prefix.
---
box/center.cpp | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/box/center.cpp b/box/center.cpp
index c3a03e3..020d1bf 100644
--- a/box/center.cpp
+++ b/box/center.cpp
@@ -17,7 +17,10 @@
*/
#include "center.h"
#include "center_topic_node.h"
+#include "io_service.h"
#include "node_center.h"
+#include "tcp_proxy.h"
+#include "tcp_server.h"
#include <chrono>
using namespace std::chrono;
@@ -42,18 +45,6 @@
}
}
-Handler Combine(const Handler &h1, const Handler &h2)
-{
- return [h1, h2](ShmSocket &socket, bhome_msg::MsgI &msg, bhome_msg::BHMsgHead &head) {
- return h1(socket, msg, head) || h2(socket, msg, head);
- };
-}
-template <class... H>
-Handler Combine(const Handler &h0, const Handler &h1, const Handler &h2, const H &...rest)
-{
- return Combine(Combine(h0, h1), h2, rest...);
-}
-
#define CASE_ON_MSG_TYPE(MsgTag) \
case kMsgType##MsgTag: \
Dispatch<Msg##MsgTag>( \
@@ -73,7 +64,7 @@
};
}
-bool AddCenter(std::shared_ptr<Synced<NodeCenter>> center_ptr, SharedMemory &shm)
+bool AddCenter(std::shared_ptr<Synced<NodeCenter>> center_ptr, SharedMemory &shm, TcpProxy &tcp_proxy)
{
// command
auto OnCommand = [center_ptr](ShmSocket &socket, ShmMsgQueue::RawData &cmd) -> bool {
@@ -91,9 +82,45 @@
center->OnTimer();
};
- auto OnCenter = [=](ShmSocket &socket, MsgI &msg, BHMsgHead &head) -> bool {
+ auto OnCenter = [=, &tcp_proxy](ShmSocket &socket, MsgI &msg, BHMsgHead &head) -> bool {
auto ¢er = *center_ptr;
auto replyer = MakeReplyer(socket, head, center);
+
+ if (!head.dest().ip().empty()) { // other host, proxy
+ auto valid = [&]() { return head.route_size() == 1; };
+ if (!valid()) { return false; }
+
+ if (head.type() == kMsgTypeRequestTopic) {
+ typedef MsgRequestTopicReply Reply;
+ Reply reply;
+ if (!center->CheckMsg(head, reply)) {
+ replyer(reply);
+ } else {
+ auto onResult = [¢er](BHMsgHead &head, std::string body_content) {
+ if (head.route_size() > 0) {
+ auto &back = head.route(head.route_size() - 1);
+ MQInfo dest = {back.mq_id(), back.abs_addr()};
+ head.mutable_route()->RemoveLast();
+ center->PassRemoteReplyToLocal(dest, head, std::move(body_content));
+ }
+ };
+ uint16_t port = head.dest().port();
+ if (port == 0) {
+ port = kBHCenterPort;
+ }
+ if (!tcp_proxy.Request(head.dest().ip(), port, msg.content(), onResult)) {
+ replyer(MakeReply<Reply>(eError, "send request failed."));
+ } else {
+ // success
+ }
+ }
+ return true;
+ } else {
+ // ignore other msgs for now.
+ }
+ return false;
+ }
+
switch (head.type()) {
CASE_ON_MSG_TYPE(ProcInit);
CASE_ON_MSG_TYPE(Register);
@@ -167,7 +194,10 @@
{
auto nsec = NodeTimeoutSec();
auto center_ptr = std::make_shared<Synced<NodeCenter>>("@bhome_center", nsec, nsec * 3); // *3 to allow other clients to finish sending msgs.
- AddCenter(center_ptr, shm);
+ io_service_.reset(new IoService);
+ tcp_proxy_.reset(new TcpProxy(io_service_->io()));
+
+ AddCenter(center_ptr, shm, *tcp_proxy_);
for (auto &kv : Centers()) {
auto &info = kv.second;
@@ -175,6 +205,7 @@
}
topic_node_.reset(new CenterTopicNode(center_ptr, shm));
+ tcp_server_.reset(new TcpServer(io_service_->io(), kBHCenterPort, center_ptr));
}
BHCenter::~BHCenter() { Stop(); }
@@ -191,6 +222,9 @@
bool BHCenter::Stop()
{
+ tcp_proxy_.reset();
+ tcp_server_.reset();
+ io_service_.reset();
topic_node_->Stop();
for (auto &kv : sockets_) {
kv.second->Stop();
--
Gitblit v1.8.0