Merge branch 'develop'

Author: hevake

modules/network/buffered_fd.cpp

@@ -236,10 +236,9 @@ void BufferedFd::onReadCallback(short)
         }
     } else {    //! 读出错了
         if (errno != EAGAIN) {
-            sp_read_event_->disable();
-            if (error_cb_) {
+            if (read_error_cb_) {
                 ++cb_level_;
-                error_cb_(errno);
+                read_error_cb_(errno);
                 --cb_level_;
             } else
                 LogWarn("read error, rsize:%d, errno:%d, %s", rsize, errno, strerror(errno));
@@ -267,9 +266,9 @@ void BufferedFd::onWriteCallback(short)
     if (wsize >= 0) {
         send_buff_.hasRead(wsize);
     } else {
-        if (error_cb_) {
+        if (write_error_cb_) {
             ++cb_level_;
-            error_cb_(errno);
+            write_error_cb_(errno);
             --cb_level_;
         } else
             LogWarn("write error, wsize:%d, errno:%d, %s", wsize, errno, strerror(errno));

modules/network/buffered_fd.h

@@ -64,8 +64,10 @@ class BufferedFd : public ByteStream {
     void setSendCompleteCallback(const SendCompleteCallback &func) { send_complete_cb_ = func; }
     //! 设置当读到0字节数据时回调函数
     void setReadZeroCallback(const ReadZeroCallback &func) { read_zero_cb_ = func; }
-    //! 设置当遇到错误时的回调函数
-    void setErrorCallback(const ErrorCallback &func) { error_cb_ = func; }
+    //! 设置当读时遇到错误时的回调函数
+    void setReadErrorCallback(const ErrorCallback &func) { read_error_cb_ = func; }
+    //! 设置当写时遇到错误时的回调函数
+    void setWriteErrorCallback(const ErrorCallback &func) { write_error_cb_ = func; }
 
     //! 实现 ByteStream 的接口
     virtual void setReceiveCallback(const ReceiveCallback &func, size_t threshold) override;
@@ -104,7 +106,8 @@ class BufferedFd : public ByteStream {
     ReceiveCallback         receive_cb_;
     SendCompleteCallback    send_complete_cb_;
     ReadZeroCallback        read_zero_cb_;
-    ErrorCallback           error_cb_;
+    ErrorCallback           read_error_cb_;
+    ErrorCallback           write_error_cb_;
 
     ByteStream  *wp_receiver_ = nullptr;
 

modules/network/tcp_connection.cpp

@@ -34,7 +34,7 @@ TcpConnection::TcpConnection(event::Loop *wp_loop, SocketFd fd, const SockAddr &
 {
     sp_buffered_fd_->initialize(fd);
     sp_buffered_fd_->setReadZeroCallback(std::bind(&TcpConnection::onSocketClosed, this));
-    sp_buffered_fd_->setErrorCallback(std::bind(&TcpConnection::onError, this, _1));
+    sp_buffered_fd_->setReadErrorCallback(std::bind(&TcpConnection::onReadError, this, _1));
 
     sp_buffered_fd_->enable();
 }
@@ -155,8 +155,11 @@ void TcpConnection::onSocketClosed()
     }
 }
 
-void TcpConnection::onError(int errnum)
+void TcpConnection::onReadError(int errnum)
 {
+    if (errnum == ECONNRESET)
+        return;
+
     LogNotice("errno:%d, %s", errnum, strerror(errnum));
     onSocketClosed();
 }

modules/network/tcp_connection.h

@@ -67,7 +67,7 @@ class TcpConnection : public ByteStream {
 
   protected:
     void onSocketClosed();
-    void onError(int errnum);
+    void onReadError(int errnum);
 
   private:
     explicit TcpConnection(event::Loop *wp_loop, SocketFd fd, const SockAddr &peer_addr);

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 11
-TBOX_VERSION_REVISION := 3
+TBOX_VERSION_REVISION := 4