Add posibility to handle packet buffers directly

Author: me-no-dev

src/ESPAsyncTCP.cpp

@@ -50,6 +50,8 @@ AsyncClient::AsyncClient(tcp_pcb* pcb):
   , _error_cb_arg(0)
   , _recv_cb(0)
   , _recv_cb_arg(0)
+  , _pb_cb(0)
+  , _pb_cb_arg(0)
   , _timeout_cb(0)
   , _timeout_cb_arg(0)
   , _pcb_busy(false)
@@ -402,16 +404,20 @@ err_t AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, err_t err) {
     //we should not ack before we assimilate the data
     _ack_pcb = true;
     pbuf *b = pb;
-    ASYNC_TCP_DEBUG("_recv: %d\n", b->len);
-    if(_recv_cb)
-      _recv_cb(_recv_cb_arg, this, b->payload, b->len);
-    if(!_ack_pcb)
-      _rx_ack_len += b->len;
-    else
-      tcp_recved(pcb, b->len);
     pb = b->next;
     b->next = NULL;
-    pbuf_free(b);
+    ASYNC_TCP_DEBUG("_recv: %d\n", b->len);
+    if(_pb_cb){
+      _pb_cb(_pb_cb_arg, this, b);
+    } else {
+      if(_recv_cb)
+        _recv_cb(_recv_cb_arg, this, b->payload, b->len);
+      if(!_ack_pcb)
+        _rx_ack_len += b->len;
+      else
+        tcp_recved(pcb, b->len);
+      pbuf_free(b);
+    }
   }
   return ERR_OK;
 }
@@ -690,6 +696,11 @@ void AsyncClient::onData(AcDataHandler cb, void* arg){
   _recv_cb_arg = arg;
 }
 
+void AsyncClient::onPacket(AcPacketHandler cb, void* arg){
+  _pb_cb = cb;
+  _pb_cb_arg = arg;
+}
+
 void AsyncClient::onTimeout(AcTimeoutHandler cb, void* arg){
   _timeout_cb = cb;
   _timeout_cb_arg = arg;
@@ -724,6 +735,14 @@ size_t AsyncClient::space(){
   return 0;
 }
 
+void AsyncClient::ackPacket(struct pbuf * pb){
+  if(!pb){
+    return;
+  }
+  tcp_recved(_pcb, pb->len);
+  pbuf_free(pb);
+}
+
 const char * AsyncClient::errorToString(int8_t error){
   switch(error){
     case 0: return "OK";

src/ESPAsyncTCP.h

@@ -29,6 +29,7 @@
 extern "C" {
     #include "lwip/init.h"
     #include "lwip/err.h"
+    #include "lwip/pbuf.h"
 };
 
 class AsyncClient;
@@ -37,14 +38,7 @@ class AsyncClient;
 #define ASYNC_WRITE_FLAG_COPY 0x01 //will allocate new buffer to hold the data while sending (else will hold reference to the data given)
 #define ASYNC_WRITE_FLAG_MORE 0x02 //will not send PSH flag, meaning that there should be more data to be sent before the application should react.
 
-typedef std::function<void(void*, AsyncClient*)> AcConnectHandler;
-typedef std::function<void(void*, AsyncClient*, size_t len, uint32_t time)> AcAckHandler;
-typedef std::function<void(void*, AsyncClient*, int8_t error)> AcErrorHandler;
-typedef std::function<void(void*, AsyncClient*, void *data, size_t len)> AcDataHandler;
-typedef std::function<void(void*, AsyncClient*, uint32_t time)> AcTimeoutHandler;
-
 struct tcp_pcb;
-struct pbuf;
 struct ip_addr;
 #if ASYNC_TCP_SSL_ENABLED
 struct SSL_;
@@ -53,6 +47,13 @@ struct SSL_CTX_;
 typedef struct SSL_CTX_ SSL_CTX;
 #endif
 
+typedef std::function<void(void*, AsyncClient*)> AcConnectHandler;
+typedef std::function<void(void*, AsyncClient*, size_t len, uint32_t time)> AcAckHandler;
+typedef std::function<void(void*, AsyncClient*, int8_t error)> AcErrorHandler;
+typedef std::function<void(void*, AsyncClient*, void *data, size_t len)> AcDataHandler;
+typedef std::function<void(void*, AsyncClient*, struct pbuf *pb)> AcPacketHandler;
+typedef std::function<void(void*, AsyncClient*, uint32_t time)> AcTimeoutHandler;
+
 class AsyncClient {
   protected:
     friend class AsyncTCPbuffer;
@@ -67,6 +68,8 @@ class AsyncClient {
     void* _error_cb_arg;
     AcDataHandler _recv_cb;
     void* _recv_cb_arg;
+    AcPacketHandler _pb_cb;
+    void* _pb_cb_arg;
     AcTimeoutHandler _timeout_cb;
     void* _timeout_cb_arg;
     AcConnectHandler _poll_cb;
@@ -190,10 +193,13 @@ class AsyncClient {
     void onDisconnect(AcConnectHandler cb, void* arg = 0);  //disconnected
     void onAck(AcAckHandler cb, void* arg = 0);             //ack received
     void onError(AcErrorHandler cb, void* arg = 0);         //unsuccessful connect or error
-    void onData(AcDataHandler cb, void* arg = 0);           //data received
+    void onData(AcDataHandler cb, void* arg = 0);           //data received (called if onPacket is not used)
+    void onPacket(AcPacketHandler cb, void* arg = 0);       //data received
     void onTimeout(AcTimeoutHandler cb, void* arg = 0);     //ack timeout
     void onPoll(AcConnectHandler cb, void* arg = 0);        //every 125ms when connected
 
+    void ackPacket(struct pbuf * pb);
+
     const char * errorToString(int8_t error);
     const char * stateToString();