nodemcu-firmware/app/sqlite3/esp8266.c

596 lines
15 KiB
C
Raw Normal View History

/*
/* From: https://chromium.googlesource.com/chromium/src.git/+/4.1.249.1050/third_party/sqlite/src/os_symbian.cc
* https://github.com/spsoft/spmemvfs/tree/master/spmemvfs
* http://www.sqlite.org/src/doc/trunk/src/test_demovfs.c
* http://www.sqlite.org/src/doc/trunk/src/test_vfstrace.c
* http://www.sqlite.org/src/doc/trunk/src/test_onefile.c
* http://www.sqlite.org/src/doc/trunk/src/test_vfs.c
**/
#include <c_stdio.h>
#include <c_stdlib.h>
#include <c_string.h>
#include <c_types.h>
#include <osapi.h>
#include <vfs.h>
#include <time.h>
#include <spi_flash.h>
#include <sqlite3.h>
#undef dbg_printf
#define dbg_printf(...) 0
#define CACHEBLOCKSZ 64
#define ESP8266_DEFAULT_MAXNAMESIZE 32
static int esp8266_Close(sqlite3_file*);
static int esp8266_Lock(sqlite3_file *, int);
static int esp8266_Unlock(sqlite3_file*, int);
static int esp8266_Sync(sqlite3_file*, int);
static int esp8266_Open(sqlite3_vfs*, const char *, sqlite3_file *, int, int*);
static int esp8266_Read(sqlite3_file*, void*, int, sqlite3_int64);
static int esp8266_Write(sqlite3_file*, const void*, int, sqlite3_int64);
static int esp8266_Truncate(sqlite3_file*, sqlite3_int64);
static int esp8266_Delete(sqlite3_vfs*, const char *, int);
static int esp8266_FileSize(sqlite3_file*, sqlite3_int64*);
static int esp8266_Access(sqlite3_vfs*, const char*, int, int*);
static int esp8266_FullPathname( sqlite3_vfs*, const char *, int, char*);
static int esp8266_CheckReservedLock(sqlite3_file*, int *);
static int esp8266_FileControl(sqlite3_file *, int, void*);
static int esp8266_SectorSize(sqlite3_file*);
static int esp8266_DeviceCharacteristics(sqlite3_file*);
static void* esp8266_DlOpen(sqlite3_vfs*, const char *);
static void esp8266_DlError(sqlite3_vfs*, int, char*);
static void (*esp8266_DlSym (sqlite3_vfs*, void*, const char*))(void);
static void esp8266_DlClose(sqlite3_vfs*, void*);
static int esp8266_Randomness(sqlite3_vfs*, int, char*);
static int esp8266_Sleep(sqlite3_vfs*, int);
static int esp8266_CurrentTime(sqlite3_vfs*, double*);
static int esp8266mem_Close(sqlite3_file*);
static int esp8266mem_Read(sqlite3_file*, void*, int, sqlite3_int64);
static int esp8266mem_Write(sqlite3_file*, const void*, int, sqlite3_int64);
static int esp8266mem_FileSize(sqlite3_file*, sqlite3_int64*);
static int esp8266mem_Sync(sqlite3_file*, int);
typedef struct st_linkedlist {
uint16_t blockid;
struct st_linkedlist *next;
uint8_t data[CACHEBLOCKSZ];
} linkedlist_t, *pLinkedList_t;
typedef struct st_filecache {
uint32_t size;
linkedlist_t *list;
} filecache_t, *pFileCache_t;
typedef struct esp8266_file {
sqlite3_file base;
int fd;
filecache_t *cache;
char name[ESP8266_DEFAULT_MAXNAMESIZE];
} esp8266_file;
static sqlite3_vfs esp8266Vfs = {
1, // iVersion
sizeof(esp8266_file), // szOsFile
FS_OBJ_NAME_LEN, // mxPathname
NULL, // pNext
"esp8266", // name
0, // pAppData
esp8266_Open, // xOpen
esp8266_Delete, // xDelete
esp8266_Access, // xAccess
esp8266_FullPathname, // xFullPathname
esp8266_DlOpen, // xDlOpen
esp8266_DlError, // xDlError
esp8266_DlSym, // xDlSym
esp8266_DlClose, // xDlClose
esp8266_Randomness, // xRandomness
esp8266_Sleep, // xSleep
esp8266_CurrentTime, // xCurrentTime
0 // xGetLastError
};
static const sqlite3_io_methods esp8266IoMethods = {
1,
esp8266_Close,
esp8266_Read,
esp8266_Write,
esp8266_Truncate,
esp8266_Sync,
esp8266_FileSize,
esp8266_Lock,
esp8266_Unlock,
esp8266_CheckReservedLock,
esp8266_FileControl,
esp8266_SectorSize,
esp8266_DeviceCharacteristics
};
static const sqlite3_io_methods esp8266MemMethods = {
1,
esp8266mem_Close,
esp8266mem_Read,
esp8266mem_Write,
esp8266_Truncate,
esp8266mem_Sync,
esp8266mem_FileSize,
esp8266_Lock,
esp8266_Unlock,
esp8266_CheckReservedLock,
esp8266_FileControl,
esp8266_SectorSize,
esp8266_DeviceCharacteristics
};
static uint32_t linkedlist_store (linkedlist_t **leaf, uint32_t offset, uint32_t len, const uint8_t *data) {
const uint8_t blank[CACHEBLOCKSZ] = { 0 };
uint16_t blockid = offset/CACHEBLOCKSZ;
linkedlist_t *block;
if (!memcmp(data, blank, CACHEBLOCKSZ))
return len;
block = *leaf;
if (!block || ( block->blockid != blockid ) ) {
block = sqlite3_malloc ( sizeof( linkedlist_t ) );
if (!block)
return SQLITE_NOMEM;
memset (block->data, 0, CACHEBLOCKSZ);
block->blockid = blockid;
}
if (!*leaf) {
*leaf = block;
block->next = NULL;
} else if (block != *leaf) {
if (block->blockid > (*leaf)->blockid) {
block->next = (*leaf)->next;
(*leaf)->next = block;
} else {
block->next = (*leaf);
(*leaf) = block;
}
}
memcpy (block->data + offset%CACHEBLOCKSZ, data, len);
return len;
}
static uint32_t filecache_pull (pFileCache_t cache, uint32_t offset, uint32_t len, uint8_t *data) {
uint16_t i;
float blocks;
uint32_t r = 0;
blocks = ( offset % CACHEBLOCKSZ + len ) / (float) CACHEBLOCKSZ;
if (blocks == 0.0)
return 0;
if (( blocks - (int) blocks) > 0.0)
blocks = blocks + 1.0;
for (i = 0; i < (uint16_t) blocks; i++) {
uint16_t round;
float relablock;
linkedlist_t *leaf;
uint32_t relaoffset, relalen;
uint8_t * reladata = (uint8_t*) data;
relalen = len - r;
reladata = reladata + r;
relaoffset = offset + r;
round = CACHEBLOCKSZ - relaoffset%CACHEBLOCKSZ;
if (relalen > round) relalen = round;
for (leaf = cache->list; leaf && leaf->next; leaf = leaf->next) {
if ( ( leaf->next->blockid * CACHEBLOCKSZ ) > relaoffset )
break;
}
relablock = relaoffset/((float)CACHEBLOCKSZ) - leaf->blockid;
if ( ( relablock >= 0 ) && ( relablock < 1 ) )
memcpy (data + r, leaf->data + (relaoffset % CACHEBLOCKSZ), relalen);
r = r + relalen;
}
return 0;
}
static uint32_t filecache_push (pFileCache_t cache, uint32_t offset, uint32_t len, const uint8_t *data) {
uint16_t i;
float blocks;
uint32_t r = 0;
uint8_t updateroot = 0x1;
blocks = ( offset % CACHEBLOCKSZ + len ) / (float) CACHEBLOCKSZ;
if (blocks == 0.0)
return 0;
if (( blocks - (int) blocks) > 0.0)
blocks = blocks + 1.0;
for (i = 0; i < (uint16_t) blocks; i++) {
uint16_t round;
uint32_t localr;
linkedlist_t *leaf;
uint32_t relaoffset, relalen;
uint8_t * reladata = (uint8_t*) data;
relalen = len - r;
reladata = reladata + r;
relaoffset = offset + r;
round = CACHEBLOCKSZ - relaoffset%CACHEBLOCKSZ;
if (relalen > round) relalen = round;
for (leaf = cache->list; leaf && leaf->next; leaf = leaf->next) {
if ( ( leaf->next->blockid * CACHEBLOCKSZ ) > relaoffset )
break;
updateroot = 0x0;
}
localr = linkedlist_store(&leaf, relaoffset, (relalen > CACHEBLOCKSZ) ? CACHEBLOCKSZ : relalen, reladata);
if (localr == SQLITE_NOMEM)
return SQLITE_NOMEM;
r = r + localr;
if (updateroot & 0x1)
cache->list = leaf;
}
if (offset + len > cache->size)
cache->size = offset + len;
return r;
}
static void filecache_free (pFileCache_t cache) {
pLinkedList_t this = cache->list, next;
while (this != NULL) {
next = this->next;
sqlite3_free (this);
this = next;
}
}
static int esp8266mem_Close(sqlite3_file *id)
{
esp8266_file *file = (esp8266_file*) id;
filecache_free(file->cache);
sqlite3_free (file->cache);
dbg_printf("esp8266mem_Close: %s OK\n", file->name);
return SQLITE_OK;
}
static int esp8266mem_Read(sqlite3_file *id, void *buffer, int amount, sqlite3_int64 offset)
{
sint32_t ofst;
esp8266_file *file = (esp8266_file*) id;
ofst = (sint32_t)(offset & 0x7FFFFFFF);
filecache_pull (file->cache, ofst, amount, buffer);
dbg_printf("esp8266mem_Read: %s [%ld] [%d] OK\n", file->name, ofst, amount);
return SQLITE_OK;
}
static int esp8266mem_Write(sqlite3_file *id, const void *buffer, int amount, sqlite3_int64 offset)
{
sint32_t ofst;
esp8266_file *file = (esp8266_file*) id;
ofst = (sint32_t)(offset & 0x7FFFFFFF);
filecache_push (file->cache, ofst, amount, buffer);
dbg_printf("esp8266mem_Write: %s [%ld] [%d] OK\n", file->name, ofst, amount);
return SQLITE_OK;
}
static int esp8266mem_Sync(sqlite3_file *id, int flags)
{
esp8266_file *file = (esp8266_file*) id;
dbg_printf("esp8266mem_Sync: %s OK\n", file->name);
return SQLITE_OK;
}
static int esp8266mem_FileSize(sqlite3_file *id, sqlite3_int64 *size)
{
esp8266_file *file = (esp8266_file*) id;
*size = 0LL | file->cache->size;
dbg_printf("esp8266mem_FileSize: %s [%d] OK\n", file->name, file->cache->size);
return SQLITE_OK;
}
static int esp8266_Open( sqlite3_vfs * vfs, const char * path, sqlite3_file * file, int flags, int * outflags )
{
int rc;
char *mode = "r";
esp8266_file *p = (esp8266_file*) file;
if ( path == NULL ) return SQLITE_IOERR;
if( flags&SQLITE_OPEN_READONLY ) mode = "r";
if( flags&SQLITE_OPEN_READWRITE || flags&SQLITE_OPEN_MAIN_JOURNAL ) {
int result;
if (SQLITE_OK != esp8266_Access(vfs, path, flags, &result))
return SQLITE_CANTOPEN;
if (result == 1)
mode = "r+";
else
mode = "w+";
}
dbg_printf("esp8266_Open: 1o %s %s\n", path, mode);
memset (p, 0, sizeof(esp8266_file));
strncpy (p->name, path, ESP8266_DEFAULT_MAXNAMESIZE);
p->name[ESP8266_DEFAULT_MAXNAMESIZE-1] = '\0';
if( flags&SQLITE_OPEN_MAIN_JOURNAL ) {
p->fd = 0;
p->cache = sqlite3_malloc(sizeof (filecache_t));
if (! p->cache )
return SQLITE_NOMEM;
memset (p->cache, 0, sizeof(filecache_t));
p->base.pMethods = &esp8266MemMethods;
dbg_printf("esp8266_Open: 2o %s %d MEM OK\n", p->name, p->fd);
return SQLITE_OK;
}
p->fd = vfs_open (path, mode);
if ( p->fd <= 0 ) {
return SQLITE_CANTOPEN;
}
p->base.pMethods = &esp8266IoMethods;
dbg_printf("esp8266_Open: 2o %s %d OK\n", p->name, p->fd);
return SQLITE_OK;
}
static int esp8266_Close(sqlite3_file *id)
{
esp8266_file *file = (esp8266_file*) id;
int rc = vfs_close(file->fd);
dbg_printf("esp8266_Close: %s %d %d\n", file->name, file->fd, rc);
return rc ? SQLITE_IOERR_CLOSE : SQLITE_OK;
}
static int esp8266_Read(sqlite3_file *id, void *buffer, int amount, sqlite3_int64 offset)
{
size_t nRead;
sint32_t ofst, iofst;
esp8266_file *file = (esp8266_file*) id;
iofst = (sint32_t)(offset & 0x7FFFFFFF);
dbg_printf("esp8266_Read: 1r %s %d %d %lld[%ld] \n", file->name, file->fd, amount, offset, iofst);
ofst = vfs_lseek(file->fd, iofst, VFS_SEEK_SET);
if (ofst != iofst) {
dbg_printf("esp8266_Read: 2r %ld != %ld FAIL\n", ofst, iofst);
return SQLITE_IOERR_SHORT_READ /* SQLITE_IOERR_SEEK */;
}
nRead = vfs_read(file->fd, buffer, amount);
if ( nRead == amount ) {
dbg_printf("esp8266_Read: 3r %s %u %d OK\n", file->name, nRead, amount);
return SQLITE_OK;
} else if ( nRead >= 0 ) {
dbg_printf("esp8266_Read: 3r %s %u %d FAIL\n", file->name, nRead, amount);
return SQLITE_IOERR_SHORT_READ;
}
dbg_printf("esp8266_Read: 4r %s FAIL\n", file->name);
return SQLITE_IOERR_READ;
}
static int esp8266_Write(sqlite3_file *id, const void *buffer, int amount, sqlite3_int64 offset)
{
size_t nWrite;
sint32_t ofst, iofst;
esp8266_file *file = (esp8266_file*) id;
iofst = (sint32_t)(offset & 0x7FFFFFFF);
dbg_printf("esp8266_Write: 1w %s %d %d %lld[%ld] \n", file->name, file->fd, amount, offset, iofst);
ofst = vfs_lseek(file->fd, iofst, VFS_SEEK_SET);
if (ofst != iofst) {
return SQLITE_IOERR_SEEK;
}
nWrite = vfs_write(file->fd, buffer, amount);
if ( nWrite != amount ) {
dbg_printf("esp8266_Write: 2w %s %u %d\n", file->name, nWrite, amount);
return SQLITE_IOERR_WRITE;
}
dbg_printf("esp8266_Write: 3w %s OK\n", file->name);
return SQLITE_OK;
}
static int esp8266_Truncate(sqlite3_file *id, sqlite3_int64 bytes)
{
esp8266_file *file = (esp8266_file*) id;
dbg_printf("esp8266_Truncate:\n");
return 0 ? SQLITE_IOERR_TRUNCATE : SQLITE_OK;
}
static int esp8266_Delete( sqlite3_vfs * vfs, const char * path, int syncDir )
{
sint32_t rc = vfs_remove( path );
if (rc == VFS_RES_ERR)
return SQLITE_IOERR_DELETE;
dbg_printf("esp8266_Delete: %s OK\n", path);
return SQLITE_OK;
}
static int esp8266_FileSize(sqlite3_file *id, sqlite3_int64 *size)
{
esp8266_file *file = (esp8266_file*) id;
*size = 0LL | vfs_size( file->fd );
dbg_printf("esp8266_FileSize: %s %u[%lld]\n", file->name, vfs_size(file->fd), *size);
return SQLITE_OK;
}
static int esp8266_Sync(sqlite3_file *id, int flags)
{
esp8266_file *file = (esp8266_file*) id;
int rc = vfs_flush( file->fd );
dbg_printf("esp8266_Sync: %d\n", rc);
return rc ? SQLITE_IOERR_FSYNC : SQLITE_OK;
}
static int esp8266_Access( sqlite3_vfs * vfs, const char * path, int flags, int * result )
{
struct vfs_stat st;
sint32_t rc = vfs_stat( path, &st );
*result = ( rc != VFS_RES_ERR );
dbg_printf("esp8266_Access: %d\n", *result);
return SQLITE_OK;
}
static int esp8266_FullPathname( sqlite3_vfs * vfs, const char * path, int len, char * fullpath )
{
struct vfs_stat st;
sint32_t rc = vfs_stat( path, &st );
if ( rc == VFS_RES_OK ){
strncpy( fullpath, st.name, len );
} else {
strncpy( fullpath, path, len );
}
fullpath[ len - 1 ] = '\0';
dbg_printf("esp8266_FullPathname: %s\n", fullpath);
return SQLITE_OK;
}
static int esp8266_Lock(sqlite3_file *id, int lock_type)
{
esp8266_file *file = (esp8266_file*) id;
dbg_printf("esp8266_Lock:\n");
return SQLITE_OK;
}
static int esp8266_Unlock(sqlite3_file *id, int lock_type)
{
esp8266_file *file = (esp8266_file*) id;
dbg_printf("esp8266_Unlock:\n");
return SQLITE_OK;
}
static int esp8266_CheckReservedLock(sqlite3_file *id, int *result)
{
esp8266_file *file = (esp8266_file*) id;
*result = 0;
dbg_printf("esp8266_CheckReservedLock:\n");
return SQLITE_OK;
}
static int esp8266_FileControl(sqlite3_file *id, int op, void *arg)
{
esp8266_file *file = (esp8266_file*) id;
dbg_printf("esp8266_FileControl:\n");
return SQLITE_OK;
}
static int esp8266_SectorSize(sqlite3_file *id)
{
esp8266_file *file = (esp8266_file*) id;
dbg_printf("esp8266_SectorSize:\n");
return SPI_FLASH_SEC_SIZE;
}
static int esp8266_DeviceCharacteristics(sqlite3_file *id)
{
esp8266_file *file = (esp8266_file*) id;
dbg_printf("esp8266_DeviceCharacteristics:\n");
return 0;
}
static void * esp8266_DlOpen( sqlite3_vfs * vfs, const char * path )
{
dbg_printf("esp8266_DlOpen:\n");
return NULL;
}
static void esp8266_DlError( sqlite3_vfs * vfs, int len, char * errmsg )
{
dbg_printf("esp8266_DlError:\n");
return;
}
static void ( * esp8266_DlSym ( sqlite3_vfs * vfs, void * handle, const char * symbol ) ) ( void )
{
dbg_printf("esp8266_DlSym:\n");
return NULL;
}
static void esp8266_DlClose( sqlite3_vfs * vfs, void * handle )
{
dbg_printf("esp8266_DlClose:\n");
return;
}
static int esp8266_Randomness( sqlite3_vfs * vfs, int len, char * buffer )
{
int rc = os_get_random(buffer, len);
dbg_printf("esp8266_Randomness: %d\n", rc);
return SQLITE_OK;
}
static int esp8266_Sleep( sqlite3_vfs * vfs, int microseconds )
{
dbg_printf("esp8266_Sleep:\n");
return SQLITE_OK;
}
static int esp8266_CurrentTime( sqlite3_vfs * vfs, double * result )
{
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
// This is stubbed out until we have a working RTCTIME solution;
// as it stood, this would always have returned the UNIX epoch.
// time_t t = time(NULL);
// *result = t / 86400.0 + 2440587.5;
*result = 2440587.5;
dbg_printf("esp8266_CurrentTime: %g\n", *result);
return SQLITE_OK;
}
int sqlite3_os_init(void){
sqlite3_vfs_register(&esp8266Vfs, 1);
return SQLITE_OK;
}
int sqlite3_os_end(void){
return SQLITE_OK;
}