Add -DYASIO_HAVE_KCP to makefile.

Author: halx99

Makefile

@@ -1,7 +1,7 @@
 config=release
 TARGET=libyasio.so
 
-CXXFLAGS = -c -fPIC -Wall -Wno-unused-result -Wextra -Wundef -Wcast-align -Wcast-qual -Wno-old-style-cast -Wdouble-promotion -std=$(cxxstd)
+CXXFLAGS = -c -fPIC -Wall -Wno-unused-result -Wextra -Wundef -Wcast-align -Wcast-qual -Wno-old-style-cast -Wdouble-promotion -DYASIO_HAVE_KCP=1 -std=$(cxxstd)
 CFLAGS = -c -fPIC
 
 ifeq ($(CXX),clang++)

yasio/yasio.cpp

@@ -104,7 +104,7 @@ namespace
 enum
 {
   YERR_OK,                  // NO ERROR.
-  YERR_SEND_TIMEOUT = -500, // Send timeout.
+  YERR_INVALID_PACKET = -500, // Invalid packet.
   YERR_DPL_ILLEGAL_PDU,     // Decode pdu length error.
   YERR_RESOLV_HOST_FAILED,  // Resolve host failed.
   YERR_NO_AVAIL_ADDR,       // No available address to connect.
@@ -332,7 +332,7 @@ int io_transport_posix::recv(int &error)
   error = xxsocket::get_last_errno();
   return n;
 }
-bool io_transport_posix::update(long long &max_wait_duration)
+bool io_transport_posix::flush(long long &max_wait_duration)
 {
   bool ret = false;
   do
@@ -412,14 +412,19 @@ int io_transport_kcp::recv(int &error)
   if (n > 0)
   { // ikcp in event always in service thread, so no need to lock, TODO: confirm.
     // 0: ok, -1: again, -3: error
-    ::ikcp_input(kcp_, sbuf, n);
-    n = ::ikcp_recv(kcp_, buffer_ + offset_, sizeof(buffer_) - offset_);
+    if (0 == ::ikcp_input(kcp_, sbuf, n))
+      n = ::ikcp_recv(kcp_, buffer_ + offset_, sizeof(buffer_) - offset_);
+    else
+    { // current, simply regards -1,-3 as error and trigger connection lost event.
+      n = 0;
+      error = YERR_INVALID_PACKET;
+    }
   }
   else
     error = xxsocket::get_last_errno();
   return n;
 }
-bool io_transport_kcp::update(long long &max_wait_duration)
+bool io_transport_kcp::flush(long long &max_wait_duration)
 {
   std::lock_guard<std::recursive_mutex> lck(send_mtx_);
 
@@ -673,7 +678,7 @@ void io_service::perform_transports(fd_set *fds_array, long long &max_wait_durat
   for (auto iter = transports_.begin(); iter != transports_.end();)
   {
     auto transport = *iter;
-    if (do_read(transport, fds_array, max_wait_duration) && transport->update(max_wait_duration))
+    if (do_read(transport, fds_array, max_wait_duration) && transport->flush(max_wait_duration))
       ++iter;
     else
     {
@@ -1558,8 +1563,6 @@ const char *io_service::strerror(int error)
   {
     case 0:
       return "No error.";
-    case YERR_SEND_TIMEOUT:
-      return "Send timeout!";
     case YERR_DPL_ILLEGAL_PDU:
       return "Decode frame length failed!";
     case YERR_RESOLV_HOST_FAILED:
@@ -1568,6 +1571,8 @@ const char *io_service::strerror(int error)
       return "No available address!";
     case YERR_LOCAL_SHUTDOWN:
       return "An existing connection was shutdown by local host!";
+    case YERR_INVALID_PACKET:
+      return "Invalid packet!";
     case -1:
       return "Unknown error!";
     default:

yasio/yasio.h

@@ -273,9 +273,11 @@ class io_transport_base : public io_base
 
   io_service &get_service() { return ctx_->get_service(); }
 
-  virtual void send(std::vector<char> data)         = 0;
-  virtual int recv(int &error)                      = 0;
-  virtual bool update(long long &max_wait_duration) = 0;
+  virtual void send(std::vector<char> data) = 0;
+  virtual int recv(int &error)              = 0;
+
+  // Try flush pending packet
+  virtual bool flush(long long &max_wait_duration) = 0;
 
 protected:
   io_transport_base(io_channel *ctx, std::shared_ptr<xxsocket> sock);
@@ -304,7 +306,7 @@ class io_transport_posix : public io_transport_base
   {}
   void send(std::vector<char> data) override;
   int recv(int &error) override;
-  bool update(long long &max_wait_duration) override;
+  bool flush(long long &max_wait_duration) override;
   std::deque<a_pdu_ptr> send_queue_;
 };
 
@@ -316,7 +318,7 @@ class io_transport_kcp : public io_transport_base
   ~io_transport_kcp();
   void send(std::vector<char> data) override;
   int recv(int &error) override;
-  bool update(long long &max_wait_duration) override;
+  bool flush(long long &max_wait_duration) override;
   ikcpcb *kcp_;
 };
 #endif