espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-03 00:21:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/esp32s2beta_update

Browse Source
This commit is contained in:
Angus Gratton
2019-08-08 14:00:45 +10:00
committed by Angus Gratton
parent 24d26fccde 51d811a71c
commit 04ae56806c
657 changed files with 6814 additions and 7534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4044
components/lwip/CHANGELOG
View File

File diff suppressed because it is too large Load Diff

1
components/lwip/VERSION
View File

@@ -1 +0,0 @@
bf7fc41e

2
components/lwip/apps/dhcpserver/dhcpserver.c
View File

@@ -1322,7 +1322,7 @@ dhcps_dns_setserver(const ip_addr_t *dnsserver)
* Returns : ip4_addr_t
*******************************************************************************/
ip4_addr_t
dhcps_dns_getserver()
dhcps_dns_getserver(void)
{
return dns_server;
}

2
components/lwip/include/apps/dhcpserver/dhcpserver.h
View File

@@ -88,7 +88,7 @@ void *dhcps_option_info(u8_t op_id, u32_t opt_len);
void dhcps_set_option_info(u8_t op_id, void *opt_info, u32_t opt_len);
bool dhcp_search_ip_on_mac(u8_t *mac, ip4_addr_t *ip);
void dhcps_dns_setserver(const ip_addr_t *dnsserver);
ip4_addr_t dhcps_dns_getserver();
ip4_addr_t dhcps_dns_getserver(void);
void dhcps_set_new_lease_cb(dhcps_cb_t cb);
#endif

2
components/lwip/port/esp32/include/arch/vfs_lwip.h
View File

@@ -16,7 +16,7 @@
extern "C" {
#endif
void esp_vfs_lwip_sockets_register();
void esp_vfs_lwip_sockets_register(void);
#ifdef __cplusplus
}

4
components/lwip/port/esp32/vfs_lwip.c
View File

@@ -39,7 +39,7 @@ static void lwip_stop_socket_select_isr(void *sem, BaseType_t *woken)
}
}
static void *lwip_get_socket_select_semaphore()
static void *lwip_get_socket_select_semaphore(void)
{
/* Calling this from the same process as select() will ensure that the semaphore won't be allocated from
* ISR (lwip_stop_socket_select_isr).
@@ -57,7 +57,7 @@ static int lwip_ioctl_r_wrapper(int fd, int cmd, va_list args)
return lwip_ioctl(fd, cmd, va_arg(args, void *));
}
void esp_vfs_lwip_sockets_register()
void esp_vfs_lwip_sockets_register(void)
{
esp_vfs_t vfs = {
.flags = ESP_VFS_FLAG_DEFAULT,

2
components/lwip/test_afl_host/dhcp_di.h
View File

@@ -23,7 +23,7 @@ static void dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_a
void (*dhcp_test_static_dhcp_recv)(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port) = NULL;
void dhcp_test_init_di()
void dhcp_test_init_di(void)
{
dhcp_test_static_dhcp_recv = dhcp_recv;
}

2
components/lwip/test_afl_host/dhcpserver_di.h
View File

@@ -13,7 +13,7 @@ static void handle_dhcp(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip
void (*dhcp_test_static_handle_hdcp)(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port) = NULL;
void dhcp_test_init_di()
void dhcp_test_init_di(void)
{
dhcp_test_static_handle_hdcp = handle_dhcp;
}

2
components/lwip/test_afl_host/dns_di.h
View File

@@ -35,7 +35,7 @@ static void dns_recv(void *s, struct udp_pcb *pcb, struct pbuf *p, const ip_addr
void (*dns_test_static_dns_recv)(void *s, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port) = NULL;
err_t (*dns_test_static_dns_enqueue)(const char *name, size_t hostnamelen, dns_found_callback found, void *callback_arg, u8_t dns_addrtype) = NULL;
void dns_test_init_di()
void dns_test_init_di(void)
{
dns_test_static_dns_recv = dns_recv;
dns_test_static_dns_enqueue = dns_enqueue;

2
components/lwip/test_afl_host/test_dhcp_client.c
View File

@@ -22,7 +22,7 @@ ip4_addr_t server_ip;
//
// Dependency injected test functions
void dhcp_test_dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
void dhcp_test_init_di();
void dhcp_test_init_di(void);
//
// Test starts here

2
components/lwip/test_afl_host/test_dhcp_server.c
View File

@@ -14,7 +14,7 @@ void dhcp_test_dhcps_cb (u8_t client_ip[4]) {}
// Dependency injected static function to pass the packet into parser
void dhcp_test_handle_dhcp(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
void dhcp_test_init_di();
void dhcp_test_init_di(void);
//
// Test starts here

2
components/lwip/test_afl_host/test_dns.c
View File

@@ -21,7 +21,7 @@ ip4_addr_t server_ip;
void dns_test_dns_recv(void *s, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
void dns_test_inject_port_and_txid(int port, int txid);
void dns_test_init_di();
void dns_test_init_di(void);
err_t dns_test_dns_enqueue(const char *name, size_t hostnamelen, dns_found_callback found, void *callback_arg, u8_t dns_addrtype);
//