2014-12-22 12:35:05 +01:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2001-2004 Swedish Institute of Computer Science.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without modification,
|
|
|
|
* are permitted provided that the following conditions are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
|
|
* this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
|
|
* and/or other materials provided with the distribution.
|
|
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
|
|
* derived from this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
|
|
|
|
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
|
|
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
|
|
|
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
|
|
|
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
|
|
|
|
* OF SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* This file is part of the lwIP TCP/IP stack.
|
|
|
|
*
|
|
|
|
* Author: Adam Dunkels <adam@sics.se>
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#ifndef __LWIP_MEM_H__
|
|
|
|
#define __LWIP_MEM_H__
|
|
|
|
|
|
|
|
#include "lwip/opt.h"
|
2015-10-12 05:31:04 +02:00
|
|
|
//#include "mem_manager.h"
|
2014-12-22 12:35:05 +01:00
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if MEM_LIBC_MALLOC
|
|
|
|
|
|
|
|
#include <stddef.h> /* for size_t */
|
|
|
|
|
|
|
|
typedef size_t mem_size_t;
|
|
|
|
|
|
|
|
/* aliases for C library malloc() */
|
|
|
|
#define mem_init()
|
|
|
|
/* in case C library malloc() needs extra protection,
|
|
|
|
* allow these defines to be overridden.
|
|
|
|
*/
|
2015-10-12 05:31:04 +02:00
|
|
|
#ifndef MEMLEAK_DEBUG
|
2014-12-22 12:35:05 +01:00
|
|
|
#ifndef mem_free
|
|
|
|
#define mem_free vPortFree
|
|
|
|
#endif
|
|
|
|
#ifndef mem_malloc
|
|
|
|
#define mem_malloc pvPortMalloc
|
|
|
|
#endif
|
|
|
|
#ifndef mem_calloc
|
|
|
|
#define mem_calloc pvPortCalloc
|
|
|
|
#endif
|
|
|
|
#ifndef mem_realloc
|
|
|
|
#define mem_realloc pvPortRealloc
|
|
|
|
#endif
|
|
|
|
#ifndef mem_zalloc
|
|
|
|
#define mem_zalloc pvPortZalloc
|
2015-10-12 05:31:04 +02:00
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
#ifndef mem_free
|
|
|
|
#define mem_free(s) \
|
|
|
|
do{\
|
|
|
|
const char *file = mem_debug_file;\
|
|
|
|
vPortFree(s, file, __LINE__);\
|
|
|
|
}while(0)
|
|
|
|
#endif
|
|
|
|
#ifndef mem_malloc
|
|
|
|
#define mem_malloc(s) ({const char *file = mem_debug_file; pvPortMalloc(s, file, __LINE__);})
|
|
|
|
#endif
|
|
|
|
#ifndef mem_calloc
|
Update to sdk 2.2
Initial commit for
https://github.com/nodemcu/nodemcu-firmware/issues/2225 .
Replay patches from Espressif's repository at
https://github.com/espressif/ESP8266_NONOS_SDK between tags v2.1.0 and
v2.2.0:
0001-sync-from-ccca00f2.patch
Superseded by existing changes, but lines reordered in app/driver/key.c
to minimize divergences.
0002-sync-from-3f38ad5a.patch
Upstream files only
0003-Update-links.patch
Not meaningful to NodeMCU
0004-sync-from-01990ad0.patch
0005-sync-from-cdf6877d.patch
Upstream files only
0006-sync-from-f29e744c.patch
Upstream files only, user_interface.h override non-conflicting
0009-feat-lwip-Move-lwip-source-code-to-third_party-folde.patch
Merged change to lwip/app/espconn_udp.c; rest is just moves or
appears to not apply.
0010-feat-mbedtls-Add-mbedtls-source-code-in-third_party-.patch
Does not apply; we use our own mbedtls
0011-added-C-support.patch
Merged to Makefile
0012-feat-mbedtls-Rebuild-libmbedtls.patch
Already applied
0013-fix-at-Fix-some-bugs-of-AT.patch
Upstream files only
0014-feat-err_t-Redefine-err_t-to-s32_t.patch
Merged to app/include/arch/cc.h and ./app/include/lwip/app/espconn.h;
the rest is upstream files.
0015-fix-wpa-Fix-wpa-wpa2-ptk-gtk-reinstallation-vulnerab.patch
0016-fix-wifi-Remove-group-key-entry-before-connecting-to.patch
0017-feat-lib-Remove-time-function-in-libmain.patch
Upstream files only
0018-feat-espconn-Modification-for-espconn.patch
Merged to app/include/lwip/app/espconn.h,
app/include/lwip/app/espconn_tcp.h, app/lwip/app/espconn.c,
app/lwip/app/espconn_tcp.c
0019-feat-at-Use-new-espconn_recv-to-fix-tcp-server-issue.patch
0020-feat-examples-Update-mqtt-demo-and-auto-bin-generate.patch
Upstream files only
0021-wifi-Add-scan-threshold-and-dwell-time.patch
0022-feat-wifi-Add-country-code-API.patch
0023-feat-wifi-Record-more-information-of-scanned-ap.patch
Upstream files only, user_interface.h override non-conflicting
0024-fix-example-Fix-IoT_Demo-user-sector-error.patch
Upstream files only
0025-fix-lwip-Fix-sequence-number-error-of-RST-ACK.patch
Merged app/lwip/core/tcp_in.c
0026-fix-mbedtls-Fix-memory-leak.patch
Merged app/mbedtls/app/lwIPSocket.c
0027-fix-mbedtls-Fix-call-send-callback-function-failed.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0028-feat-Add-USE_OPTIMIZE_PRINTF-in-third_party-Makefile.patch
Merged app/Makefile
0029-fix-api-Fix-ets_delay_us-declaration.patch
Upstream files only, osapi.h override non-conflicting
0030-fix-wifi-Remove-max_tx_power-in-wifi_country_t-in-li.patch
0031-fix-wifi-Fix-softAP-wrong-behavior-after-call-system.patch
0032-fix-wifi-bugfix-of-scan-fail-after-connected-if-max-.patch
0033-feat-at-Enable-scan-time-scan-type-and-add-scan-resu.patch
0034-feat-at-Add-command-AT-CWCOUNTRY.patch
0035-fix-at-Fix-that-AT-CIPSTART-causes-busy-if-the-serve.patch
Upstream files only
0036-feat-mbedtls-Speed-up-mbedtls-handshake-process.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0037-fix-api-Fix-os_calloc-declaration.patch
Merged app/include/lwip/mem.h; sdk-overrides/include/mem.h
non-conflicting.
0038-fix-mbedtls-Fix-disconnect-callback-function-never-b.patch
Merged app/mbedtls/app/espconn_mbedtls.c; minor revision to logic in
6576af959b1e704003ae5b93f6d6b89fcf86d429. Whitespace fixes.
0039-feat-at-Add-country-code-start-channel-in-AT-CWCOUNT.patch
0040-fix-net80211-Fix-Null-pointer-in-ieee80211_rfid_locp.patch
Upstream files only
0041-feat-wifi-Add-new-esp_init_data_default-v08-bin.patch
Upstream files only, but impacts Makefile
0042-fix-mbedtls-Fix-load-cert-fail-when-the-private-key-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0043-fix-wifi-The-start-channel-can-be-any-valid-channel.patch
0044-fix-wifi-Fix-scan-do-not-start-after-connect.patch
0045-feat-wifi-Add-keep-connection-for-station-to-keep-co.patch
0046-feat-at-Update-AT-version-to-1.6.0.0.patch
0047-fix-at-Fix-GSLP-too-long-time.patch
0048-fix-at-Fix-the-message-is-incorrect-when-creating-UD.patch
0049-feat-at-Add-AT-CIPSERVERMAXCONN.patch
Upstream files only
0050-feat-system-Add-softap-distributes-station-ip-event.patch
Upstream files only, user_interface.h override non-conflicting
0051-feat-example-Use-libmbedtls.a-instead-of-libssl.a-in.patch
Upstream files only
0052-feat-mesh-Remove-mesh-support.patch
Upstream files only, but go ahead and remove comment from
ld/nodemcu.ld.
0053-fix-example-Fix-forget-to-add-integer-parameter-when.patch
Upstream files only
0054-fix-mbedtls-Fix-reconnect_callback-is-not-triggered-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0055-feat-at-Add-AT-SYSMSG-to-enable-some-report-informat.patch
0056-fix-at-Fix-the-incorrect-link-id-when-client-connect.patch
0057-fix-at-Fix-the-bug-that-it-should-be-error-when-the-.patch
0058-fix-smartconfig-Fix-the-smartconfig-scan-time-issue.patch
0059-fix-lwip-Fix-the-bug-of-lwip-output.patch
Upstream files only
0060-fix-lwip-Fix-the-length-of-TCP-data-in-one-packet-is.patch
0061-fix-lwip-Fix-send-TCP-data-with-two-or-more-pbuf.patch
Merged app/lwip/core/tcp_out.c
0062-fix-wifi-Fix-assert-happen-when-smartconfig-start-th.patch
Upstream files only
0063-fix-mbedtls-Fix-memory-leak-when-ESP8266-as-SSL-TLS-.patch
Merged app/mbedtls/app/espconn_mbedtls.c
0064-fix-mbedtls-Fix-already-freed-and-exception-bug-when.patch
Merged app/mbedtls/app/lwIPSocket.c
0065-fix-at-Fix-bug-that-there-is-no-result-when-sending-.patch
0066-feat-example-Add-AT-bin-version.patch
0067-feat-version-Update-version-to-2.2.0-and-add-version.patch
0068-feat-bin-Update-AT-bin-for-SDK-2.2.0.patch
Upstream files only
Apply local changes to build:
app/include/lwip/app/espconn.h pulls changes (and license decl) from
upstream SDK. Makefile is altered to use this file ahead of the
SDK's.
Remove lwip's sntp support, since it was never really wired in anyway.
See https://github.com/nodemcu/nodemcu-firmware/issues/2042 for more
information. Patch Makefile to strip time.o, the consumer of lwip's
sntp functionality, from libmain.a, resulting in much
easier-to-understand error messages.
This has consequences for mbedtls. The simplest thing to do, which is,
impressively, not a change in behavior, is to completely disable TLS
certificate time validation; a later patch can optionally couple this to
RTCTIME support.
Similarly, it happens that the sqlite3 import was calling time(), but
this was not going to work out well for it. Just stub it out to always
return unix timestamp 0, as would have happened anyway.
Changes unprocessed:
0007-sync-from-080c37e1.patch
0008-feat-lib-Compile-some-libraries-with-ffunction-secti.patch
These two make changes to the linker script; perhaps
they are worth porting over, but I have not done so
here.
This is build-tested (ADC, BIT, COLOR_UTILS, CRON, CRYPTO, DHT, ENCODER,
FILE, GPIO, HTTP, I2C, MQTT, NET, NODE, OW, PCM, PERF, PWM, RTCFIFO,
RTCMEM, RTCTIME, SNTP, SPI, SQLITE3, STRUCT, TLS, TMR, UART, WIFI,
WS2812, WS2812_EFFECTS) and boots, but only limited run-time testing has
been performed. Testing done does, however, include having made a few
TLS connections through the HTTP module, so things are not hopelessly
broken, at the very least.
2018-02-20 03:03:09 +01:00
|
|
|
#define mem_calloc(l, s) ({const char *file = mem_debug_file; pvPortCalloc(l, s, file, __LINE__);})
|
2015-10-12 05:31:04 +02:00
|
|
|
#endif
|
|
|
|
#ifndef mem_realloc
|
|
|
|
#define mem_realloc(p, s) ({const char *file = mem_debug_file; pvPortRealloc(p, s, file, __LINE__);})
|
|
|
|
#endif
|
|
|
|
#ifndef mem_zalloc
|
|
|
|
#define mem_zalloc(s) ({const char *file = mem_debug_file; pvPortZalloc(s, file, __LINE__);})
|
|
|
|
#endif
|
|
|
|
|
2014-12-22 12:35:05 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef os_malloc
|
|
|
|
#define os_malloc(s) mem_malloc((s))
|
|
|
|
#endif
|
|
|
|
#ifndef os_realloc
|
|
|
|
#define os_realloc(p, s) mem_realloc((p), (s))
|
|
|
|
#endif
|
|
|
|
#ifndef os_zalloc
|
|
|
|
#define os_zalloc(s) mem_zalloc((s))
|
|
|
|
#endif
|
|
|
|
#ifndef os_free
|
|
|
|
#define os_free(p) mem_free((p))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Since there is no C library allocation function to shrink memory without
|
|
|
|
moving it, define this to nothing. */
|
|
|
|
#ifndef mem_trim
|
|
|
|
#define mem_trim(mem, size) (mem)
|
|
|
|
#endif
|
|
|
|
#else /* MEM_LIBC_MALLOC */
|
|
|
|
|
|
|
|
/* MEM_SIZE would have to be aligned, but using 64000 here instead of
|
|
|
|
* 65535 leaves some room for alignment...
|
|
|
|
*/
|
|
|
|
#if MEM_SIZE > 64000l
|
|
|
|
typedef u32_t mem_size_t;
|
|
|
|
#define MEM_SIZE_F U32_F
|
|
|
|
#else
|
|
|
|
typedef u16_t mem_size_t;
|
|
|
|
#define MEM_SIZE_F U16_F
|
|
|
|
#endif /* MEM_SIZE > 64000 */
|
|
|
|
|
|
|
|
#if MEM_USE_POOLS
|
|
|
|
/** mem_init is not used when using pools instead of a heap */
|
|
|
|
#define mem_init()
|
|
|
|
/** mem_trim is not used when using pools instead of a heap:
|
|
|
|
we can't free part of a pool element and don't want to copy the rest */
|
|
|
|
#define mem_trim(mem, size) (mem)
|
|
|
|
#else /* MEM_USE_POOLS */
|
|
|
|
/* lwIP alternative malloc */
|
|
|
|
void mem_init(void)ICACHE_FLASH_ATTR;
|
|
|
|
void *mem_trim(void *mem, mem_size_t size)ICACHE_FLASH_ATTR;
|
|
|
|
#endif /* MEM_USE_POOLS */
|
|
|
|
void *mem_malloc(mem_size_t size)ICACHE_FLASH_ATTR;
|
|
|
|
void *mem_calloc(mem_size_t count, mem_size_t size)ICACHE_FLASH_ATTR;
|
|
|
|
void mem_free(void *mem)ICACHE_FLASH_ATTR;
|
|
|
|
#endif /* MEM_LIBC_MALLOC */
|
|
|
|
|
|
|
|
/** Calculate memory size for an aligned buffer - returns the next highest
|
|
|
|
* multiple of MEM_ALIGNMENT (e.g. LWIP_MEM_ALIGN_SIZE(3) and
|
|
|
|
* LWIP_MEM_ALIGN_SIZE(4) will both yield 4 for MEM_ALIGNMENT == 4).
|
|
|
|
*/
|
|
|
|
#ifndef LWIP_MEM_ALIGN_SIZE
|
|
|
|
#define LWIP_MEM_ALIGN_SIZE(size) (((size) + MEM_ALIGNMENT - 1) & ~(MEM_ALIGNMENT-1))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/** Calculate safe memory size for an aligned buffer when using an unaligned
|
|
|
|
* type as storage. This includes a safety-margin on (MEM_ALIGNMENT - 1) at the
|
|
|
|
* start (e.g. if buffer is u8_t[] and actual data will be u32_t*)
|
|
|
|
*/
|
|
|
|
#ifndef LWIP_MEM_ALIGN_BUFFER
|
|
|
|
#define LWIP_MEM_ALIGN_BUFFER(size) (((size) + MEM_ALIGNMENT - 1))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/** Align a memory pointer to the alignment defined by MEM_ALIGNMENT
|
|
|
|
* so that ADDR % MEM_ALIGNMENT == 0
|
|
|
|
*/
|
|
|
|
#ifndef LWIP_MEM_ALIGN
|
|
|
|
#define LWIP_MEM_ALIGN(addr) ((void *)(((mem_ptr_t)(addr) + MEM_ALIGNMENT - 1) & ~(mem_ptr_t)(MEM_ALIGNMENT-1)))
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* __LWIP_MEM_H__ */
|