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.
---
box/tcp_proxy.cpp | 56 ++++++++++----------------------------------------------
1 files changed, 10 insertions(+), 46 deletions(-)
diff --git a/box/tcp_proxy.cpp b/box/tcp_proxy.cpp
index 298c6b6..b4ec497 100644
--- a/box/tcp_proxy.cpp
+++ b/box/tcp_proxy.cpp
@@ -16,54 +16,18 @@
* =====================================================================================
*/
#include "tcp_proxy.h"
-#include "defs.h"
-#include "shm_socket.h"
#include "tcp_connection.h"
-TcpProxy::TcpProxy() :
- run_(false) {}
-
-TcpProxy::~TcpProxy() {}
-
-bool TcpProxy::Start(bhome_shm::SharedMemory &shm)
-{
- Stop();
- bool cur = false;
- if (!run_.compare_exchange_strong(cur, true)) { return false; }
-
- auto &mq = GetCenterInfo(shm)->mq_tcp_proxy_;
- local_.reset(new ShmSocket(mq.offset_, shm, mq.id_));
- auto localProc = [this](ShmSocket &sock, MsgI &msg, BHMsgHead &head) {
- auto &dest = head.dest();
- if (dest.ip().empty() || dest.port() == 0) { return; }
- Request(dest.ip(), dest.port(), msg.content());
- };
- local_->Start(1, localProc);
-
- auto proxyProc = [this]() {
- while (run_) {
- io_context_.run_one_for(std::chrono::milliseconds(100));
- }
- };
- std::thread(proxyProc).swap(worker_);
- return true;
-}
-
-void TcpProxy::Stop()
-{
- bool cur = true;
- if (run_.compare_exchange_strong(cur, false)) {
- if (worker_.joinable()) {
- worker_.join();
- }
- local_.reset();
- }
-}
-
-bool TcpProxy::Request(const std::string &ip, int port, std::string &&content)
+bool TcpProxy::Request(const std::string &ip, int port, std::string &&content, ReplyCB const &cb)
{
if (content.empty()) { return false; }
-
- tcp::endpoint dest(ip::address::from_string(ip), port);
- TcpRequest1::Create(io_context_, dest, std::move(content), *local_);
+ try {
+ tcp::endpoint dest(ip::address::from_string(ip), port);
+ TcpRequest1::Create(io_, dest, std::move(content), cb);
+ LOG_TRACE() << "tcp request start " << ip << ':' << port;
+ return true;
+ } catch (std::exception &e) {
+ LOG_ERROR() << "proxy request exception: " << e.what();
+ return false;
+ }
}
--
Gitblit v1.8.0