feat(network):1.10.26, 添加getReceiveBuffer()方法

Author: hevake

modules/network/buffered_fd.h

@@ -72,6 +72,7 @@ class BufferedFd : public ByteStream {
     virtual bool send(const void *data_ptr, size_t data_size) override;
     virtual void bind(ByteStream *receiver) override { wp_receiver_ = receiver; }
     virtual void unbind() override { wp_receiver_ = nullptr; }
+    virtual Buffer* getReceiveBuffer() { return &recv_buff_; }
 
     //! 启动与关闭内部事件驱动机制
     bool enable();

modules/network/byte_stream.h

@@ -51,6 +51,10 @@ class ByteStream {
     //! 解除绑定
     virtual void unbind() = 0;
 
+    //! 获取接收缓冲
+    //! WARN: 仅限当场使用，切勿将指针存起来
+    virtual Buffer* getReceiveBuffer() = 0;
+
   protected:
     virtual ~ByteStream() { }
 };

modules/network/stdio_stream.h

@@ -45,6 +45,7 @@ class StdinStream : public ByteStream {
     virtual bool send(const void *, size_t) override { return false; }
     virtual void bind(ByteStream *receiver) override { buff_fd_.bind(receiver); }
     virtual void unbind() override { buff_fd_.unbind(); }
+    virtual Buffer* getReceiveBuffer() override { return buff_fd_.getReceiveBuffer(); }
 
     bool enable();
     bool disable();
@@ -66,6 +67,7 @@ class StdoutStream : public ByteStream {
     virtual bool send(const void *data_ptr, size_t data_size) override;
     virtual void bind(ByteStream *) override { }
     virtual void unbind() override { }
+    virtual Buffer* getReceiveBuffer() override { return nullptr; }
 
     bool enable();
     bool disable();
@@ -87,6 +89,7 @@ class StdioStream : public ByteStream {
     virtual bool send(const void *data_ptr, size_t data_size) override;
     virtual void bind(ByteStream *receiver) override { in_buff_fd_.bind(receiver); }
     virtual void unbind() override { in_buff_fd_.unbind(); }
+    virtual Buffer* getReceiveBuffer() override { return in_buff_fd_.getReceiveBuffer(); }
 
     bool enable();
     bool disable();

modules/network/tcp_client.cpp

@@ -203,6 +203,13 @@ void TcpClient::unbind()
     d_->wp_receiver = nullptr;
 }
 
+Buffer* TcpClient::getReceiveBuffer()
+{
+    if (d_->sp_connection != nullptr)
+        return d_->sp_connection->getReceiveBuffer();
+    return nullptr;
+}
+
 void TcpClient::onTcpConnected(TcpConnection *new_conn)
 {
     RECORD_SCOPE();

modules/network/tcp_client.h

@@ -76,6 +76,7 @@ class TcpClient : public ByteStream {
     virtual bool send(const void *data_ptr, size_t data_size) override;
     virtual void bind(ByteStream *receiver) override;
     virtual void unbind() override;
+    virtual Buffer* getReceiveBuffer() override;
 
   protected:
     void onTcpConnected(TcpConnection *new_conn);

modules/network/tcp_connection.cpp

@@ -129,6 +129,13 @@ bool TcpConnection::send(const void *data_ptr, size_t data_size)
     return false;
 }
 
+Buffer* TcpConnection::getReceiveBuffer()
+{
+    if (sp_buffered_fd_ != nullptr)
+        return sp_buffered_fd_->getReceiveBuffer();
+    return nullptr;
+}
+
 void TcpConnection::onSocketClosed()
 {
     LogInfo("%s", peer_addr_.toString().c_str());

modules/network/tcp_connection.h

@@ -63,6 +63,7 @@ class TcpConnection : public ByteStream {
     virtual void bind(ByteStream *receiver) override;
     virtual void unbind() override;
     virtual bool send(const void *data_ptr, size_t data_size) override;
+    virtual Buffer* getReceiveBuffer() override;
 
   protected:
     void onSocketClosed();

modules/network/tcp_server.cpp

@@ -209,6 +209,14 @@ void* TcpServer::getContext(const ConnToken &client) const
     return nullptr;
 }
 
+Buffer* TcpServer::getClientReceiveBuffer(const ConnToken &client)
+{
+    auto conn = d_->conns.at(client);
+    if (conn != nullptr)
+        return conn->getReceiveBuffer();
+    return nullptr;
+}
+
 TcpServer::State TcpServer::state() const
 {
     return d_->state;

modules/network/tcp_server.h

@@ -90,6 +90,8 @@ class TcpServer {
     void  setContext(const ConnToken &client, void *context, ContextDeleter &&deleter = nullptr);
     void* getContext(const ConnToken &client) const;
 
+    Buffer* getClientReceiveBuffer(const ConnToken &client);
+
     State state() const;
 
   protected:

modules/network/uart.cpp

@@ -295,6 +295,11 @@ void Uart::unbind()
     buff_fd_.unbind();
 }
 
+Buffer* Uart::getReceiveBuffer()
+{
+    return buff_fd_.getReceiveBuffer();
+}
+
 bool Uart::enable()
 {
     if (fd_.isNull()) {

modules/network/uart.h

@@ -61,6 +61,7 @@ class Uart : public ByteStream {
     virtual bool send(const void *data_ptr, size_t data_size) override;
     virtual void bind(ByteStream *receiver) override;
     virtual void unbind() override;
+    virtual Buffer* getReceiveBuffer() override;
 
   public:
     bool enable();

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 10
-TBOX_VERSION_REVISION := 25
+TBOX_VERSION_REVISION := 26