mirror of
https://github.com/cesanta/mongoose.git
synced 2024-11-27 20:59:00 +08:00
Fix ESP32 encr. OTA; clean up {open,read,close}dir
Fixed a bunch of things to make OTA work on ESP32 with flash encryption: writes to app aprtitions must be 32-byte aligned and mod 32 in size. When merging filesystems during update, use spiffs_vfs_* functions so that old fs is properly decrypted. Refactored cs_dirent stuff: SPIFFS support moved to spiffs_vfs.c, added dirent.h on ESP8266 and CC3200 which includes cs_dirent.h Define DIR and dirent only if asked (ESP8266, CC3200, WIN32). PUBLISHED_FROM=58b0d05cdc41b1a9e02d341e2a1cdcb012829232
This commit is contained in:
Deomid Ryabkov
Cesanta Bot
parent
577ad2599c
commit
7bdbd80552
114
mongoose.c
114
mongoose.c
@ -548,54 +548,31 @@ int cs_base64_decode(const unsigned char *s, int len, char *dst, int *dec_len) {
|
||||
#ifndef CS_COMMON_CS_DIRENT_H_
|
||||
#define CS_COMMON_CS_DIRENT_H_
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
/* Amalgamated: #include "common/platform.h" */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#ifndef CS_ENABLE_SPIFFS
|
||||
#define CS_ENABLE_SPIFFS 0
|
||||
#endif
|
||||
#ifdef CS_DEFINE_DIRENT
|
||||
typedef struct { int dummy; } DIR;
|
||||
|
||||
#if CS_ENABLE_SPIFFS
|
||||
|
||||
#include <spiffs.h>
|
||||
|
||||
typedef struct {
|
||||
spiffs_DIR dh;
|
||||
struct spiffs_dirent de;
|
||||
} DIR;
|
||||
|
||||
#define d_name name
|
||||
#define dirent spiffs_dirent
|
||||
|
||||
int rmdir(const char *path);
|
||||
int mkdir(const char *path, mode_t mode);
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32)
|
||||
struct dirent {
|
||||
int d_ino;
|
||||
#ifdef _WIN32
|
||||
char d_name[MAX_PATH];
|
||||
#else
|
||||
/* TODO(rojer): Use PATH_MAX but make sure it's sane on every platform */
|
||||
char d_name[256];
|
||||
#endif
|
||||
};
|
||||
|
||||
typedef struct DIR {
|
||||
HANDLE handle;
|
||||
WIN32_FIND_DATAW info;
|
||||
struct dirent result;
|
||||
} DIR;
|
||||
#endif
|
||||
|
||||
#if CS_ENABLE_SPIFFS
|
||||
extern spiffs *cs_spiffs_get_fs(void);
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) || CS_ENABLE_SPIFFS
|
||||
DIR *opendir(const char *dir_name);
|
||||
int closedir(DIR *dir);
|
||||
struct dirent *readdir(DIR *dir);
|
||||
#endif
|
||||
#endif /* CS_DEFINE_DIRENT */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
@ -628,14 +605,21 @@ struct dirent *readdir(DIR *dir);
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
struct win32_dir {
|
||||
DIR d;
|
||||
HANDLE handle;
|
||||
WIN32_FIND_DATAW info;
|
||||
struct dirent result;
|
||||
};
|
||||
|
||||
DIR *opendir(const char *name) {
|
||||
DIR *dir = NULL;
|
||||
struct win32_dir *dir = NULL;
|
||||
wchar_t wpath[MAX_PATH];
|
||||
DWORD attrs;
|
||||
|
||||
if (name == NULL) {
|
||||
SetLastError(ERROR_BAD_ARGUMENTS);
|
||||
} else if ((dir = (DIR *) MG_MALLOC(sizeof(*dir))) == NULL) {
|
||||
} else if ((dir = (struct win32_dir *) MG_MALLOC(sizeof(*dir))) == NULL) {
|
||||
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
|
||||
} else {
|
||||
to_wchar(name, wpath, ARRAY_SIZE(wpath));
|
||||
@ -650,10 +634,11 @@ DIR *opendir(const char *name) {
|
||||
}
|
||||
}
|
||||
|
||||
return dir;
|
||||
return (DIR *) dir;
|
||||
}
|
||||
|
||||
int closedir(DIR *dir) {
|
||||
int closedir(DIR *d) {
|
||||
struct win32_dir *dir = (struct win32_dir *) d;
|
||||
int result = 0;
|
||||
|
||||
if (dir != NULL) {
|
||||
@ -668,10 +653,12 @@ int closedir(DIR *dir) {
|
||||
return result;
|
||||
}
|
||||
|
||||
struct dirent *readdir(DIR *dir) {
|
||||
struct dirent *readdir(DIR *d) {
|
||||
struct win32_dir *dir = (struct win32_dir *) d;
|
||||
struct dirent *result = NULL;
|
||||
|
||||
if (dir) {
|
||||
memset(&dir->result, 0, sizeof(dir->result));
|
||||
if (dir->handle != INVALID_HANDLE_VALUE) {
|
||||
result = &dir->result;
|
||||
(void) WideCharToMultiByte(CP_UTF8, 0, dir->info.cFileName, -1,
|
||||
@ -694,52 +681,6 @@ struct dirent *readdir(DIR *dir) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#if CS_ENABLE_SPIFFS
|
||||
|
||||
DIR *opendir(const char *dir_name) {
|
||||
DIR *dir = NULL;
|
||||
spiffs *fs = cs_spiffs_get_fs();
|
||||
|
||||
if (dir_name == NULL || fs == NULL ||
|
||||
(dir = (DIR *) calloc(1, sizeof(*dir))) == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (SPIFFS_opendir(fs, dir_name, &dir->dh) == NULL) {
|
||||
free(dir);
|
||||
dir = NULL;
|
||||
}
|
||||
|
||||
return dir;
|
||||
}
|
||||
|
||||
int closedir(DIR *dir) {
|
||||
if (dir != NULL) {
|
||||
SPIFFS_closedir(&dir->dh);
|
||||
free(dir);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct dirent *readdir(DIR *dir) {
|
||||
return SPIFFS_readdir(&dir->dh, &dir->de);
|
||||
}
|
||||
|
||||
/* SPIFFs doesn't support directory operations */
|
||||
int rmdir(const char *path) {
|
||||
(void) path;
|
||||
return ENOTSUP;
|
||||
}
|
||||
|
||||
int mkdir(const char *path, mode_t mode) {
|
||||
(void) path;
|
||||
(void) mode;
|
||||
/* for spiffs supports only root dir, which comes from mongoose as '.' */
|
||||
return (strlen(path) == 1 && *path == '.') ? 0 : ENOTSUP;
|
||||
}
|
||||
|
||||
#endif /* CS_ENABLE_SPIFFS */
|
||||
|
||||
#endif /* EXCLUDE_COMMON */
|
||||
|
||||
/* ISO C requires a translation unit to contain at least one declaration */
|
||||
@ -7505,9 +7446,8 @@ void mg_file_upload_handler(struct mg_connection *nc, int ev, void *ev_data,
|
||||
(struct mg_http_multipart_part *) ev_data;
|
||||
struct file_upload_state *fus =
|
||||
(struct file_upload_state *) calloc(1, sizeof(*fus));
|
||||
mp->user_data = NULL;
|
||||
|
||||
struct mg_str lfn = local_name_fn(nc, mg_mk_str(mp->file_name));
|
||||
mp->user_data = NULL;
|
||||
if (lfn.p == NULL || lfn.len == 0) {
|
||||
LOG(LL_ERROR, ("%p Not allowed to upload %s", nc, mp->file_name));
|
||||
mg_printf(nc,
|
||||
|
||||
21
mongoose.h
21
mongoose.h
@ -274,6 +274,7 @@ typedef struct _stati64 cs_stat_t;
|
||||
#define S_ISREG(x) (((x) &_S_IFMT) == _S_IFREG)
|
||||
#endif
|
||||
#define DIRSEP '\\'
|
||||
#define CS_DEFINE_DIRENT
|
||||
|
||||
#ifndef va_copy
|
||||
#ifdef __va_copy
|
||||
@ -528,6 +529,8 @@ typedef struct stat cs_stat_t;
|
||||
#define SIZE_T_FMT "u"
|
||||
typedef struct stat cs_stat_t;
|
||||
#define DIRSEP '/'
|
||||
#define CS_DEFINE_DIRENT
|
||||
|
||||
#define to64(x) strtoll(x, NULL, 10)
|
||||
#define INT64_FMT PRId64
|
||||
#define INT64_X_FMT PRIx64
|
||||
@ -708,22 +711,6 @@ int _stat(const char *pathname, struct stat *st);
|
||||
|
||||
#endif /* __TI_COMPILER_VERSION__ */
|
||||
|
||||
#ifdef CC3200_FS_SPIFFS
|
||||
#include <common/spiffs/spiffs.h>
|
||||
|
||||
typedef struct {
|
||||
spiffs_DIR dh;
|
||||
struct spiffs_dirent de;
|
||||
} DIR;
|
||||
|
||||
#define d_name name
|
||||
#define dirent spiffs_dirent
|
||||
|
||||
DIR *opendir(const char *dir_name);
|
||||
int closedir(DIR *dir);
|
||||
struct dirent *readdir(DIR *dir);
|
||||
#endif /* CC3200_FS_SPIFFS */
|
||||
|
||||
#ifdef CC3200_FS_SLFS
|
||||
#define MG_FS_SLFS
|
||||
#endif
|
||||
@ -731,6 +718,7 @@ struct dirent *readdir(DIR *dir);
|
||||
#if (defined(CC3200_FS_SPIFFS) || defined(CC3200_FS_SLFS)) && \
|
||||
!defined(MG_ENABLE_FILESYSTEM)
|
||||
#define MG_ENABLE_FILESYSTEM 1
|
||||
#define CS_DEFINE_DIRENT
|
||||
#endif
|
||||
|
||||
#ifndef CS_ENABLE_STDIO
|
||||
@ -1302,6 +1290,7 @@ typedef uint32_t in_addr_t;
|
||||
#define SIZE_T_FMT "u"
|
||||
|
||||
#define DIRSEP '\\'
|
||||
#define CS_DEFINE_DIRENT
|
||||
|
||||
#ifndef va_copy
|
||||
#ifdef __va_copy
|
||||
|
||||
Loading…
Reference in New Issue
Block a user