From 9243710ca372de26823c2225c7b46b072458c671 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 28 五月 2021 17:18:33 +0800
Subject: [PATCH] tcp proxy requests, need more test.
---
src/topic_node.cpp | 127 ++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 47 deletions(-)
diff --git a/src/topic_node.cpp b/src/topic_node.cpp
index 6ed7713..b21f7ef 100644
--- a/src/topic_node.cpp
+++ b/src/topic_node.cpp
@@ -29,6 +29,11 @@
namespace
{
+bool ValidUserSymbol(const std::string &s)
+{
+ return !s.empty() && s[0] != '#' && s[0] != '@';
+}
+
inline void AddRoute(BHMsgHead &head, const ShmSocket &sock)
{
auto route = head.add_route();
@@ -66,13 +71,13 @@
}
if (ssn_id_ == 0) {
- ssn_id_ = ShmMsgQueue::NewId();
+ ssn_id_ = NewSession();
}
LOG_DEBUG() << "Node Init, id " << ssn_id_;
auto NodeInit = [&]() {
int64_t init_request = ssn_id_ << 4 | EncodeCmd(eCmdNodeInit);
int64_t reply = 0;
- if (BHNodeInit(init_request, reply) && DecodeCmd(reply) == eCmdNodeInitReply) {
+ if (BHNodeInit(shm(), init_request, reply) && DecodeCmd(reply) == eCmdNodeInitReply) {
int64_t abs_addr = reply >> 4;
sockets_.emplace_back(new ShmSocket(abs_addr, shm_, ssn_id_));
LOG_DEBUG() << "node init ok";
@@ -94,7 +99,7 @@
auto head = InitMsgHead(GetType(body), info_.proc_id(), ssn_id_);
AddRoute(head, socket);
if (imsg.Fill(head, body)) {
- socket.Send(BHTopicCenterAddress(), imsg);
+ socket.Send(CenterAddr(), imsg);
}
} break;
case kMsgTypeProcInitReply: {
@@ -143,8 +148,13 @@
for (auto &p : sockets_) { p->Stop(); }
}
-bool TopicNode::Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
+bool TopicNode::DoRegister(const bool internal, ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms)
{
+ if (!internal && !ValidUserSymbol(proc.proc_id())) {
+ SetLastError(eInvalidInput, "invalid proc id :'" + proc.proc_id() + "'");
+ return false;
+ }
+
{
std::lock_guard<std::mutex> lk(mutex_);
info_ = proc;
@@ -187,12 +197,12 @@
MsgCommonReply body;
CheckResult(imsg, head, body);
};
- return sock.Send(BHTopicCenterAddress(), head, body, onResult);
+ return sock.Send(CenterAddr(), head, body, onResult);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
if (r) {
CheckResult(reply, reply_head, reply_body);
}
@@ -228,12 +238,12 @@
MsgCommonReply body;
CheckResult(imsg, head, body);
};
- return sock.Send(BHTopicCenterAddress(), head, body, onResult);
+ return sock.Send(CenterAddr(), head, body, onResult);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
return r && CheckResult(reply, reply_head, reply_body);
}
}
@@ -253,12 +263,12 @@
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicCenterAddress(), head, body);
+ return sock.Send(CenterAddr(), head, body);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
r = r && reply_head.type() == kMsgTypeCommonReply && reply.ParseBody(reply_body);
return (r && IsSuccess(reply_body.errmsg().errcode()));
}
@@ -282,10 +292,10 @@
BHMsgHead head(InitMsgHead(GetType(query), proc_id(), ssn()));
AddRoute(head, sock);
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release());
BHMsgHead reply_head;
- return (sock.SendAndRecv(BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
+ return (sock.SendAndRecv(CenterAddr(), head, query, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeQueryTopicReply &&
reply.ParseBody(reply_body));
}
@@ -301,16 +311,25 @@
BHMsgHead head(InitMsgHead(GetType(query), proc_id(), ssn()));
AddRoute(head, sock);
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release());
BHMsgHead reply_head;
- return (sock.SendAndRecv(BHTopicCenterAddress(), head, query, reply, reply_head, timeout_ms) &&
+ return (sock.SendAndRecv(CenterAddr(), head, query, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeQueryProcReply &&
reply.ParseBody(reply_body));
}
-bool TopicNode::ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
+bool TopicNode::DoServerRegisterRPC(const bool internal, MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms)
{
+ if (!internal) {
+ for (auto &&topic : topics.topic_list()) {
+ if (!ValidUserSymbol(topic)) {
+ SetLastError(eInvalidInput, "invalid user topic :'" + topic + "'");
+ return false;
+ }
+ }
+ }
+
if (!IsOnline()) {
SetLastError(eNotRegistered, kErrMsgNotRegistered);
return false;
@@ -324,12 +343,12 @@
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicCenterAddress(), head, body);
+ return sock.Send(CenterAddr(), head, body);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- bool r = sock.SendAndRecv(BHTopicCenterAddress(), head, body, reply, reply_head, timeout_ms);
+ bool r = sock.SendAndRecv(CenterAddr(), head, body, reply, reply_head, timeout_ms);
r = r && reply_head.type() == kMsgTypeCommonReply;
r = r && reply.ParseBody(reply_body);
return r;
@@ -478,9 +497,10 @@
out_msg_id = msg_id;
- auto SendTo = [this, msg_id](const MQInfo &remote, const MsgRequestTopic &req, const RequestResultCB &cb) {
+ auto SendTo = [this, remote_addr, msg_id](const MQInfo &remote, const MsgRequestTopic &req, const RequestResultCB &cb) {
auto &sock = SockClient();
BHMsgHead head(InitMsgHead(GetType(req), proc_id(), ssn(), msg_id));
+ *head.mutable_dest() = remote_addr;
AddRoute(head, sock);
head.set_topic(req.topic());
@@ -500,8 +520,12 @@
};
try {
- BHAddress addr;
- return (ClientQueryRPCTopic(req.topic(), addr, 3000)) && SendTo(MQInfo{addr.mq_id(), addr.abs_addr()}, req, cb);
+ if (remote_addr.ip().empty()) {
+ BHAddress addr;
+ return (ClientQueryRPCTopic(req.topic(), addr, 3000)) && SendTo(MQInfo{addr.mq_id(), addr.abs_addr()}, req, cb);
+ } else {
+ return SendTo(CenterAddr(), req, cb);
+ }
} catch (...) {
SetLastError(eError, "internal error.");
return false;
@@ -517,24 +541,33 @@
try {
auto &sock = SockClient();
-
- BHAddress addr;
- if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
- LOG_TRACE() << "node: " << SockNode().id() << ", topic dest: " << addr.mq_id();
- BHMsgHead head(InitMsgHead(GetType(request), proc_id(), ssn()));
- AddRoute(head, sock);
- head.set_topic(request.topic());
-
- MsgI reply_msg;
- DEFER1(reply_msg.Release(););
- BHMsgHead reply_head;
-
- if (sock.SendAndRecv({addr.mq_id(), addr.abs_addr()}, head, request, reply_msg, reply_head, timeout_ms) &&
- reply_head.type() == kMsgTypeRequestTopicReply &&
- reply_msg.ParseBody(out_reply)) {
- reply_head.mutable_proc_id()->swap(out_proc_id);
- return true;
+ MQInfo dest;
+ if (!remote_addr.ip().empty()) {
+ dest = CenterAddr();
+ } else {
+ BHAddress addr;
+ if (ClientQueryRPCTopic(request.topic(), addr, timeout_ms)) {
+ dest.offset_ = addr.abs_addr();
+ dest.id_ = addr.mq_id();
+ } else {
+ return false;
}
+ }
+
+ BHMsgHead head(InitMsgHead(GetType(request), proc_id(), ssn()));
+ *head.mutable_dest() = remote_addr;
+ AddRoute(head, sock);
+ head.set_topic(request.topic());
+
+ MsgI reply_msg(shm());
+ DEFER1(reply_msg.Release(););
+ BHMsgHead reply_head;
+
+ if (sock.SendAndRecv(dest, head, request, reply_msg, reply_head, timeout_ms) &&
+ reply_head.type() == kMsgTypeRequestTopicReply &&
+ reply_msg.ParseBody(out_reply)) {
+ reply_head.mutable_proc_id()->swap(out_proc_id);
+ return true;
}
} catch (...) {
SetLastError(eError, __func__ + std::string(" internal errer."));
@@ -596,13 +629,13 @@
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicBusAddress(), head, pub);
+ return sock.Send(BusAddr(), head, pub);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
MsgCommonReply reply_body;
- return sock.SendAndRecv(BHTopicBusAddress(), head, pub, reply, reply_head, timeout_ms) &&
+ return sock.SendAndRecv(BusAddr(), head, pub, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeCommonReply &&
reply.ParseBody(reply_body) &&
IsSuccess(reply_body.errmsg().errcode());
@@ -629,12 +662,12 @@
BHMsgHead head(InitMsgHead(GetType(sub), proc_id(), ssn()));
AddRoute(head, sock);
if (timeout_ms == 0) {
- return sock.Send(BHTopicBusAddress(), head, sub);
+ return sock.Send(BusAddr(), head, sub);
} else {
- MsgI reply;
+ MsgI reply(shm());
DEFER1(reply.Release(););
BHMsgHead reply_head;
- return sock.SendAndRecv(BHTopicBusAddress(), head, sub, reply, reply_head, timeout_ms) &&
+ return sock.SendAndRecv(BusAddr(), head, sub, reply, reply_head, timeout_ms) &&
reply_head.type() == kMsgTypeCommonReply &&
reply.ParseBody(reply_body) &&
IsSuccess(reply_body.errmsg().errcode());
--
Gitblit v1.8.0