Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes libretiny #10

Merged
merged 1 commit into from
Feb 18, 2024
Merged

Fixes libretiny #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 31 additions & 24 deletions src/AsyncTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ bool AsyncClient::_connect(ip_addr_t addr, uint16_t port){
return false;
}

tcp_pcb* pcb = tcp_new_ip_type(addr.type);
tcp_pcb* pcb = tcp_new_ip_type(IPADDR_TYPE_ANY);
if (!pcb){
log_e("pcb == NULL");
return false;
Expand All @@ -722,19 +722,20 @@ bool AsyncClient::_connect(ip_addr_t addr, uint16_t port){

bool AsyncClient::connect(IPAddress ip, uint16_t port){
ip_addr_t addr;
addr.type = IPADDR_TYPE_V4;
addr.u_addr.ip4.addr = ip;
ip_addr_set_ip4_u32(&addr, ip);

return _connect(addr, port);
}

#if LWIP_IPV6
bool AsyncClient::connect(IPv6Address ip, uint16_t port){
ip_addr_t addr;
addr.type = IPADDR_TYPE_V6;
memcpy(addr.u_addr.ip6.addr, static_cast<const uint32_t*>(ip), sizeof(uint32_t) * 4);

return _connect(addr, port);
}
#endif

bool AsyncClient::connect(const char* host, uint16_t port){
ip_addr_t addr;
Expand All @@ -746,10 +747,10 @@ bool AsyncClient::connect(const char* host, uint16_t port){

err_t err = dns_gethostbyname(host, &addr, (dns_found_callback)&_tcp_dns_found, this);
if(err == ERR_OK) {
#if LWIP_IPV6
if(addr.type == IPADDR_TYPE_V6) {
return connect(IPv6Address(addr.u_addr.ip6.addr), port);
}
#if LWIP_IPV6
return connect(IPAddress(addr.u_addr.ip4.addr), port);
#else
return connect(IPAddress(addr.addr), port);
Expand Down Expand Up @@ -1018,10 +1019,12 @@ int8_t AsyncClient::_poll(tcp_pcb* pcb){
}

void AsyncClient::_dns_found(struct ip_addr *ipaddr){
if(ipaddr && ipaddr->u_addr.ip4.addr){
connect(IPAddress(ipaddr->u_addr.ip4.addr), _connect_port);
if(ipaddr && IP_IS_V4(ipaddr)){
connect(IPAddress(ip_addr_get_ip4_u32(ipaddr)), _connect_port);
#if LWIP_IPV6
} else if(ipaddr && ipaddr->u_addr.ip6.addr){
connect(IPv6Address(ipaddr->u_addr.ip6.addr), _connect_port);
#endif
} else {
if(_error_cb) {
_error_cb(_error_cb_arg, this, -55);
Expand Down Expand Up @@ -1117,6 +1120,7 @@ uint32_t AsyncClient::getRemoteAddress() {
#endif
}

#if LWIP_IPV6
ip6_addr_t AsyncClient::getRemoteAddress6() {
if(!_pcb) {
ip6_addr_t nulladdr;
Expand All @@ -1126,6 +1130,24 @@ ip6_addr_t AsyncClient::getRemoteAddress6() {
return _pcb->remote_ip.u_addr.ip6;
}

ip6_addr_t AsyncClient::getLocalAddress6() {
if(!_pcb) {
ip6_addr_t nulladdr;
ip6_addr_set_zero(&nulladdr);
return nulladdr;
}
return _pcb->local_ip.u_addr.ip6;
}

IPv6Address AsyncClient::remoteIP6() {
return IPv6Address(getRemoteAddress6().addr);
}

IPv6Address AsyncClient::localIP6() {
return IPv6Address(getLocalAddress6().addr);
}
#endif

uint16_t AsyncClient::getRemotePort() {
if(!_pcb) {
return 0;
Expand All @@ -1144,15 +1166,6 @@ uint32_t AsyncClient::getLocalAddress() {
#endif
}

ip6_addr_t AsyncClient::getLocalAddress6() {
if(!_pcb) {
ip6_addr_t nulladdr;
ip6_addr_set_zero(&nulladdr);
return nulladdr;
}
return _pcb->local_ip.u_addr.ip6;
}

uint16_t AsyncClient::getLocalPort() {
if(!_pcb) {
return 0;
Expand All @@ -1164,10 +1177,6 @@ IPAddress AsyncClient::remoteIP() {
return IPAddress(getRemoteAddress());
}

IPv6Address AsyncClient::remoteIP6() {
return IPv6Address(getRemoteAddress6().addr);
}

uint16_t AsyncClient::remotePort() {
return getRemotePort();
}
Expand All @@ -1176,9 +1185,6 @@ IPAddress AsyncClient::localIP() {
return IPAddress(getLocalAddress());
}

IPv6Address AsyncClient::localIP6() {
return IPv6Address(getLocalAddress6().addr);
}

uint16_t AsyncClient::localPort() {
return getLocalPort();
Expand Down Expand Up @@ -1377,9 +1383,10 @@ void AsyncServer::begin(){
}

ip_addr_t local_addr;
local_addr.type = bind_type;
ip_addr_set_ip4_u32(&local_addr, _addr);
/* local_addr.type = bind_type;
local_addr.u_addr.ip4.addr = (uint32_t) _addr;
memcpy(local_addr.u_addr.ip6.addr, static_cast<const uint32_t*>(_addr6), sizeof(uint32_t) * 4);
memcpy(local_addr.u_addr.ip6.addr, static_cast<const uint32_t*>(_addr6), sizeof(uint32_t) * 4); */
err = _tcp_bind(_pcb, &local_addr, _port);

if (err != ERR_OK) {
Expand Down
14 changes: 8 additions & 6 deletions src/AsyncTCP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
#include "IPAddress.h"
#include "IPv6Address.h"
#include <functional>
#include "lwip/ip_addr.h"
#include "lwip/ip6_addr.h"

#ifndef LIBRETINY
#include "sdkconfig.h"
extern "C" {
#include "freertos/semphr.h"
#include "lwip/pbuf.h"
#include "lwip/ip_addr.h"
#include "lwip/ip6_addr.h"
}
#else
extern "C" {
Expand Down Expand Up @@ -118,18 +118,20 @@ class AsyncClient {
bool getNoDelay();

uint32_t getRemoteAddress();
ip6_addr_t getRemoteAddress6();
uint16_t getRemotePort();
uint32_t getLocalAddress();
ip6_addr_t getLocalAddress6();
uint16_t getLocalPort();
#if LWIP_IPV6
ip6_addr_t getRemoteAddress6();
ip6_addr_t getLocalAddress6();
IPv6Address remoteIP6();
IPv6Address localIP6();
#endif

//compatibility
IPAddress remoteIP();
IPv6Address remoteIP6();
uint16_t remotePort();
IPAddress localIP();
IPv6Address localIP6();
uint16_t localPort();

void onConnect(AcConnectHandler cb, void* arg = 0); //on successful connect
Expand Down
Loading