Skip to content
This repository was archived by the owner on Jan 20, 2025. It is now read-only.

Commit a57560d

Browse files
me-no-devme-no-dev
committed
use err_t for compatibility
Fixes: #60
1 parent 289a681 commit a57560d

File tree

2 files changed

+37
-33
lines changed

2 files changed

+37
-33
lines changed

‎src/ESPAsyncTCP.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ size_t AsyncClient::ack(size_t len){
283283

284284
// Private Callbacks
285285

286-
long AsyncClient::_connected(void* pcb, long err){
286+
err_t AsyncClient::_connected(void* pcb, err_t err){
287287
_pcb = reinterpret_cast<tcp_pcb*>(pcb);
288288
if(_pcb){
289289
_pcb_busy = false;
@@ -336,7 +336,7 @@ int8_t AsyncClient::_close(){
336336
return err;
337337
}
338338

339-
void AsyncClient::_error(long err) {
339+
void AsyncClient::_error(err_t err) {
340340
if(_pcb){
341341
#if ASYNC_TCP_SSL_ENABLED
342342
if(_pcb_secure){
@@ -363,7 +363,7 @@ void AsyncClient::_ssl_error(int8_t err){
363363
}
364364
#endif
365365

366-
long AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) {
366+
err_t AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) {
367367
_rx_last_packet = millis();
368368
ASYNC_TCP_DEBUG("_sent: %u\n", len);
369369
_tx_unacked_len -= len;
@@ -377,7 +377,7 @@ long AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) {
377377
return ERR_OK;
378378
}
379379

380-
long AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, long err) {
380+
err_t AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, err_t err) {
381381
if(pb == NULL){
382382
ASYNC_TCP_DEBUG("_recv: pb == NULL! Closing... %d\n", err);
383383
return _close();
@@ -416,7 +416,7 @@ long AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, long err) {
416416
return ERR_OK;
417417
}
418418

419-
long AsyncClient::_poll(tcp_pcb* pcb){
419+
err_t AsyncClient::_poll(tcp_pcb* pcb){
420420
// Close requested
421421
if(_close_pcb){
422422
_close_pcb = false;
@@ -478,23 +478,23 @@ void AsyncClient::_s_dns_found(const char *name, const ip_addr *ipaddr, void *ar
478478
reinterpret_cast<AsyncClient*>(arg)->_dns_found(ipaddr);
479479
}
480480

481-
long AsyncClient::_s_poll(void *arg, struct tcp_pcb *tpcb) {
481+
err_t AsyncClient::_s_poll(void *arg, struct tcp_pcb *tpcb) {
482482
return reinterpret_cast<AsyncClient*>(arg)->_poll(tpcb);
483483
}
484484

485-
long AsyncClient::_s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, long err) {
485+
err_t AsyncClient::_s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, err_t err) {
486486
return reinterpret_cast<AsyncClient*>(arg)->_recv(tpcb, pb, err);
487487
}
488488

489-
void AsyncClient::_s_error(void *arg, long err) {
489+
void AsyncClient::_s_error(void *arg, err_t err) {
490490
reinterpret_cast<AsyncClient*>(arg)->_error(err);
491491
}
492492

493-
long AsyncClient::_s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len) {
493+
err_t AsyncClient::_s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len) {
494494
return reinterpret_cast<AsyncClient*>(arg)->_sent(tpcb, len);
495495
}
496496

497-
long AsyncClient::_s_connected(void* arg, void* tpcb, long err){
497+
err_t AsyncClient::_s_connected(void* arg, void* tpcb, err_t err){
498498
return reinterpret_cast<AsyncClient*>(arg)->_connected(tpcb, err);
499499
}
500500

@@ -905,7 +905,7 @@ uint8_t AsyncServer::status(){
905905
return _pcb->state;
906906
}
907907

908-
long AsyncServer::_accept(tcp_pcb* pcb, long err){
908+
err_t AsyncServer::_accept(tcp_pcb* pcb, err_t err){
909909
if(_connect_cb){
910910
#if ASYNC_TCP_SSL_ENABLED
911911
if (_noDelay || _ssl_ctx)
@@ -973,12 +973,12 @@ long AsyncServer::_accept(tcp_pcb* pcb, long err){
973973
return ERR_OK;
974974
}
975975

976-
long AsyncServer::_s_accept(void *arg, tcp_pcb* pcb, long err){
976+
err_t AsyncServer::_s_accept(void *arg, tcp_pcb* pcb, err_t err){
977977
return reinterpret_cast<AsyncServer*>(arg)->_accept(pcb, err);
978978
}
979979

980980
#if ASYNC_TCP_SSL_ENABLED
981-
long AsyncServer::_poll(tcp_pcb* pcb){
981+
err_t AsyncServer::_poll(tcp_pcb* pcb){
982982
if(!tcp_ssl_has_client() && _pending){
983983
struct pending_pcb * p = _pending;
984984
if(p->pcb == pcb){
@@ -1004,7 +1004,7 @@ long AsyncServer::_poll(tcp_pcb* pcb){
10041004
return ERR_OK;
10051005
}
10061006

1007-
long AsyncServer::_recv(struct tcp_pcb *pcb, struct pbuf *pb, long err){
1007+
err_t AsyncServer::_recv(struct tcp_pcb *pcb, struct pbuf *pb, err_t err){
10081008
if(!_pending)
10091009
return ERR_OK;
10101010

@@ -1056,11 +1056,11 @@ int AsyncServer::_s_cert(void *arg, const char *filename, uint8_t **buf){
10561056
return reinterpret_cast<AsyncServer*>(arg)->_cert(filename, buf);
10571057
}
10581058

1059-
long AsyncServer::_s_poll(void *arg, struct tcp_pcb *pcb){
1059+
err_t AsyncServer::_s_poll(void *arg, struct tcp_pcb *pcb){
10601060
return reinterpret_cast<AsyncServer*>(arg)->_poll(pcb);
10611061
}
10621062

1063-
long AsyncServer::_s_recv(void *arg, struct tcp_pcb *pcb, struct pbuf *pb, long err){
1063+
err_t AsyncServer::_s_recv(void *arg, struct tcp_pcb *pcb, struct pbuf *pb, err_t err){
10641064
return reinterpret_cast<AsyncServer*>(arg)->_recv(pcb, pb, err);
10651065
}
10661066
#endif

‎src/ESPAsyncTCP.h

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
#include <async_config.h>
2626
#include "IPAddress.h"
2727
#include <functional>
28-
#include "lwip/init.h"
28+
29+
extern "C" {
30+
#include "lwip/init.h"
31+
#include "lwip/err.h"
32+
};
2933

3034
class AsyncClient;
3135

@@ -85,23 +89,23 @@ class AsyncClient {
8589
uint16_t _connect_port;
8690

8791
int8_t _close();
88-
long _connected(void* pcb, long err);
89-
void _error(long err);
92+
err_t _connected(void* pcb, err_t err);
93+
void _error(err_t err);
9094
#if ASYNC_TCP_SSL_ENABLED
9195
void _ssl_error(int8_t err);
9296
#endif
93-
long _poll(tcp_pcb* pcb);
94-
long _sent(tcp_pcb* pcb, uint16_t len);
97+
err_t _poll(tcp_pcb* pcb);
98+
err_t _sent(tcp_pcb* pcb, uint16_t len);
9599
#if LWIP_VERSION_MAJOR == 1
96100
void _dns_found(struct ip_addr *ipaddr);
97101
#else
98102
void _dns_found(const ip_addr *ipaddr);
99103
#endif
100-
static long _s_poll(void *arg, struct tcp_pcb *tpcb);
101-
static long _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, long err);
102-
static void _s_error(void *arg, long err);
103-
static long _s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len);
104-
static long _s_connected(void* arg, void* tpcb, long err);
104+
static err_t _s_poll(void *arg, struct tcp_pcb *tpcb);
105+
static err_t _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, err_t err);
106+
static void _s_error(void *arg, err_t err);
107+
static err_t _s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len);
108+
static err_t _s_connected(void* arg, void* tpcb, err_t err);
105109
#if LWIP_VERSION_MAJOR == 1
106110
static void _s_dns_found(const char *name, struct ip_addr *ipaddr, void *arg);
107111
#else
@@ -193,7 +197,7 @@ class AsyncClient {
193197
const char * errorToString(int8_t error);
194198
const char * stateToString();
195199

196-
long _recv(tcp_pcb* pcb, pbuf* pb, long err);
200+
err_t _recv(tcp_pcb* pcb, pbuf* pb, err_t err);
197201
};
198202

199203
#if ASYNC_TCP_SSL_ENABLED
@@ -233,15 +237,15 @@ class AsyncServer {
233237
uint8_t status();
234238

235239
protected:
236-
long _accept(tcp_pcb* newpcb, long err);
237-
static long _s_accept(void *arg, tcp_pcb* newpcb, long err);
240+
err_t _accept(tcp_pcb* newpcb, err_t err);
241+
static err_t _s_accept(void *arg, tcp_pcb* newpcb, err_t err);
238242
#if ASYNC_TCP_SSL_ENABLED
239243
int _cert(const char *filename, uint8_t **buf);
240-
long _poll(tcp_pcb* pcb);
241-
long _recv(tcp_pcb *pcb, struct pbuf *pb, long err);
244+
err_t _poll(tcp_pcb* pcb);
245+
err_t _recv(tcp_pcb *pcb, struct pbuf *pb, err_t err);
242246
static int _s_cert(void *arg, const char *filename, uint8_t **buf);
243-
static long _s_poll(void *arg, struct tcp_pcb *tpcb);
244-
static long _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, long err);
247+
static err_t _s_poll(void *arg, struct tcp_pcb *tpcb);
248+
static err_t _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, err_t err);
245249
#endif
246250
};
247251

0 commit comments

Comments
 (0)