feedc0de/AsyncTCP
1
0
Fork 0
forked from me-no-dev/AsyncTCP
Code Pull Requests Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Me No Dev
2019-09-24 12:07:28 +03:00
committed by GitHub
parent b548abc97c 5f107e7450
commit c16449b92c
11 changed files with 362 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AsyncTCP.cpp
+33 -27
View File
@@ -78,6 +78,7 @@ typedef struct {
static xQueueHandle _async_queue;
static TaskHandle_t _async_service_task_handle = NULL;
static tcp_pcb * pcb_recently_closed = NULL;
static inline bool _init_async_event_queue(){
if(!_async_queue){
@@ -297,10 +298,15 @@ static void _tcp_error(void * arg, int8_t err) {
static void _tcp_dns_found(const char * name, struct ip_addr * ipaddr, void * arg) {
lwip_event_packet_t * e = (lwip_event_packet_t *)malloc(sizeof(lwip_event_packet_t));
//ets_printf("+DNS: name=%s ipaddr=0x%08x arg=%x\n", name, ipaddr, arg);
e->event = LWIP_TCP_DNS;
e->arg = arg;
e->dns.name = name;
memcpy(&e->dns.addr, ipaddr, sizeof(struct ip_addr));
if (ipaddr) {
memcpy(&e->dns.addr, ipaddr, sizeof(struct ip_addr));
} else {
memset(&e->dns.addr, 0, sizeof(e->dns.addr));
}
if (!_send_async_event(&e)) {
free((void*)(e));
}
@@ -327,7 +333,6 @@ static int8_t _tcp_accept(void * arg, AsyncClient * client) {
typedef struct {
struct tcpip_api_call_data call;
tcp_pcb * pcb;
AsyncClient * client;
int8_t err;
union {
struct {
@@ -352,19 +357,19 @@ typedef struct {
static err_t _tcp_output_api(struct tcpip_api_call_data *api_call_msg){
tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg;
msg->err = ERR_CONN;
if(msg->client && msg->client->pcb() == msg->pcb){
if(msg->pcb != pcb_recently_closed) {
msg->err = tcp_output(msg->pcb);
}
pcb_recently_closed = NULL;
return msg->err;
}
static esp_err_t _tcp_output(tcp_pcb * pcb, AsyncClient * client) {
static esp_err_t _tcp_output(tcp_pcb * pcb) {
if(!pcb){
return ERR_CONN;
}
tcp_api_call_t msg;
msg.pcb = pcb;
msg.client = client;
tcpip_api_call(_tcp_output_api, (struct tcpip_api_call_data*)&msg);
return msg.err;
}
@@ -372,19 +377,19 @@ static esp_err_t _tcp_output(tcp_pcb * pcb, AsyncClient * client) {
static err_t _tcp_write_api(struct tcpip_api_call_data *api_call_msg){
tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg;
msg->err = ERR_CONN;
if(msg->client && msg->client->pcb() == msg->pcb){
if(msg->pcb != pcb_recently_closed) {
msg->err = tcp_write(msg->pcb, msg->write.data, msg->write.size, msg->write.apiflags);
}
pcb_recently_closed = NULL;
return msg->err;
}
static esp_err_t _tcp_write(tcp_pcb * pcb, const char* data, size_t size, uint8_t apiflags, AsyncClient * client) {
static esp_err_t _tcp_write(tcp_pcb * pcb, const char* data, size_t size, uint8_t apiflags) {
if(!pcb){
return ERR_CONN;
}
tcp_api_call_t msg;
msg.pcb = pcb;
msg.client = client;
msg.write.data = data;
msg.write.size = size;
msg.write.apiflags = apiflags;
@@ -395,20 +400,20 @@ static esp_err_t _tcp_write(tcp_pcb * pcb, const char* data, size_t size, uint8_
static err_t _tcp_recved_api(struct tcpip_api_call_data *api_call_msg){
tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg;
msg->err = ERR_CONN;
if(msg->client && msg->client->pcb() == msg->pcb){
if(msg->pcb != pcb_recently_closed) {
msg->err = 0;
tcp_recved(msg->pcb, msg->received);
}
pcb_recently_closed = NULL;
return msg->err;
}
static esp_err_t _tcp_recved(tcp_pcb * pcb, size_t len, AsyncClient * client) {
static esp_err_t _tcp_recved(tcp_pcb * pcb, size_t len) {
if(!pcb){
return ERR_CONN;
}
tcp_api_call_t msg;
msg.pcb = pcb;
msg.client = client;
msg.received = len;
tcpip_api_call(_tcp_recved_api, (struct tcpip_api_call_data*)&msg);
return msg.err;
@@ -417,19 +422,19 @@ static esp_err_t _tcp_recved(tcp_pcb * pcb, size_t len, AsyncClient * client) {
static err_t _tcp_close_api(struct tcpip_api_call_data *api_call_msg){
tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg;
msg->err = ERR_CONN;
if(!msg->client || msg->client->pcb() == msg->pcb){
if(msg->pcb != pcb_recently_closed) {
msg->err = tcp_close(msg->pcb);
}
pcb_recently_closed = NULL;
return msg->err;
}
static esp_err_t _tcp_close(tcp_pcb * pcb, AsyncClient * client) {
static esp_err_t _tcp_close(tcp_pcb * pcb) {
if(!pcb){
return ERR_CONN;
}
tcp_api_call_t msg;
msg.pcb = pcb;
msg.client = client;
tcpip_api_call(_tcp_close_api, (struct tcpip_api_call_data*)&msg);
return msg.err;
}
@@ -437,19 +442,19 @@ static esp_err_t _tcp_close(tcp_pcb * pcb, AsyncClient * client) {
static err_t _tcp_abort_api(struct tcpip_api_call_data *api_call_msg){
tcp_api_call_t * msg = (tcp_api_call_t *)api_call_msg;
msg->err = ERR_CONN;
if(!msg->client || msg->client->pcb() == msg->pcb){
if(msg->pcb != pcb_recently_closed) {
tcp_abort(msg->pcb);
}
pcb_recently_closed = NULL;
return msg->err;
}
static esp_err_t _tcp_abort(tcp_pcb * pcb, AsyncClient * client) {
static esp_err_t _tcp_abort(tcp_pcb * pcb) {
if(!pcb){
return ERR_CONN;
}
tcp_api_call_t msg;
msg.pcb = pcb;
msg.client = client;
tcpip_api_call(_tcp_abort_api, (struct tcpip_api_call_data*)&msg);
return msg.err;
}
@@ -697,14 +702,14 @@ bool AsyncClient::connect(const char* host, uint16_t port){
void AsyncClient::close(bool now){
if(_pcb){
_tcp_recved(_pcb, _rx_ack_len, this);
_tcp_recved(_pcb, _rx_ack_len);
}
_close();
}
int8_t AsyncClient::abort(){
if(_pcb) {
_tcp_abort(_pcb, this);
_tcp_abort(_pcb);
_pcb = NULL;
}
return ERR_ABRT;
@@ -727,7 +732,7 @@ size_t AsyncClient::add(const char* data, size_t size, uint8_t apiflags) {
}
size_t will_send = (room < size) ? room : size;
int8_t err = ERR_OK;
err = _tcp_write(_pcb, data, will_send, apiflags, this);
err = _tcp_write(_pcb, data, will_send, apiflags);
if(err != ERR_OK) {
return 0;
}
@@ -736,7 +741,7 @@ size_t AsyncClient::add(const char* data, size_t size, uint8_t apiflags) {
bool AsyncClient::send(){
int8_t err = ERR_OK;
err = _tcp_output(_pcb, this);
err = _tcp_output(_pcb);
if(err == ERR_OK){
_pcb_busy = true;
_pcb_sent_at = millis();
@@ -749,7 +754,7 @@ size_t AsyncClient::ack(size_t len){
if(len > _rx_ack_len)
len = _rx_ack_len;
if(len){
_tcp_recved(_pcb, len, this);
_tcp_recved(_pcb, len);
}
_rx_ack_len -= len;
return len;
@@ -759,7 +764,7 @@ void AsyncClient::ackPacket(struct pbuf * pb){
if(!pb){
return;
}
_tcp_recved(_pcb, pb->len, this);
_tcp_recved(_pcb, pb->len);
pbuf_free(pb);
}
@@ -778,7 +783,7 @@ int8_t AsyncClient::_close(){
tcp_err(_pcb, NULL);
tcp_poll(_pcb, NULL, 0);
_tcp_clear_events(this);
err = _tcp_close(_pcb, this);
err = _tcp_close(_pcb);
if(err != ERR_OK) {
err = abort();
}
@@ -840,6 +845,7 @@ int8_t AsyncClient::_lwip_fin(tcp_pcb* pcb, int8_t err) {
if(tcp_close(_pcb) != ERR_OK) {
tcp_abort(_pcb);
}
pcb_recently_closed = _pcb;
_pcb = NULL;
return ERR_OK;
}
@@ -880,7 +886,7 @@ int8_t AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, int8_t err) {
if(!_ack_pcb) {
_rx_ack_len += b->len;
} else if(_pcb) {
_tcp_recved(_pcb, b->len, this);
_tcp_recved(_pcb, b->len);
}
pbuf_free(b);
}
@@ -922,7 +928,7 @@ int8_t AsyncClient::_poll(tcp_pcb* pcb){
}
void AsyncClient::_dns_found(struct ip_addr *ipaddr){
if(ipaddr){
if(ipaddr && ipaddr->u_addr.ip4.addr){
connect(IPAddress(ipaddr->u_addr.ip4.addr), _connect_port);
} else {
if(_error_cb) {
@@ -1227,7 +1233,7 @@ void AsyncServer::begin(){
err = _tcp_bind(_pcb, &local_addr, _port);
if (err != ERR_OK) {
_tcp_close(_pcb, NULL);
_tcp_close(_pcb);
log_e("bind error: %d", err);
return;
}